rebase to DEV300_m69

135 files changed, 17021 insertions, 21563 deletions

diff --git a/bootstrap.1 b/bootstrap.1
index 146d6f9443dd..622f68b228f4 100644
--- a/bootstrap.1
+++ b/bootstrap.1
@@ -21,16 +21,13 @@ if test "$BUILD_DMAKE" != "NO"; then
 
         # Special case! The w32/tcsh build needs CC pointing to the MSVC++ compiler
         # but we need a cygwin/gcc build dmake to understand the posix paths
-        if test "$GUI" = "WNT" -a "$USE_SHELL" != "4nt"; then
+        if test "$GUI" = "WNT"; then
             CC=""
             CXX=""
             export CC
             export CXX
         fi
 
-        # For the W32/4nt case
-        rm -rf objects
-
         # For normal unixy systems
         if test -f "Makefile" ; then
             $GNUMAKE distclean || exit
diff --git a/configure b/configure
index 06ed74cb9b58..ca6818eaab0e 100755
--- a/configure
+++ b/configure
@@ -1,83 +1,26 @@
 #! /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.59.
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2003 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
+DUALCASE=1; export DUALCASE # for MKS sh
 
 # Support unset when possible.
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
@@ -87,60 +30,33 @@ else
 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 -z "`(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,391 +64,157 @@ 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
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-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_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
+# 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 ( 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=:
@@ -541,28 +223,7 @@ else
   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'"
@@ -571,27 +232,39 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
+# 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,624 +275,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
-WITHOUT_AFMS
-WITHOUT_PPDS
-WITH_FONTS
-SYSTEM_MSPACK
-WITH_FONTOOO
-ENABLE_KAB
-ENABLE_EVOAB2
-GOBJECT_LIBS
-GOBJECT_CFLAGS
-ENABLE_LOCKDOWN
-KDE4_LIBS
-KDE4_CFLAGS
-MOC4
-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_KDE4
-ENABLE_KDE
-ENABLE_GTK
-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
-SYSTEM_OPENSSL
-OPENSSL_LIBS
-OPENSSL_CFLAGS
-NEON_VERSION
-SYSTEM_NEON
-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_GRAPHITE
-ENABLE_GRAPHITE
-GRAPHITE_LIBS
-GRAPHITE_CFLAGS
-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
-MOZILLABUILD
-ENABLE_NSS_MODULE
-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
-CCACHE
-USE_CCACHE
-USE_SYSTEM_STL
-STLPORT_VER
-STLPORT4
-EXCEPTIONS
-MINGW_GXXDLL
-MINGW_GCCDLL
-MINGW_SHARED_GXXLIB
-MINGW_GCCLIB_EH
-MINGW_SHARED_GCCLIB
-MINGW_CLIB_DIR
-MINGW_BACKWARD_INCLUDE_PATH
-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
-NO_HIDS
-ENABLE_PCH
-HAVE_LD_BSYMBOLIC_FUNCTIONS
-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
-GNUTAR
-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 NO_HIDS 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 MINGW_BACKWARD_INCLUDE_PATH MINGW_CLIB_DIR MINGW_SHARED_GCCLIB MINGW_GCCLIB_EH MINGW_SHARED_GXXLIB MINGW_GCCDLL MINGW_GXXDLL EXCEPTIONS STLPORT4 STLPORT_VER USE_SYSTEM_STL USE_CCACHE CCACHE 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 ENABLE_NSS_MODULE MOZILLABUILD 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 GRAPHITE_CFLAGS GRAPHITE_LIBS ENABLE_GRAPHITE SYSTEM_GRAPHITE 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 SYSTEM_NEON NEON_VERSION OPENSSL_CFLAGS OPENSSL_LIBS SYSTEM_OPENSSL 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 ENABLE_GTK ENABLE_KDE ENABLE_KDE4 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 MOC4 KDE4_CFLAGS KDE4_LIBS ENABLE_LOCKDOWN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB 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
-enable_graphite
-with_system_graphite
-enable_ldap
-with_openldap
-enable_lockdown
-enable_vba
-with_vba_package_format
-enable_pch
-enable_hids
-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_nss_module
-enable_kde
-enable_kdeab
-enable_kde4
-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_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_mozilla_build
-with_local_solenv
-with_local_solver
-enable_check_only
-enable_ccache_skip
-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
@@ -1242,48 +337,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 ;;
@@ -1305,61 +386,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- \
@@ -1386,12 +439,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 ;;
@@ -1416,16 +463,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)
@@ -1490,16 +534,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 ;;
@@ -1550,38 +584,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.
@@ -1601,7 +623,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; }; }
     ;;
@@ -1610,16 +632,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}
     ;;
 
@@ -1628,39 +651,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'
@@ -1674,7 +689,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
@@ -1687,76 +702,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
-   { (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
+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; }; }
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-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
+  else
+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+   { (exit 1); exit 1; }; }
+  fi
+fi
+(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.
@@ -1785,11 +810,14 @@ 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]
+			  [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
+			  [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1799,25 +827,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
@@ -1838,7 +859,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]
   --enable-graphite       Enables the compilation of Graphite smart font rendering
@@ -1868,9 +888,6 @@ Optional Features:
   --disable-qadevooo      OO.o includes some qa testsuites which some
                           packagers may wish to build without
 
-  --disable-fontooo       disable FontOOo
-                          (useful for distributions using fontconfig for OOo)
-
   --disable-mathmldtd     disable mathmldtd
                           (useful for distributions that want to avoid packaging
                           it)
@@ -2026,11 +1043,6 @@ Optional Features:
                           explicitly enable if your version of ccache doesn't
                           identify as version 2.4_OOo
 
-  --enable-sgistl         for IRIX users, use this option option to build
-                          OpenOffice.org using SGI's STL.
-
-                          Usage: --enable-sgistl=yes
-
   --enable-verbose        Increase build verbosity.
   --disable-verbose       Decrease build verbosity.
 
@@ -2092,8 +1104,6 @@ Optional Packages:
 
   --with-system-stdlibs   use libstdc++/libgcc_s already on system
 
-  --with-system-mspack    use libmspack already installed on system
-
   --with-system-cairo      Use Cairo libraries already on system
 
   --with-mozilla-version  Choose which version of mozilla to use while building
@@ -2311,11 +1321,14 @@ Optional Packages:
 
                           Usage: --with-directx-home=<absolute path to Microsoft DirectX SDK>
 
-  --with-mozilla-build   For Windows users, please supply the path to the
+  --with-mozilla-build    For Windows users, please supply the path to the
                           mozilla build tools.
 
                           Usage: --with-mozilla-build=<absolute path to mozilla build tools>
 
+						  At the moment of this writing, an installer for the mozilla build tools
+						  can be obtained from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32.
+
   --with-local-solenv     If you have solenv in a location other than ./solenv,
                           please supply the path here.
 
@@ -2401,9 +1414,8 @@ Optional Packages:
                           Supported options:
                             tcsh (default)
                             bash
-                            4nt (windows only)
 
-                          Usage: --with-use-shell=tcsh|bash|4nt
+                          Usage: --with-use-shell=tcsh|bash
 
   --with-build-version    Allows the builder to add a custom version tag
                           that will appear in the Help/About box for QA
@@ -2421,101 +1433,129 @@ 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 ;;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+  case "$ac_dir" in
+  .) ac_abs_builddir=`pwd`;;
+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+  case ${ac_top_builddir}. in
+  .) ac_abs_top_builddir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+  case $ac_srcdir in
+  .) ac_abs_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+  case $ac_top_srcdir in
+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+  esac;;
 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
+
+    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 (C) 2003 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.59.  Invocation command line was
 
   $ $0 $@
 
 _ACEOF
-exec 5>>config.log
 {
 cat <<_ASUNAME
 ## --------- ##
@@ -2534,7 +1574,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`
@@ -2546,9 +1586,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
 
@@ -2570,6 +1609,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
@@ -2580,8 +1620,8 @@ 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'" ;;
@@ -2602,7 +1642,9 @@ do
 	  -* ) 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
@@ -2613,8 +1655,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.
   {
@@ -2627,35 +1669,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
@@ -2666,28 +1693,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
@@ -2699,24 +1720,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 &&
+  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.
 
@@ -2746,24 +1769,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
@@ -2773,61 +1790,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
@@ -2837,15 +1847,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
+
 
 
 
@@ -2862,1044 +1876,1021 @@ 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"
 
-# Check whether --enable-graphite was given.
+fi;
+# Check whether --enable-graphite or --disable-graphite was given.
 if test "${enable_graphite+set}" = set; then
-  enableval=$enable_graphite;
-fi
+  enableval="$enable_graphite"
 
+fi;
 
-# Check whether --with-system-graphite was given.
+# Check whether --with-system-graphite or --without-system-graphite was given.
 if test "${with_system_graphite+set}" = set; then
-  withval=$with_system_graphite;
-fi
+  withval="$with_system_graphite"
 
-# 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-hids was given.
+fi;
+# Check whether --enable-hids or --disable-hids was given.
 if test "${enable_hids+set}" = set; then
-  enableval=$enable_hids;
-fi
+  enableval="$enable_hids"
 
-# 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;
-else
-  enable_qadevooo="yes"
-fi
+  enableval="$enable_qadevooo"
 
-# Check whether --enable-fontooo was given.
-if test "${enable_fontooo+set}" = set; then
-  enableval=$enable_fontooo;
 else
-  enable_fontooo="yes"
-fi
-
-# Check whether --enable-mathmldtd was given.
+  enable_qadevooo="yes"
+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;
-else
-  checkforprelink=yes
-fi
-
-
-# Check whether --with-system-mspack was given.
-if test "${with_system_mspack+set}" = set; then
-  withval=$with_system_mspack;
-fi
+  withval="$with_system_stdlibs"
 
-# Check whether --enable-cups was given.
+else
+  checkforstdlibproblems=yes
+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-nss_module was given.
+fi;
+# Check whether --enable-nss_module or --disable-nss_module was given.
 if test "${enable_nss_module+set}" = set; then
-  enableval=$enable_nss_module;
+  enableval="$enable_nss_module"
+
 else
   enable_nss_module=yes
-fi
-
-# 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-kde4 was given.
+fi;
+# Check whether --enable-kde4 or --disable-kde4 was given.
 if test "${enable_kde4+set}" = set; then
-  enableval=$enable_kde4;
-fi
+  enableval="$enable_kde4"
 
-# 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
+  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"
-
-fi
+  withval="$with_commons_codec_jar"
+   COMMONS_CODEC_JAR="$withval"
 
+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"
+  withval="$with_servlet_api_jar"
+   SERVLETAPI_JAR="$withval"
 
-fi
-
-# 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"
-
-fi
+  withval="$with_sac_jar"
+   SAC_JAR="$withval"
 
+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"
-
-fi
+  withval="$with_jfreereport_jar"
+   JFREEREPORT_JAR="$withval"
 
+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-mozilla-build was given.
+# Check whether --with-mozilla-build or --without-mozilla-build was given.
 if test "${with_mozilla_build+set}" = set; then
-  withval=$with_mozilla_build; MOZILLABUILD=$withval
-fi
+  withval="$with_mozilla_build"
+  MOZILLABUILD=$withval
+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"
 
-# Check whether --enable-ccache-skip was given.
+fi;
+# Check whether --enable-ccache-skip or --disable-ccache-skip was given.
 if test "${enable_ccache_skip+set}" = set; then
-  enableval=$enable_ccache_skip;
+  enableval="$enable_ccache_skip"
+
 else
   enable_ccache_skip=auto
-fi
+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.
-if test "${enable_sgistl+set}" = set; then
-  enableval=$enable_sgistl;
-fi
-
+  withval="$with_build_version"
+  with_build_version=$withval
+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"
 
@@ -3926,148 +2917,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
-    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
+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_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.
@@ -4078,36 +2950,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
   [\\/]* | ?:[\\/]*)
@@ -4120,31 +2990,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
 
@@ -4152,10 +3021,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
   [\\/]* | ?:[\\/]*)
@@ -4168,47 +3037,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
 
 
@@ -4226,160 +3094,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.
@@ -4390,20 +3208,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
@@ -4421,10 +3239,10 @@ case "$build_os" in
 		_os=SunOS
 		# Extract the first word of "gtar", so it can be a program name with args.
 set dummy gtar; 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_GNUTAR+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $GNUTAR in
   [\\/]* | ?:[\\/]*)
@@ -4438,55 +3256,54 @@ 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_GNUTAR="$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
 GNUTAR=$ac_cv_path_GNUTAR
+
 if test -n "$GNUTAR"; then
-  { $as_echo "$as_me:$LINENO: result: $GNUTAR" >&5
-$as_echo "$GNUTAR" >&6; }
+  echo "$as_me:$LINENO: result: $GNUTAR" >&5
+echo "${ECHO_T}$GNUTAR" >&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 "$GNUTAR"; then
-			{ { $as_echo "$as_me:$LINENO: error: gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." >&5
-$as_echo "$as_me: error: gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." >&2;}
+			{ { 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
 		;;
@@ -4498,9 +3315,6 @@ $as_echo "$as_me: error: only sparc and i386 processors are supported" >&2;}
 		test_cups=yes
         test_randr=yes
 		test_freetype=yes
-		if getconf GNU_LIBPTHREAD_VERSION |grep -q NPTL; then
-			PTHREAD_CFLAGS="-DNPTL"
-		fi
 		_os=Linux
 		;;
 	gnu)
@@ -4521,8 +3335,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
@@ -4543,17 +3357,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"
@@ -4564,8 +3378,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)
@@ -4585,12 +3399,6 @@ $as_echo "$PTHREAD_LIBS" >&6; }
 		PTHREAD_LIBS="-pthread -lpthread"
 		_os=NetBSD
 		;;
-	irix*)
-		test_cups=no
-        test_randr=no
-		test_freetype=yes
-		_os=IRIX
-		;;
 	aix*)
 		test_cups=no
         test_randr=no
@@ -4600,8 +3408,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
@@ -4610,27 +3418,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
@@ -4642,89 +3450,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=
@@ -4733,21 +3541,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
@@ -4760,151 +3568,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
@@ -4913,19 +3721,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;}
+      if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash"; then
+      { { 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
                      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; }; }
@@ -4938,7 +3746,7 @@ link, and copy the program to the name of the link." >&2;}
          fi
       fi
             if test "$WITH_MINGWIN" = "yes" ; then
-      if test "$with_use_shell" = "4nt" -o "x$with_use_shell" = "x"; then
+      if test "x$with_use_shell" = "x"; then
          with_use_shell="tcsh"
       fi
       if test -z "$CC"; then
@@ -4947,33 +3755,33 @@ link, and copy the program to the name of the link." >&2;}
       fi
    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;}
+   if test "$with_use_shell" != "tcsh"; then
+      { { echo "$as_me:$LINENO: error: only \"tcsh\" is supported options" >&5
+echo "$as_me: error: only \"tcsh\" is 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; }
+if test "$_os" = "WINNT" ; then
+   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
@@ -4982,10 +3790,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
   [\\/]* | ?:[\\/]*)
@@ -4998,31 +3806,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"`
@@ -5030,10 +3837,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
   [\\/]* | ?:[\\/]*)
@@ -5046,51 +3853,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
@@ -5108,10 +3914,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.
@@ -5122,36 +3928,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.
@@ -5162,49 +3966,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.
@@ -5215,36 +4008,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.
@@ -5256,18 +4089,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.
@@ -5285,25 +4117,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.
@@ -5314,40 +4145,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.
@@ -5358,90 +4187,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_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
@@ -5460,150 +4257,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 file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+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;;
     *.* )
-        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.
+	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;;
   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
@@ -5612,33 +4370,32 @@ $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" : '[^.]*\(\..*\)'`
+	  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
 /* confdefs.h.  */
@@ -5656,48 +4413,39 @@ 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
 /* confdefs.h.  */
@@ -5718,54 +4466,50 @@ 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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err 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
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -5781,121 +4525,38 @@ 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>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
-/* 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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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
-  :
-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
 
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+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
-   ac_c_werror_flag=$ac_save_c_werror_flag
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 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
@@ -5911,12 +4572,12 @@ 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
 /* confdefs.h.  */
@@ -5950,17 +4611,12 @@ static char *f (char * (*g) (char **, int), char **p, ...)
 /* 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
+   as 'x'.  The following induces an error, until -std1 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.  */
+   that's true only with -std1.  */
 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);};
@@ -5975,58 +4631,205 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_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.err 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>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  for ac_declaration in \
+   '' \
+   '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
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_declaration
+#include <stdlib.h>
+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>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+continue
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$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>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+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.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -6041,10 +4844,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
   [\\/]* | ?:[\\/]*)
@@ -6057,76 +4860,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_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
 
         COMPATH=`echo $COMPATH | $SED "s@/[^/:]*\\\$@@"`;
 fi
-
+COMPATH=`echo $COMPATH | $SED "s@/[Bb][Ii][Nn]\\\$@@"`;
+echo $COMPATH
 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
 
 
 HAVE_LD_BSYMBOLIC_FUNCTIONS=
 if test "$GCC" = "yes"; then
-   { $as_echo "$as_me:$LINENO: checking for -Bsymbolic-functions linker support " >&5
-$as_echo_n "checking for -Bsymbolic-functions linker support ... " >&6; }
+   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"
 
@@ -6150,86 +4953,84 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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
-  $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 \
+rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
    if test "z$HAVE_LD_BSYMBOLIC_FUNCTIONS" = "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=$bsymbolic_functions_ldflags_save
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to enable pch feature" >&5
-$as_echo_n "checking whether to enable pch feature... " >&6; }
+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 whether to enable hid list feature" >&5
-$as_echo_n "checking whether to enable hid list feature... " >&6; }
+echo "$as_me:$LINENO: checking whether to enable hid list feature" >&5
+echo $ECHO_N "checking whether to enable hid list feature... $ECHO_C" >&6
 if test -n "$enable_hids" && test "$enable_hids" != "no"; then
    NO_HIDS=""
-   { $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
    NO_HIDS="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 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
@@ -6237,40 +5038,40 @@ 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
 
 
-{ $as_echo "$as_me:$LINENO: checking for GNU tar" >&5
-$as_echo_n "checking for GNU tar... " >&6; }
+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
@@ -6278,11 +5079,11 @@ for a in $GNUTAR gtar gnutar tar; do
            break
       fi
 done
-{ $as_echo "$as_me:$LINENO: result: $GNUTAR" >&5
-$as_echo "$GNUTAR" >&6; }
+echo "$as_me:$LINENO: result: $GNUTAR" >&5
+echo "${ECHO_T}$GNUTAR" >&6
 if test -z "$GNUTAR"; then
-    { { $as_echo "$as_me:$LINENO: error: not found. install GNU tar." >&5
-$as_echo "$as_me: error: not found. install GNU tar." >&2;}
+    { { 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
 
@@ -6294,10 +5095,10 @@ if test "$_os" = "SunOS"; 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
   [\\/]* | ?:[\\/]*)
@@ -6310,58 +5111,57 @@ 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; }
+      COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
+      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
@@ -6384,128 +5184,57 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
 
 
-if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; 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; }
-if test "${ac_cv_path__cc+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  case $_cc in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path__cc="$_cc" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path__cc="$as_dir/$ac_word$ac_exec_ext"
-    $as_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; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "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; }
-            _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;}
-   { (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;}
-   { (exit 1); exit 1; }; }
-         else
-                        { $as_echo "$as_me:$LINENO: result: checked" >&5
-$as_echo "checked" >&6; }
-         fi
-      fi
-   fi
-fi
-
 if test "$_os" = "OSF1"; 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
   [\\/]* | ?:[\\/]*)
@@ -6518,45 +5247,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; }
+      COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
+      { 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
@@ -6564,10 +5292,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
   [\\/]* | ?:[\\/]*)
@@ -6580,28 +5308,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"`
@@ -6610,46 +5337,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`;
@@ -6659,8 +5386,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"`
@@ -6681,10 +5408,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
   [\\/]* | ?:[\\/]*)
@@ -6697,34 +5424,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
   [\\/]* | ?:[\\/]*)
@@ -6737,51 +5463,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
   [\\/]* | ?:[\\/]*)
@@ -6794,40 +5519,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; }
-			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: result: found ($CC)" >&5
+echo "${ECHO_T}found ($CC)" >&6
+			COMPATH=`echo $CC | $SED 's@\/[Bb][Ii][Nn]\/[cC][lL]\.[eE][xX][eE]@@'`
+			export INCLUDE=`cygpath -d "$COMPATH/Include"`
+						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)
@@ -6836,47 +5560,47 @@ $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
 				MSVSVER=2008
-				{ $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
 				MSVSVER=2005
-				{ $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
 				MSVSVER=2003
-				{ $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
@@ -6889,10 +5613,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
   [\\/]* | ?:[\\/]*)
@@ -6905,28 +5629,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
@@ -6952,8 +5675,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 )
@@ -6962,10 +5685,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
   [\\/]* | ?:[\\/]*)
@@ -6978,28 +5701,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
@@ -7015,16 +5737,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
@@ -7046,12 +5768,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"`
@@ -7067,15 +5789,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"
@@ -7102,35 +5824,35 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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
 /* confdefs.h.  */
@@ -7140,34 +5862,34 @@ 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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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
@@ -7185,8 +5907,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
@@ -7209,35 +5931,35 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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
 /* confdefs.h.  */
@@ -7247,34 +5969,34 @@ 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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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
@@ -7283,13 +6005,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
@@ -7299,10 +6019,10 @@ 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
 /* confdefs.h.  */
@@ -7324,32 +6044,35 @@ 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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_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.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
@@ -7405,7 +6128,6 @@ 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))
@@ -7425,50 +6147,36 @@ main ()
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
 	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
+      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 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
@@ -7480,24 +6188,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.
@@ -7508,40 +6212,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.
@@ -7552,87 +6254,57 @@ 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
 /* confdefs.h.  */
@@ -7653,54 +6325,50 @@ 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>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_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 -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err 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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -7716,152 +6384,175 @@ 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>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_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 -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_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.err 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 \
+   '' \
+   '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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
+$ac_declaration
+#include <stdlib.h>
 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>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_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 -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   :
 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.err conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
+$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>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_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 -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  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.err 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"
@@ -7888,35 +6579,35 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     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
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_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
 /* confdefs.h.  */
@@ -7926,34 +6617,34 @@ 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
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_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
@@ -7971,8 +6662,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
@@ -7995,35 +6686,35 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     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
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_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
 /* confdefs.h.  */
@@ -8033,34 +6724,34 @@ 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
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_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
@@ -8069,13 +6760,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
@@ -8093,15 +6782,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"
@@ -8128,35 +6817,35 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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
 /* confdefs.h.  */
@@ -8166,34 +6855,34 @@ 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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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
@@ -8211,8 +6900,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
@@ -8235,35 +6924,35 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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
 /* confdefs.h.  */
@@ -8273,34 +6962,34 @@ 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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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
@@ -8309,13 +6998,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
@@ -8340,11 +7027,11 @@ 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
 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
 /* confdefs.h.  */
@@ -8357,42 +7044,41 @@ $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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "$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.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-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
@@ -8400,15 +7086,73 @@ 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
+/* 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>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_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.err 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
@@ -8421,7 +7165,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
 
   ;
@@ -8429,23 +7173,27 @@ 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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -8458,7 +7206,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
 
   ;
@@ -8466,43 +7214,46 @@ 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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err 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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -8512,7 +7263,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
 
   ;
@@ -8520,23 +7271,27 @@ 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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -8549,7 +7304,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
 
   ;
@@ -8557,49 +7312,50 @@ 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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err 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.err conftest.$ac_objext conftest.$ac_ext
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err 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`
@@ -8613,7 +7369,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
 
   ;
@@ -8621,48 +7377,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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err 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
 /* confdefs.h.  */
 _ACEOF
@@ -8670,8 +7430,8 @@ 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
@@ -8680,80 +7440,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 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
@@ -8761,324 +7502,172 @@ _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
-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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 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
 /* 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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   # It does; now see whether it defined to BIG_ENDIAN or not.
-	 cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF
 /* 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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_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.err 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
 /* 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>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
-  # 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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (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); }; } &&
+	 { 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
+  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.err conftest.$ac_objext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -9086,108 +7675,84 @@ _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 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.err 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.
+     	 # 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
 /* confdefs.h.  */
 _ACEOF
@@ -9211,79 +7776,84 @@ 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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   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.err conftest.$ac_objext
+     	 CC="$CC -n32"
+     	 rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  $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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_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
+rm -f conftest.err 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
 /* confdefs.h.  */
 _ACEOF
@@ -9308,32 +7878,34 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  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.err conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9359,54 +7931,54 @@ 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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_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.err 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
 /* confdefs.h.  */
 _ACEOF
@@ -9431,32 +8003,34 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  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.err conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9482,48 +8056,47 @@ 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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_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.err 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
@@ -9534,44 +8107,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
@@ -9582,17 +8155,17 @@ 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
 /* confdefs.h.  */
 _ACEOF
@@ -9603,38 +8176,41 @@ $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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $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
 /* confdefs.h.  */
 _ACEOF
@@ -9643,76 +8219,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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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;}
+    { 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 compiler's result" >&5
+echo "$as_me: WARNING: cups/cups.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   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;}
-
+    { 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: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: cups/cups.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: cups/cups.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: cups/cups.h:     section \"Present But Cannot Be Compiled\"" >&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;}
+    { echo "$as_me:$LINENO: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_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
 
@@ -9720,24 +8303,24 @@ 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
 /* confdefs.h.  */
 _ACEOF
@@ -9748,38 +8331,41 @@ $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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $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
 /* confdefs.h.  */
 _ACEOF
@@ -9788,91 +8374,98 @@ 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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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;}
+    { 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 compiler's result" >&5
+echo "$as_me: WARNING: security/pam_appl.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   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;}
-
+    { 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: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: security/pam_appl.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: security/pam_appl.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: security/pam_appl.h:     section \"Present But Cannot Be Compiled\"" >&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;}
+    { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_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"
@@ -9883,58 +8476,57 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
@@ -9942,19 +8534,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
 
@@ -9965,11 +8557,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
 
 
@@ -10008,32 +8600,34 @@ 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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_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.err conftest.$ac_objext conftest.$ac_ext
 
 #
 # FIVE ARGUMENTS
@@ -10065,32 +8659,34 @@ 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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_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.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
@@ -10124,32 +8720,34 @@ 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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_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.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
@@ -10160,29 +8758,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
@@ -10202,17 +8800,17 @@ 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"
@@ -10223,58 +8821,57 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
@@ -10282,14 +8879,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
@@ -10308,24 +8905,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.
@@ -10336,40 +8929,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.
@@ -10380,87 +8971,57 @@ 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
 /* confdefs.h.  */
@@ -10481,54 +9042,50 @@ 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>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_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 -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err 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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -10544,136 +9101,159 @@ 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>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_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 -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_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.err 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 \
+   '' \
+   '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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
+$ac_declaration
+#include <stdlib.h>
 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>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_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 -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   :
 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.err conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
+$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>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_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 -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  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.err 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'
@@ -10683,28 +9263,26 @@ 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
 /* confdefs.h.  */
@@ -10736,44 +9314,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 gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-
-
       fi
    fi
 fi
@@ -10781,8 +9345,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
@@ -10800,18 +9364,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>
@@ -10829,16 +9393,16 @@ _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"
 
-   { $as_echo "$as_me:$LINENO: checking for mingwin c++ backward include path" >&5
-$as_echo_n "checking for mingwin c++ backward include path... " >&6; }
+   echo "$as_me:$LINENO: checking for mingwin c++ backward include path" >&5
+echo $ECHO_N "checking for mingwin c++ backward include path... $ECHO_C" >&6
    cat >conftest.$ac_ext <<_ACEOF
 #include <hash_set>
 _ACEOF
@@ -10847,57 +9411,57 @@ _ACEOF
    if test -n "$_mingw_backward_include_path"; then
       _mingw_backward_include_path=`cygpath -d $_mingw_backward_include_path`
       _mingw_backward_include_path=`cygpath -u $_mingw_backward_include_path`
-      { $as_echo "$as_me:$LINENO: result: $_mingw_backward_include_path" >&5
-$as_echo "$_mingw_backward_include_path" >&6; }
+      echo "$as_me:$LINENO: result: $_mingw_backward_include_path" >&5
+echo "${ECHO_T}$_mingw_backward_include_path" >&6
    else
       _mingw_backward_include_path="NO_BACKWARD_INCLUDE"
-      { $as_echo "$as_me:$LINENO: result: no mingwin c++ backward includes" >&5
-$as_echo "no mingwin c++ backward includes" >&6; }
+      echo "$as_me:$LINENO: result: no mingwin c++ backward includes" >&5
+echo "${ECHO_T}no mingwin c++ backward includes" >&6
    fi
   MINGW_BACKWARD_INCLUDE_PATH="$_mingw_backward_include_path"
 
   mingw_crtbegin=`$CC -print-file-name=crtbegin.o`
   MINGW_CLIB_DIR=`dirname $mingw_crtbegin`
-  { $as_echo "$as_me:$LINENO: checking whether to use dynamic libgcc" >&5
-$as_echo_n "checking whether to use dynamic libgcc... " >&6; }
+  echo "$as_me:$LINENO: checking whether to use dynamic libgcc" >&5
+echo $ECHO_N "checking whether to use dynamic libgcc... $ECHO_C" >&6
   if test -e "$MINGW_CLIB_DIR/libgcc_s.a"; then
-    { $as_echo "$as_me:$LINENO: checking dynamic libgcc name" >&5
-$as_echo_n "checking dynamic libgcc name... " >&6; }
+    echo "$as_me:$LINENO: checking dynamic libgcc name" >&5
+echo $ECHO_N "checking dynamic libgcc name... $ECHO_C" >&6
     MINGW_GCCDLL_pattern=`nm $MINGW_CLIB_DIR/libgcc_s.a | sed -ne 's@.* _libgcc\(.*\)_dll_iname@libgcc\1.dll@p' | uniq | sed -e 's@_@?@g'`
-    MINGW_GCCDLL=`cd $COMPATH && ls $MINGW_GCCDLL_pattern 2>/dev/null`
+    MINGW_GCCDLL=`cd $COMPATH/bin && ls $MINGW_GCCDLL_pattern 2>/dev/null`
     if test -n "$MINGW_GCCDLL"; then
         MINGW_SHARED_GCCLIB=YES
-        { $as_echo "$as_me:$LINENO: result: use $MINGW_GCCDLL" >&5
-$as_echo "use $MINGW_GCCDLL" >&6; }
+        echo "$as_me:$LINENO: result: use $MINGW_GCCDLL" >&5
+echo "${ECHO_T}use $MINGW_GCCDLL" >&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
-    { $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 -e "$MINGW_CLIB_DIR/libgcc_eh.a"; then
       MINGW_GCCLIB_EH=YES
   fi
-  { $as_echo "$as_me:$LINENO: checking whether to use dynamic libstdc++" >&5
-$as_echo_n "checking whether to use dynamic libstdc++... " >&6; }
+  echo "$as_me:$LINENO: checking whether to use dynamic libstdc++" >&5
+echo $ECHO_N "checking whether to use dynamic libstdc++... $ECHO_C" >&6
   if test -e "$MINGW_CLIB_DIR/libstdc++_s.a" ; then
-    { $as_echo "$as_me:$LINENO: checking dynamic libstdc++ name" >&5
-$as_echo_n "checking dynamic libstdc++ name... " >&6; }
+    echo "$as_me:$LINENO: checking dynamic libstdc++ name" >&5
+echo $ECHO_N "checking dynamic libstdc++ name... $ECHO_C" >&6
     MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/libstdc++_s.a | sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' | uniq | sed -e 's@_@?@g'`
-    MINGW_GXXDLL=`cd $COMPATH && ls $MINGW_GXXDLL_pattern 2>/dev/null`
+    MINGW_GXXDLL=`cd $COMPATH/bin && ls $MINGW_GXXDLL_pattern 2>/dev/null`
     if test -n "$MINGW_GXXDLL"; then
         MINGW_SHARED_GXXLIB=YES
-        { $as_echo "$as_me:$LINENO: result: use $MINGW_GXXDLL" >&5
-$as_echo "use $MINGW_GXXDLL" >&6; }
+        echo "$as_me:$LINENO: result: use $MINGW_GXXDLL" >&5
+echo "${ECHO_T}use $MINGW_GXXDLL" >&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
-    { $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
   MINGW_CLIB_DIR=`cygpath $MINGW_CLIB_DIR`
 
@@ -10910,64 +9474,50 @@ 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; }
-      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; }
-      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 "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
 
-{ $as_echo "$as_me:$LINENO: checking exception type" >&5
-$as_echo_n "checking exception type... " >&6; }
-ac_ext=cpp
+echo "$as_me:$LINENO: checking exception type" >&5
+echo $ECHO_N "checking exception type... $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'
@@ -10995,42 +9545,41 @@ _Unwind_SjLj_RaiseException()
 }
 _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>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_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 -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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
   exceptions_type="sjlj"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	exceptions_type="dwarf2"
+exceptions_type="dwarf2"
 
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
 
-{ $as_echo "$as_me:$LINENO: result: $exceptions_type" >&5
-$as_echo "$exceptions_type" >&6; }
+echo "$as_me:$LINENO: result: $exceptions_type" >&5
+echo "${ECHO_T}$exceptions_type" >&6
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -11043,8 +9592,8 @@ EXCEPTIONS="$exceptions_type"
 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
@@ -11058,15 +9607,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
@@ -11080,17 +9629,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
@@ -11104,15 +9653,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
@@ -11126,38 +9675,19 @@ $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
    fi
 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; }
-		if test -d /usr/include/CC ; then
-			{ $as_echo "$as_me:$LINENO: result: yes." >&5
-$as_echo "yes." >&6; }
-
-		else
-			{ $as_echo "$as_me:$LINENO: result: not found." >&5
-$as_echo "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;}
-   { (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
@@ -11178,35 +9708,35 @@ $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
@@ -11220,114 +9750,95 @@ 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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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; }
-			   else
-				   if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
-					   { $as_echo "$as_me:$LINENO: result: checked" >&5
-$as_echo "checked" >&6; }
-				   elif test -f "$STLPORT4/lib/libstlport.so"; then
-					   { $as_echo "$as_me:$LINENO: result: checked" >&5
-$as_echo "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;}
-   { (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
-fi
 
 if test -z "$STLPORT4"; then
   STLPORT4="NO_STLPORT4"
@@ -11340,8 +9851,8 @@ 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
@@ -11360,73 +9871,71 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
 
 # ===================================================================
 # use --ccache-skip?
 # ===================================================================
-{ $as_echo "$as_me:$LINENO: checking whether we are allowed and able to use --ccache-skip" >&5
-$as_echo_n "checking whether we are allowed and able to use --ccache-skip... " >&6; }
+echo "$as_me:$LINENO: checking whether we are allowed and able to use --ccache-skip" >&5
+echo $ECHO_N "checking whether we are allowed and able to use --ccache-skip... $ECHO_C" >&6
 if test "$_os" != "Darwin" ; then
-   { $as_echo "$as_me:$LINENO: result: only used on Mac currently, skipping" >&5
-$as_echo "only used on Mac currently, skipping" >&6; }
+   echo "$as_me:$LINENO: result: only used on Mac currently, skipping" >&5
+echo "${ECHO_T}only used on Mac currently, skipping" >&6
 elif test "$enable_ccache_skip" = "no" ; then
-   { $as_echo "$as_me:$LINENO: result: no - diabled explicitly" >&5
-$as_echo "no - diabled explicitly" >&6; }
+   echo "$as_me:$LINENO: result: no - diabled explicitly" >&5
+echo "${ECHO_T}no - diabled explicitly" >&6
 elif test "$enable_ccache_skip" = "yes" ; then
-   { $as_echo "$as_me:$LINENO: result: yes - enabled explicitly, skipping checks" >&5
-$as_echo "yes - enabled explicitly, skipping checks" >&6; }
+   echo "$as_me:$LINENO: result: yes - enabled explicitly, skipping checks" >&5
+echo "${ECHO_T}yes - enabled explicitly, skipping checks" >&6
    USE_CCACHE=YES
 
 elif test "$enable_ccache_skip" = "auto" ; then
    # checking for ccache presence/version
-   { $as_echo "$as_me:$LINENO: result: probing..." >&5
-$as_echo "probing..." >&6; }
+   echo "$as_me:$LINENO: result: probing..." >&5
+echo "${ECHO_T}probing..." >&6
    # Extract the first word of "ccache", so it can be a program name with args.
 set dummy ccache; 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_CCACHE+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $CCACHE in
   [\\/]* | ?:[\\/]*)
@@ -11439,43 +9948,42 @@ 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_CCACHE="$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_CCACHE" && ac_cv_path_CCACHE="not_found"
   ;;
 esac
 fi
 CCACHE=$ac_cv_path_CCACHE
+
 if test -n "$CCACHE"; then
-  { $as_echo "$as_me:$LINENO: result: $CCACHE" >&5
-$as_echo "$CCACHE" >&6; }
+  echo "$as_me:$LINENO: result: $CCACHE" >&5
+echo "${ECHO_T}$CCACHE" >&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 "$CCACHE" = "not_found" ; then
-      { $as_echo "$as_me:$LINENO: not enabling --ccache-skip (ccache not found)" >&5
-$as_echo "$as_me: not enabling --ccache-skip (ccache not found)" >&6;}
+      { echo "$as_me:$LINENO: not enabling --ccache-skip (ccache not found)" >&5
+echo "$as_me: not enabling --ccache-skip (ccache not found)" >&6;}
    else
       # check ccache version
-      { $as_echo "$as_me:$LINENO: checking whether version of ccache is suitable" >&5
-$as_echo_n "checking whether version of ccache is suitable... " >&6; }
+      echo "$as_me:$LINENO: checking whether version of ccache is suitable" >&5
+echo $ECHO_N "checking whether version of ccache is suitable... $ECHO_C" >&6
       CCACHE_VERSION=`"$CCACHE" -V | "$AWK" '/^ccache version/{print $3}'`
       if test "$CCACHE_VERSION" = "2.4_OOo"; then
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-         { $as_echo "$as_me:$LINENO: checking whether ccache is actually used for the build" >&5
-$as_echo_n "checking whether ccache is actually used for the build... " >&6; }
-         ac_ext=cpp
+         echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+         echo "$as_me:$LINENO: checking whether ccache is actually used for the build" >&5
+echo $ECHO_N "checking whether ccache is actually used for the build... $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'
@@ -11499,40 +10007,43 @@ 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>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_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 -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   use_ccache=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	use_ccache=no
+use_ccache=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
          if test $use_ccache = yes ; then
-            { $as_echo "$as_me:$LINENO: result: yes, will enable --ccache-skip" >&5
-$as_echo "yes, will enable --ccache-skip" >&6; }
+            echo "$as_me:$LINENO: result: yes, will enable --ccache-skip" >&5
+echo "${ECHO_T}yes, will enable --ccache-skip" >&6
             USE_CCACHE=YES
 
          else
-            { $as_echo "$as_me:$LINENO: result: no, will not enable --ccache-skip" >&5
-$as_echo "no, will not enable --ccache-skip" >&6; }
+            echo "$as_me:$LINENO: result: no, will not enable --ccache-skip" >&5
+echo "${ECHO_T}no, will not enable --ccache-skip" >&6
          fi
          CXXFLAGS=$save_CXXFLAGS
          ac_ext=c
@@ -11542,22 +10053,22 @@ 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: no" >&5
-$as_echo "no" >&6; }
-         { $as_echo "$as_me:$LINENO: ccache version $CCACHE_VERSION not accepted. See description for --enable-ccache-skip" >&5
-$as_echo "$as_me: ccache version $CCACHE_VERSION not accepted. See description for --enable-ccache-skip" >&6;}
+         echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+         { echo "$as_me:$LINENO: ccache version $CCACHE_VERSION not accepted. See description for --enable-ccache-skip" >&5
+echo "$as_me: ccache version $CCACHE_VERSION not accepted. See description for --enable-ccache-skip" >&6;}
       fi
    fi
 else
-   { { $as_echo "$as_me:$LINENO: error: invalid option to --enable-ccache-skip. Valid values are \"auto\", \"yes\" and \"no\"" >&5
-$as_echo "$as_me: error: invalid option to --enable-ccache-skip. Valid values are \"auto\", \"yes\" and \"no\"" >&2;}
+   { { echo "$as_me:$LINENO: error: invalid option to --enable-ccache-skip. Valid values are \"auto\", \"yes\" and \"no\"" >&5
+echo "$as_me: error: invalid option to --enable-ccache-skip. Valid values are \"auto\", \"yes\" and \"no\"" >&2;}
    { (exit 1); exit 1; }; }
 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'
@@ -11582,45 +10093,48 @@ 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>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_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 -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_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.err 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
 /* confdefs.h.  */
@@ -11639,11 +10153,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
@@ -11653,8 +10167,8 @@ $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
 /* confdefs.h.  */
 _ACEOF
@@ -11673,43 +10187,42 @@ 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>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_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 -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
-      { $as_echo "$as_me:$LINENO: result: $gccvisok" >&5
-$as_echo "$gccvisok" >&6; }
+      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
@@ -11718,8 +10231,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 {
@@ -11732,19 +10245,26 @@ _ACEOF
       if ! $CXX $CXXFLAGS $CPPFLAGS -fpic -S visibility.cxx 2>/dev/null > /dev/null; then
          gccvisbroken=yes
       else
-         if $EGREP -q '@PLT|\$stub' visibility.s; then
-             gccvisbroken=no;
-         else
-             gccvisbroken=yes;
-         fi
+         case "$build_cpu" in
+            i?86|x86_64)
+               if $EGREP -q '@PLT' visibility.s; then
+                  gccvisbroken=no
+               else
+                  gccvisbroken=yes
+               fi
+               ;;
+            *)
+               gccvisbroken=no
+               ;;
+         esac
       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
@@ -11760,11 +10280,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";
 
 
@@ -11772,11 +10292,11 @@ $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
 /* confdefs.h.  */
@@ -11801,70 +10321,71 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
@@ -11872,18 +10393,18 @@ 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"
@@ -11894,58 +10415,57 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
@@ -11953,46 +10473,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
 
@@ -12019,10 +10539,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
   [\\/]* | ?:[\\/]*)
@@ -12035,35 +10555,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
@@ -12078,12 +10597,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/"`
@@ -12104,14 +10623,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
 #
@@ -12141,19 +10660,19 @@ $as_echo "$as_me: error: No valid check available. Please check the block for yo
                 _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[-A-Za-z]*//`
         _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;}
+        if test "$_jdk_ver" -lt 10500; then
+             { { echo "$as_me:$LINENO: error: IBM JDK is too old, you need at least 1.5" >&5
+echo "$as_me: error: IBM JDK is too old, you need at least 1.5" >&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
@@ -12167,12 +10686,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]$,,"`
@@ -12182,8 +10701,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
@@ -12204,10 +10723,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
   [\\/]* | ?:[\\/]*)
@@ -12220,28 +10739,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
@@ -12249,8 +10767,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
@@ -12267,14 +10785,14 @@ $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"
+        _gij_longver="40200"
     fi
 fi
 
@@ -12290,10 +10808,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
   [\\/]* | ?:[\\/]*)
@@ -12306,28 +10824,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
@@ -12340,10 +10857,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
   [\\/]* | ?:[\\/]*)
@@ -12356,33 +10873,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
@@ -12401,7 +10917,7 @@ fi
 
 if test "$SOLAR_JAVA" != ""; then
         if test "$JDK" == "gcj" -a -z "$JAVA_HOME"; then
-      if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "50000"; then
+      if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "40200"; then
         cat > findhome.java <<_ACEOF
 import java.io.File;
 
@@ -12415,36 +10931,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
@@ -12452,7 +10968,7 @@ $as_echo "$as_me: error: gij does not know its java.home - use --with-jdk-home"
       fi
     fi
 
-        if test "$JDK" != "gcj" -o "$_gij_longver" -ge "50000"; then
+        if test "$JDK" != "gcj" -o "$_gij_longver" -ge "40200"; then
       # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
       if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then
 
@@ -12467,10 +10983,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
@@ -12492,12 +11008,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
@@ -12510,8 +11026,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
@@ -12519,17 +11035,17 @@ $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
 /* confdefs.h.  */
 _ACEOF
@@ -12540,38 +11056,41 @@ $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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $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
 /* confdefs.h.  */
 _ACEOF
@@ -12580,84 +11099,91 @@ 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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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;}
+    { 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 compiler's result" >&5
+echo "$as_me: WARNING: jni.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   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;}
-
+    { 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: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: jni.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: jni.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: jni.h:     section \"Present But Cannot Be Compiled\"" >&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;}
+    { echo "$as_me:$LINENO: WARNING: jni.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: jni.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_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"
@@ -12668,58 +11194,57 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
 
@@ -12739,17 +11264,17 @@ 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
 /* confdefs.h.  */
 _ACEOF
@@ -12760,38 +11285,41 @@ $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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $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
 /* confdefs.h.  */
 _ACEOF
@@ -12800,84 +11328,91 @@ 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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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;}
+    { 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 compiler's result" >&5
+echo "$as_me: WARNING: jni.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   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;}
-
+    { 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: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: jni.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: jni.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: jni.h:     section \"Present But Cannot Be Compiled\"" >&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;}
+    { echo "$as_me:$LINENO: WARNING: jni.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: jni.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_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"
@@ -12888,67 +11423,66 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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"
@@ -12959,58 +11493,57 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
 
@@ -13023,24 +11556,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
@@ -13050,10 +11583,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
   [\\/]* | ?:[\\/]*)
@@ -13066,36 +11599,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
 
@@ -13111,10 +11643,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
   [\\/]* | ?:[\\/]*)
@@ -13127,35 +11659,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
@@ -13164,48 +11695,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
   [\\/]* | ?:[\\/]*)
@@ -13218,29 +11749,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."
@@ -13248,44 +11778,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"
@@ -13294,8 +11824,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
@@ -13337,14 +11867,11 @@ $as_echo_n "checking which package format to use... " >&6; }
 	OSF1)
 		PKGFORMAT=setld
 		;;
-	IRIX)
-		PKGFORMAT=tardist
-		;;
 	# 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
@@ -13353,7 +11880,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
@@ -13366,7 +11893,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
@@ -13385,11 +11912,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
@@ -13404,22 +11931,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
   [\\/]* | ?:[\\/]*)
@@ -13432,50 +11959,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
@@ -13483,30 +12009,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;}
@@ -13517,10 +12043,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
   [\\/]* | ?:[\\/]*)
@@ -13533,32 +12059,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
@@ -13568,18 +12093,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
   [\\/]* | ?:[\\/]*)
@@ -13592,78 +12117,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;}
@@ -13675,10 +12199,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.
@@ -13689,36 +12213,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.
@@ -13729,56 +12251,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
@@ -13786,10 +12298,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.
@@ -13800,36 +12312,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.
@@ -13840,48 +12350,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'
@@ -13900,10 +12400,10 @@ 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"
@@ -13918,48 +12418,47 @@ 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>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_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 -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
@@ -13970,10 +12469,10 @@ 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"
@@ -13988,48 +12487,47 @@ 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>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_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 -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
@@ -14040,17 +12538,17 @@ 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
 /* confdefs.h.  */
 _ACEOF
@@ -14061,38 +12559,41 @@ $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>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_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 -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $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
 /* confdefs.h.  */
 _ACEOF
@@ -14101,76 +12602,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
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_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;}
+    { 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 compiler's result" >&5
+echo "$as_me: WARNING: windows.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   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;}
-
+    { 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: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: windows.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: windows.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: windows.h:     section \"Present But Cannot Be Compiled\"" >&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;}
+    { echo "$as_me:$LINENO: WARNING: windows.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: windows.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_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
 
@@ -14190,47 +12698,54 @@ 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 "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn
+  if test -n "$checkforstdlibproblems"; then
+    if test -f /etc/rpm/macros.prelink; then
+      with_system_stdlibs=yes
+      { 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
+    elif test "$GCC" = "yes" -a ! -e `$CC -print-file-name=libgcc_s.so.1`; then
+      with_system_stdlibs=yes
+      { echo "$as_me:$LINENO: WARNING: platform doesn't have a libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&5
+echo "$as_me: WARNING: platform doesn't have a libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&2;}
+      echo "platform doesn't have a libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn
+    fi
   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
 
@@ -14238,25 +12753,25 @@ 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
 /* confdefs.h.  */
 _ACEOF
@@ -14267,38 +12782,41 @@ $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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $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
 /* confdefs.h.  */
 _ACEOF
@@ -14307,84 +12825,91 @@ 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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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;}
+    { 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 compiler's result" >&5
+echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   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;}
-
+    { 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: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&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;}
+    { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_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"
@@ -14395,92 +12920,91 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
 /* confdefs.h.  */
 _ACEOF
@@ -14491,38 +13015,41 @@ $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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $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
 /* confdefs.h.  */
 _ACEOF
@@ -14531,84 +13058,91 @@ 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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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;}
+    { 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 compiler's result" >&5
+echo "$as_me: WARNING: jpeglib.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   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;}
-
+    { 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: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: jpeglib.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: jpeglib.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: jpeglib.h:     section \"Present But Cannot Be Compiled\"" >&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;}
+    { echo "$as_me:$LINENO: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_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"
@@ -14619,91 +13153,90 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
 /* confdefs.h.  */
 _ACEOF
@@ -14714,38 +13247,41 @@ $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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $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
 /* confdefs.h.  */
 _ACEOF
@@ -14754,85 +13290,92 @@ 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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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;}
+    { echo "$as_me:$LINENO: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: expat.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { $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;}
-
+    { echo "$as_me:$LINENO: WARNING: expat.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: expat.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: expat.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: expat.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: expat.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: expat.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: expat.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: expat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: expat.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: expat.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_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"
@@ -14843,58 +13386,57 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
@@ -14902,24 +13444,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
@@ -14927,10 +13469,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
   [\\/]* | ?:[\\/]*)
@@ -14943,29 +13485,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
@@ -14976,25 +13517,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=""
@@ -15015,14 +13556,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
@@ -15031,18 +13572,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
   [\\/]* | ?:[\\/]*)
@@ -15055,29 +13596,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
@@ -15088,25 +13628,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=""
@@ -15127,8 +13667,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
 
@@ -15142,10 +13682,10 @@ 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"
@@ -15156,58 +13696,57 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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"
@@ -15240,26 +13779,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
@@ -15269,10 +13808,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
   [\\/]* | ?:[\\/]*)
@@ -15285,29 +13824,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
@@ -15318,25 +13856,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=""
@@ -15357,8 +13895,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
 
@@ -15367,10 +13905,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
   [\\/]* | ?:[\\/]*)
@@ -15383,37 +13921,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
@@ -15422,25 +13959,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
@@ -15450,10 +13987,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
   [\\/]* | ?:[\\/]*)
@@ -15466,29 +14003,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
@@ -15499,25 +14035,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=""
@@ -15538,8 +14074,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
 
@@ -15547,8 +14083,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
@@ -15559,21 +14095,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.
@@ -15586,11 +14122,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
 
@@ -15598,10 +14134,10 @@ 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.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
@@ -15623,18 +14159,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
   [\\/]* | ?:[\\/]*)
@@ -15647,49 +14183,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
 
 
@@ -15700,30 +14235,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
 
 
@@ -15731,16 +14266,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
 
 
@@ -15766,17 +14301,17 @@ $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
 /* confdefs.h.  */
 _ACEOF
@@ -15787,38 +14322,41 @@ $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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $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
 /* confdefs.h.  */
 _ACEOF
@@ -15827,76 +14365,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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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;}
+    { 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 compiler's result" >&5
+echo "$as_me: WARNING: Python.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   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;}
-
+    { 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: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: Python.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: Python.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: Python.h:     section \"Present But Cannot Be Compiled\"" >&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;}
+    { echo "$as_me:$LINENO: WARNING: Python.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: Python.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_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
 
@@ -15905,8 +14450,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="";
@@ -15915,10 +14460,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
   [\\/]* | ?:[\\/]*)
@@ -15931,31 +14476,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
@@ -15966,17 +14510,17 @@ 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
 /* confdefs.h.  */
@@ -15990,44 +14534,47 @@ 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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_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.err 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
 /* confdefs.h.  */
@@ -16040,40 +14587,43 @@ 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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_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.err 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
 
@@ -16082,17 +14632,14 @@ 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; }
-    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: checking whether db is at least 4.1" >&5
+echo $ECHO_N "checking whether db is at least 4.1... $ECHO_C" >&6
+    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
-$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
 /* confdefs.h.  */
@@ -16104,63 +14651,41 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <db.h>
 
 int main(int argc, char **argv) {
-       if(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == $v) return 0;
+       if(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)) return 0;
        else return 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
-  DB_VERSION_MINOR=$v
+  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 )
+{ { 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
-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 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; }
-       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;}
-   { (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"
@@ -16175,48 +14700,47 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
@@ -16224,16 +14748,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
@@ -16242,22 +14766,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
@@ -16265,20 +14789,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
@@ -16286,13 +14810,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
@@ -16302,15 +14826,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"
@@ -16318,31 +14842,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
@@ -16350,20 +14870,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
@@ -16371,13 +14891,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
@@ -16387,15 +14907,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"
@@ -16403,24 +14923,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
@@ -16428,25 +14944,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"
@@ -16454,22 +14970,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'}";
@@ -16492,41 +15004,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"
@@ -16534,23 +15046,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
@@ -16558,22 +15066,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
@@ -16581,20 +15089,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
@@ -16602,19 +15110,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
@@ -16622,13 +15130,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
@@ -16642,15 +15150,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"
@@ -16658,31 +15166,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"
@@ -16690,25 +15194,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
@@ -16722,20 +15222,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
   [\\/]* | ?:[\\/]*)
@@ -16748,52 +15248,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
@@ -16801,31 +15300,31 @@ 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
 /* confdefs.h.  */
 _ACEOF
@@ -16836,38 +15335,41 @@ $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>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_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 -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $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
 /* confdefs.h.  */
 _ACEOF
@@ -16876,92 +15378,99 @@ 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
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_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;}
+    { 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 compiler's result" >&5
+echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   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;}
-
+    { 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: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: boost/shared_ptr.hpp: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: boost/shared_ptr.hpp:     section \"Present But Cannot Be Compiled\"" >&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;}
+    { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_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_include_classic_core_hpp+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for boost/spirit/include/classic_core.hpp" >&5
-$as_echo_n "checking for boost/spirit/include/classic_core.hpp... " >&6; }
+  echo "$as_me:$LINENO: checking for boost/spirit/include/classic_core.hpp" >&5
+echo $ECHO_N "checking for boost/spirit/include/classic_core.hpp... $ECHO_C" >&6
 if test "${ac_cv_header_boost_spirit_include_classic_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_include_classic_core_hpp" >&5
-$as_echo "$ac_cv_header_boost_spirit_include_classic_core_hpp" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_include_classic_core_hpp" >&5
+echo "${ECHO_T}$ac_cv_header_boost_spirit_include_classic_core_hpp" >&6
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking boost/spirit/include/classic_core.hpp usability" >&5
-$as_echo_n "checking boost/spirit/include/classic_core.hpp usability... " >&6; }
+echo "$as_me:$LINENO: checking boost/spirit/include/classic_core.hpp usability" >&5
+echo $ECHO_N "checking boost/spirit/include/classic_core.hpp usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -16972,38 +15481,41 @@ $ac_includes_default
 #include <boost/spirit/include/classic_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>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_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 -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking boost/spirit/include/classic_core.hpp presence" >&5
-$as_echo_n "checking boost/spirit/include/classic_core.hpp presence... " >&6; }
+echo "$as_me:$LINENO: checking boost/spirit/include/classic_core.hpp presence" >&5
+echo $ECHO_N "checking boost/spirit/include/classic_core.hpp presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -17012,92 +15524,99 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <boost/spirit/include/classic_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
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_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/include/classic_core.hpp: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: proceeding with the compiler's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: in the future, the compiler will take precedence" >&2;}
-
+    { echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: present but cannot be compiled" >&5
+echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for boost/spirit/include/classic_core.hpp" >&5
-$as_echo_n "checking for boost/spirit/include/classic_core.hpp... " >&6; }
+echo "$as_me:$LINENO: checking for boost/spirit/include/classic_core.hpp" >&5
+echo $ECHO_N "checking for boost/spirit/include/classic_core.hpp... $ECHO_C" >&6
 if test "${ac_cv_header_boost_spirit_include_classic_core_hpp+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_boost_spirit_include_classic_core_hpp=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_include_classic_core_hpp" >&5
-$as_echo "$ac_cv_header_boost_spirit_include_classic_core_hpp" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_include_classic_core_hpp" >&5
+echo "${ECHO_T}$ac_cv_header_boost_spirit_include_classic_core_hpp" >&6
 
 fi
-if test "x$ac_cv_header_boost_spirit_include_classic_core_hpp" = x""yes; then
+if test $ac_cv_header_boost_spirit_include_classic_core_hpp = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: boost/spirit/include/classic_core.hpp not found. install boost >= 1.38" >&5
-$as_echo "$as_me: error: boost/spirit/include/classic_core.hpp not found. install boost >= 1.38" >&2;}
+  { { echo "$as_me:$LINENO: error: boost/spirit/include/classic_core.hpp not found. install boost >= 1.38" >&5
+echo "$as_me: error: boost/spirit/include/classic_core.hpp not found. install boost >= 1.38" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
    if test "${ac_cv_header_boost_function_hpp+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for boost/function.hpp" >&5
-$as_echo_n "checking for boost/function.hpp... " >&6; }
+  echo "$as_me:$LINENO: checking for boost/function.hpp" >&5
+echo $ECHO_N "checking for boost/function.hpp... $ECHO_C" >&6
 if test "${ac_cv_header_boost_function_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_function_hpp" >&5
-$as_echo "$ac_cv_header_boost_function_hpp" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_boost_function_hpp" >&5
+echo "${ECHO_T}$ac_cv_header_boost_function_hpp" >&6
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking boost/function.hpp usability" >&5
-$as_echo_n "checking boost/function.hpp usability... " >&6; }
+echo "$as_me:$LINENO: checking boost/function.hpp usability" >&5
+echo $ECHO_N "checking boost/function.hpp usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -17108,38 +15627,41 @@ $ac_includes_default
 #include <boost/function.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>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_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 -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking boost/function.hpp presence" >&5
-$as_echo_n "checking boost/function.hpp presence... " >&6; }
+echo "$as_me:$LINENO: checking boost/function.hpp presence" >&5
+echo $ECHO_N "checking boost/function.hpp presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -17148,76 +15670,83 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <boost/function.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
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_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/function.hpp: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: boost/function.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: boost/function.hpp: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: boost/function.hpp: proceeding with the compiler's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: boost/function.hpp: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: boost/function.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: boost/function.hpp: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: boost/function.hpp: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: boost/function.hpp: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: boost/function.hpp: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: boost/function.hpp:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: boost/function.hpp:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: boost/function.hpp: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: boost/function.hpp: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: boost/function.hpp:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: boost/function.hpp:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: boost/function.hpp: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: boost/function.hpp: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: boost/function.hpp: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: boost/function.hpp: in the future, the compiler will take precedence" >&2;}
-
+    { echo "$as_me:$LINENO: WARNING: boost/function.hpp: present but cannot be compiled" >&5
+echo "$as_me: WARNING: boost/function.hpp: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: boost/function.hpp:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: boost/function.hpp:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: boost/function.hpp: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: boost/function.hpp: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: boost/function.hpp:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: boost/function.hpp:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: boost/function.hpp: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: boost/function.hpp: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: boost/function.hpp: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: boost/function.hpp: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for boost/function.hpp" >&5
-$as_echo_n "checking for boost/function.hpp... " >&6; }
+echo "$as_me:$LINENO: checking for boost/function.hpp" >&5
+echo $ECHO_N "checking for boost/function.hpp... $ECHO_C" >&6
 if test "${ac_cv_header_boost_function_hpp+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_boost_function_hpp=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_function_hpp" >&5
-$as_echo "$ac_cv_header_boost_function_hpp" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_boost_function_hpp" >&5
+echo "${ECHO_T}$ac_cv_header_boost_function_hpp" >&6
 
 fi
-if test "x$ac_cv_header_boost_function_hpp" = x""yes; then
+if test $ac_cv_header_boost_function_hpp = yes; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: boost/function.hpp not found. install boost" >&5
-$as_echo "$as_me: error: boost/function.hpp not found. install boost" >&2;}
+  { { echo "$as_me:$LINENO: error: boost/function.hpp not found. install boost" >&5
+echo "$as_me: error: boost/function.hpp not found. install boost" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -17225,8 +15754,8 @@ fi
 
    save_CXXFLAGS=$CXXFLAGS
    CXXFLAGS="$CXXFLAGS -fno-exceptions"
-   { $as_echo "$as_me:$LINENO: checking whether boost/function.hpp compiles with -fno-exceptions" >&5
-$as_echo_n "checking whether boost/function.hpp compiles with -fno-exceptions... " >&6; }
+   echo "$as_me:$LINENO: checking whether boost/function.hpp compiles with -fno-exceptions" >&5
+echo $ECHO_N "checking whether boost/function.hpp compiles with -fno-exceptions... $ECHO_C" >&6
    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -17244,40 +15773,43 @@ 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>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_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 -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_cxx_boost_no_exceptons_broken=no
 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_boost_no_exceptons_broken=yes
+ac_cv_cxx_boost_no_exceptons_broken=yes
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
    if test "$ac_cv_cxx_boost_no_exceptons_broken" = "yes"; then
-	{ { $as_echo "$as_me:$LINENO: error: no, see https://bugzilla.redhat.com/show_bug.cgi?id=477131" >&5
-$as_echo "$as_me: error: no, see https://bugzilla.redhat.com/show_bug.cgi?id=477131" >&2;}
+	{ { echo "$as_me:$LINENO: error: no, see https://bugzilla.redhat.com/show_bug.cgi?id=477131" >&5
+echo "$as_me: error: no, see https://bugzilla.redhat.com/show_bug.cgi?id=477131" >&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
    CXXFLAGS=$save_CXXFLAGS
    ac_ext=c
@@ -17287,38 +15819,38 @@ 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
 /* confdefs.h.  */
 _ACEOF
@@ -17329,38 +15861,41 @@ $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>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_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 -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $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
 /* confdefs.h.  */
 _ACEOF
@@ -17369,76 +15904,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
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_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;}
+    { 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 compiler's result" >&5
+echo "$as_me: WARNING: vigra/copyimage.hxx: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   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;}
-
+    { 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: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: vigra/copyimage.hxx: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: vigra/copyimage.hxx:     section \"Present But Cannot Be Compiled\"" >&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;}
+    { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: vigra/copyimage.hxx: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_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
 
@@ -17450,33 +15992,33 @@ 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
 /* confdefs.h.  */
 _ACEOF
@@ -17487,38 +16029,41 @@ $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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $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
 /* confdefs.h.  */
 _ACEOF
@@ -17527,168 +16072,173 @@ 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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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;}
+    { 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 compiler's result" >&5
+echo "$as_me: WARNING: sqlext.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   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;}
-
+    { 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: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: sqlext.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sqlext.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: sqlext.h:     section \"Present But Cannot Be Compiled\"" >&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;}
+    { echo "$as_me:$LINENO: WARNING: sqlext.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: sqlext.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_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
    ENABLE_NSS_MODULE=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
 /* confdefs.h.  */
 _ACEOF
@@ -17699,38 +16249,41 @@ $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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -17739,93 +16292,96 @@ 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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_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"
 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"
@@ -17836,58 +16392,57 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
@@ -17895,18 +16450,18 @@ _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"
@@ -17917,58 +16472,57 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
@@ -17976,14 +16530,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
@@ -17992,16 +16546,16 @@ 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
     ENABLE_NSS_MODULE=NO
     enable_nss_module=no
-    { $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
@@ -18016,8 +16570,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
@@ -18025,10 +16579,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
   [\\/]* | ?:[\\/]*)
@@ -18041,29 +16595,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
@@ -18074,25 +16627,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=""
@@ -18123,10 +16676,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
   [\\/]* | ?:[\\/]*)
@@ -18139,29 +16692,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
@@ -18172,25 +16724,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=""
@@ -18211,8 +16763,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
 
@@ -18228,10 +16780,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
   [\\/]* | ?:[\\/]*)
@@ -18244,29 +16796,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
@@ -18277,25 +16828,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=""
@@ -18316,8 +16867,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
 
@@ -18330,10 +16881,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
   [\\/]* | ?:[\\/]*)
@@ -18346,29 +16897,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
@@ -18379,25 +16929,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=""
@@ -18418,8 +16968,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
 
@@ -18432,10 +16982,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
   [\\/]* | ?:[\\/]*)
@@ -18448,29 +16998,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
@@ -18481,25 +17030,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=""
@@ -18534,10 +17083,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
   [\\/]* | ?:[\\/]*)
@@ -18550,29 +17099,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
@@ -18583,25 +17131,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=""
@@ -18622,8 +17170,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
 
@@ -18643,10 +17191,10 @@ $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"
@@ -18657,58 +17205,57 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
@@ -18716,10 +17263,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; }; }
@@ -18731,17 +17278,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; }; }
@@ -18755,48 +17302,48 @@ 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
     ENABLE_NSS_MODULE=NO
     enable_nss_module=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
       if test "$_os" = "Darwin" ; then
          MOZILLA_TOOLKIT=mac
-         { $as_echo "$as_me:$LINENO: result: mac" >&5
-$as_echo "mac" >&6; }
+         echo "$as_me:$LINENO: result: mac" >&5
+echo "${ECHO_T}mac" >&6
       else
          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
    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
@@ -18813,59 +17360,63 @@ else
       enable_build_mozilla=
 fi
 
-{ $as_echo "$as_me:$LINENO: checking whether to build Mozilla/SeaMonkey" >&5
-$as_echo_n "checking whether to build Mozilla/SeaMonkey... " >&6; }
+echo "$as_me:$LINENO: checking whether to build Mozilla/SeaMonkey" >&5
+echo $ECHO_N "checking whether to build Mozilla/SeaMonkey... $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
 
-{ $as_echo "$as_me:$LINENO: checking whether to build provided NSS module" >&5
-$as_echo_n "checking whether to build provided NSS module... " >&6; }
+echo "$as_me:$LINENO: checking whether to build provided NSS module" >&5
+echo $ECHO_N "checking whether to build provided NSS module... $ECHO_C" >&6
 if test "$enable_nss_module" != "no"; then
    ENABLE_NSS_MODULE="YES"
    BUILD_TYPE="$BUILD_TYPE NSS"
-   { $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
-      { $as_echo "$as_me:$LINENO: checking for Mozilla build tooling" >&5
-$as_echo_n "checking for Mozilla build tooling... " >&6; }
+      echo "$as_me:$LINENO: checking for Mozilla build tooling" >&5
+echo $ECHO_N "checking for Mozilla build tooling... $ECHO_C" >&6
       if test -z "$MOZILLABUILD" ; then
-{ { $as_echo "$as_me:$LINENO: error: Mozilla build tooling not found. Use --with-mozilla-build=<absolut path to mozilla build tooling (mozilla-build)>" >&5
-$as_echo "$as_me: error: Mozilla build tooling not found. Use --with-mozilla-build=<absolut path to mozilla build tooling (mozilla-build)>" >&2;}
+{ { echo "$as_me:$LINENO: error: Mozilla build tooling not found.
+Use the --with-mozilla-build option after installling the tools obtained
+from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32" >&5
+echo "$as_me: error: Mozilla build tooling not found.
+Use the --with-mozilla-build option after installling the tools obtained
+from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32" >&2;}
    { (exit 1); exit 1; }; }
       else
          if test \( "$WITH_MINGWIN" = "yes" \) ; then
             if test ! -d "$MOZILLABUILD" ; then
-{ { $as_echo "$as_me:$LINENO: error: Mozilla build tooling incomplete!" >&5
-$as_echo "$as_me: error: Mozilla build tooling incomplete!" >&2;}
+{ { echo "$as_me:$LINENO: error: Mozilla build tooling incomplete!" >&5
+echo "$as_me: error: Mozilla build tooling incomplete!" >&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
             if test ! -d "$MOZILLABUILD/moztools" \
                -o ! -d "$MOZILLABUILD/msys" ; then
-{ { $as_echo "$as_me:$LINENO: error: Mozilla build tooling incomplete!" >&5
-$as_echo "$as_me: error: Mozilla build tooling incomplete!" >&2;}
+{ { echo "$as_me:$LINENO: error: Mozilla build tooling incomplete!" >&5
+echo "$as_me: error: Mozilla build tooling incomplete!" >&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
          fi
       fi
    fi
 else
    ENABLE_NSS_MODULE="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 "$BUILD_MOZAB" = "TRUE"; then
@@ -18873,13 +17424,13 @@ if test "$BUILD_MOZAB" = "TRUE"; then
     if test "$WITH_MINGWIN" != "yes"; then
       # compiling with MSVC. Only supported platform here is MSVS2005 at the moment.
       if test "$MSVSVER" != "2005"; then
-        { { $as_echo "$as_me:$LINENO: error: Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only." >&5
-$as_echo "$as_me: error: Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only." >&2;}
+        { { echo "$as_me:$LINENO: error: Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only." >&5
+echo "$as_me: error: Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only." >&2;}
    { (exit 1); exit 1; }; }
       fi
     else
-      { $as_echo "$as_me:$LINENO: WARNING: Building SeaMonkey with mingwin is not tested, and likely to break." >&5
-$as_echo "$as_me: WARNING: Building SeaMonkey with mingwin is not tested, and likely to break." >&2;}
+      { echo "$as_me:$LINENO: WARNING: Building SeaMonkey with mingwin is not tested, and likely to break." >&5
+echo "$as_me: WARNING: Building SeaMonkey with mingwin is not tested, and likely to break." >&2;}
       echo "Building SeaMonkey with mingwin is not tested, and likely to break." >> warn
     fi
   fi
@@ -18889,56 +17440,56 @@ $as_echo "$as_me: WARNING: Building SeaMonkey with mingwin is not tested, and li
    fi
    MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source"
    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/SeaMonkey source archive not found.
+         { { echo "$as_me:$LINENO: error: Mozilla/SeaMonkey 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:
 ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/" >&5
-$as_echo "$as_me: error: Mozilla/SeaMonkey source archive not found.
+echo "$as_me: error: Mozilla/SeaMonkey 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:
 ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/" >&2;}
    { (exit 1); exit 1; }; }
    fi
    if test "$_os" = "WINNT"; then
-      { $as_echo "$as_me:$LINENO: checking for moztools binaries" >&5
-$as_echo_n "checking for moztools binaries... " >&6; }
+      echo "$as_me:$LINENO: checking for moztools binaries" >&5
+echo $ECHO_N "checking for moztools binaries... $ECHO_C" >&6
       if test ! -e "moz/download/vc8-moztools.zip" ; then
-        { { $as_echo "$as_me:$LINENO: error: The following file is missing in moz/download: vc8-moztools.zip
+        { { echo "$as_me:$LINENO: error: The following file is missing in moz/download: vc8-moztools.zip
 (from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)" >&5
-$as_echo "$as_me: error: The following file is missing in moz/download: vc8-moztools.zip
+echo "$as_me: error: The following file is missing in moz/download: vc8-moztools.zip
 (from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)" >&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
   [\\/]* | ?:[\\/]*)
@@ -18951,29 +17502,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
@@ -18984,25 +17534,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=""
@@ -19021,11 +17571,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
 
@@ -19036,10 +17586,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
   [\\/]* | ?:[\\/]*)
@@ -19052,29 +17602,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
@@ -19085,25 +17634,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.6.3" >&5
-$as_echo_n "checking for libIDL-2.0 >= 0.6.3... " >&6; }
+        echo "$as_me:$LINENO: checking for libIDL-2.0 >= 0.6.3" >&5
+echo $ECHO_N "checking for libIDL-2.0 >= 0.6.3... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "libIDL-2.0 >= 0.6.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 "libIDL-2.0 >= 0.6.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 "libIDL-2.0 >= 0.6.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=""
@@ -19128,8 +17677,8 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; }
   fi
 
          if test -z "$MOZIDL"; then
-            { { $as_echo "$as_me:$LINENO: error: libIDL 0.6.3 or newer is needed to build mozilla with mac toolkit." >&5
-$as_echo "$as_me: error: libIDL 0.6.3 or newer is needed to build mozilla with mac toolkit." >&2;}
+            { { echo "$as_me:$LINENO: error: libIDL 0.6.3 or newer is needed to build mozilla with mac toolkit." >&5
+echo "$as_me: error: libIDL 0.6.3 or newer is needed to build mozilla with mac toolkit." >&2;}
    { (exit 1); exit 1; }; }
          fi
       fi
@@ -19142,10 +17691,10 @@ $as_echo "$as_me: error: libIDL 0.6.3 or newer is needed to build mozilla with m
   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
   [\\/]* | ?:[\\/]*)
@@ -19158,29 +17707,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
@@ -19191,25 +17739,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=""
@@ -19234,8 +17782,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
 
@@ -19244,10 +17792,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
   [\\/]* | ?:[\\/]*)
@@ -19260,29 +17808,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
@@ -19293,25 +17840,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=""
@@ -19336,8 +17883,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
@@ -19347,10 +17894,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
   [\\/]* | ?:[\\/]*)
@@ -19363,29 +17910,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
@@ -19396,25 +17942,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=""
@@ -19439,8 +17985,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
 
@@ -19449,10 +17995,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
   [\\/]* | ?:[\\/]*)
@@ -19465,29 +18011,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
@@ -19498,25 +18043,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=""
@@ -19541,8 +18086,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
@@ -19563,25 +18108,25 @@ 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
 /* confdefs.h.  */
 _ACEOF
@@ -19592,38 +18137,41 @@ $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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $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
 /* confdefs.h.  */
 _ACEOF
@@ -19632,103 +18180,110 @@ 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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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;}
+    { 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 compiler's result" >&5
+echo "$as_me: WARNING: sane/sane.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   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;}
-
+    { 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: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: sane/sane.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sane/sane.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: sane/sane.h:     section \"Present But Cannot Be Compiled\"" >&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;}
+    { echo "$as_me:$LINENO: WARNING: sane/sane.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: sane/sane.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_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
 /* confdefs.h.  */
 _ACEOF
@@ -19737,41 +18292,41 @@ 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
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_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
   [\\/]* | ?:[\\/]*)
@@ -19785,39 +18340,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
   [\\/]* | ?:[\\/]*)
@@ -19831,39 +18385,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
   [\\/]* | ?:[\\/]*)
@@ -19877,43 +18430,40 @@ 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
 /* confdefs.h.  */
@@ -19933,44 +18483,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 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'
@@ -19978,8 +18514,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
@@ -19989,18 +18525,18 @@ fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to enable graphite support" >&5
-$as_echo_n "checking whether to enable graphite support... " >&6; }
+echo "$as_me:$LINENO: checking whether to enable graphite support" >&5
+echo $ECHO_N "checking whether to enable graphite support... $ECHO_C" >&6
 if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" == "z" -o "$enable_graphite" != "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_GRAPHITE="TRUE"
-    { $as_echo "$as_me:$LINENO: checking which graphite to use" >&5
-$as_echo_n "checking which graphite to use... " >&6; }
+    echo "$as_me:$LINENO: checking which graphite to use" >&5
+echo $ECHO_N "checking which graphite to use... $ECHO_C" >&6
     if test -n "$with_system_graphite" -o -n "$with_system_libs" && \
         test "$with_system_graphite" != "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_GRAPHITE=YES
 
   succeeded=no
@@ -20008,10 +18544,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
   [\\/]* | ?:[\\/]*)
@@ -20024,29 +18560,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
@@ -20057,25 +18592,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 silgraphite " >&5
-$as_echo_n "checking for silgraphite ... " >&6; }
+        echo "$as_me:$LINENO: checking for silgraphite " >&5
+echo $ECHO_N "checking for silgraphite ... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "silgraphite " ; 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 GRAPHITE_CFLAGS" >&5
-$as_echo_n "checking GRAPHITE_CFLAGS... " >&6; }
+            echo "$as_me:$LINENO: checking GRAPHITE_CFLAGS" >&5
+echo $ECHO_N "checking GRAPHITE_CFLAGS... $ECHO_C" >&6
             GRAPHITE_CFLAGS=`$PKG_CONFIG --cflags "silgraphite "`
-            { $as_echo "$as_me:$LINENO: result: $GRAPHITE_CFLAGS" >&5
-$as_echo "$GRAPHITE_CFLAGS" >&6; }
+            echo "$as_me:$LINENO: result: $GRAPHITE_CFLAGS" >&5
+echo "${ECHO_T}$GRAPHITE_CFLAGS" >&6
 
-            { $as_echo "$as_me:$LINENO: checking GRAPHITE_LIBS" >&5
-$as_echo_n "checking GRAPHITE_LIBS... " >&6; }
+            echo "$as_me:$LINENO: checking GRAPHITE_LIBS" >&5
+echo $ECHO_N "checking GRAPHITE_LIBS... $ECHO_C" >&6
             GRAPHITE_LIBS=`$PKG_CONFIG --libs "silgraphite "`
-            { $as_echo "$as_me:$LINENO: result: $GRAPHITE_LIBS" >&5
-$as_echo "$GRAPHITE_LIBS" >&6; }
+            echo "$as_me:$LINENO: result: $GRAPHITE_LIBS" >&5
+echo "${ECHO_T}$GRAPHITE_LIBS" >&6
         else
             GRAPHITE_CFLAGS=""
             GRAPHITE_LIBS=""
@@ -20096,30 +18631,30 @@ $as_echo "$GRAPHITE_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     { { $as_echo "$as_me:$LINENO: error: Library requirements (silgraphite ) 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 (silgraphite ) 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 (silgraphite ) 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 (silgraphite ) 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 STL compatibility" >&5
-$as_echo_n "checking STL compatibility... " >&6; }
+	echo "$as_me:$LINENO: checking STL compatibility" >&5
+echo $ECHO_N "checking STL compatibility... $ECHO_C" >&6
 	if test "$WITH_STLPORT" != "no"; then
-		{ { $as_echo "$as_me:$LINENO: error: to use system graphite you need to use --without-stlport" >&5
-$as_echo "$as_me: error: to use system graphite you need to use --without-stlport" >&2;}
+		{ { echo "$as_me:$LINENO: error: to use system graphite you need to use --without-stlport" >&5
+echo "$as_me: error: to use system graphite you need to use --without-stlport" >&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: result: internal" >&5
-$as_echo "internal" >&6; }
+        echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
         SYSTEM_GRAPHITE=NO
         BUILD_TYPE="$BUILD_TYPE GRAPHITE"
     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
 
 
@@ -20129,15 +18664,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
@@ -20145,8 +18680,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
@@ -20159,49 +18694,44 @@ 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
+    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
@@ -20209,16 +18739,16 @@ _ACEOF
     # 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.
@@ -20259,7 +18789,7 @@ 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
 /* confdefs.h.  */
@@ -20267,39 +18797,39 @@ _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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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
 
@@ -20308,99 +18838,94 @@ 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
 /* 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
@@ -20421,12 +18946,12 @@ 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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20442,35 +18967,43 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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.err 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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20486,47 +19019,47 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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; }
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+ac_R_space=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
-    ac_c_werror_flag=$ac_xsave_c_werror_flag
-    LIBS=$ac_xsave_LIBS
+	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.
@@ -20547,51 +19080,52 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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"
@@ -20602,66 +19136,65 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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"
@@ -20672,66 +19205,63 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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 \
+rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
     LIBS="$ac_xsave_LIBS"
 
@@ -20743,10 +19273,10 @@ 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
 /* confdefs.h.  */
@@ -20771,69 +19301,74 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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"
@@ -20844,66 +19379,65 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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"
@@ -20914,58 +19448,57 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
 
@@ -20979,10 +19512,10 @@ 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
 /* confdefs.h.  */
@@ -21007,69 +19540,74 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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"
@@ -21080,68 +19618,67 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
 /* confdefs.h.  */
@@ -21166,69 +19703,74 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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"
@@ -21239,68 +19781,67 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
 /* confdefs.h.  */
@@ -21325,69 +19866,74 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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"
@@ -21398,58 +19944,57 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
 
@@ -21465,10 +20010,10 @@ 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"
@@ -21479,58 +20024,57 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
 
@@ -21547,21 +20091,21 @@ 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"
@@ -21572,69 +20116,68 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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"
@@ -21645,58 +20188,57 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
 
@@ -21728,20 +20270,20 @@ 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
 /* confdefs.h.  */
@@ -21754,210 +20296,124 @@ 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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "$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.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-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`
+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
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
+#include <X11/Intrinsic.h>
+
 #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>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_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  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
-  ac_header_preproc=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
+  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
 
-  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; }
-
-# 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
-    ;;
-  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;}
-
-    ;;
-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
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
+eval "$as_ac_Header=no"
 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; }
-
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-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: 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"
@@ -21972,48 +20428,47 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
@@ -22021,8 +20476,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
 
@@ -22034,17 +20489,17 @@ 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
 /* confdefs.h.  */
 _ACEOF
@@ -22055,38 +20510,41 @@ $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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $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
 /* confdefs.h.  */
 _ACEOF
@@ -22095,90 +20553,95 @@ 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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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;}
+    { 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 compiler's result" >&5
+echo "$as_me: WARNING: fontconfig/fontconfig.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   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;}
-
+    { 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: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: fontconfig/fontconfig.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: fontconfig/fontconfig.h:     section \"Present But Cannot Be Compiled\"" >&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;}
+    { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: fontconfig/fontconfig.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_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
 /* confdefs.h.  */
@@ -22196,77 +20659,63 @@ 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 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
 /* confdefs.h.  */
 _ACEOF
@@ -22277,38 +20726,41 @@ $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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $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
 /* confdefs.h.  */
 _ACEOF
@@ -22317,92 +20769,99 @@ 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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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;}
+    { 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 compiler's result" >&5
+echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   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;}
-
+    { 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: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: X11/extensions/Xrender.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: X11/extensions/Xrender.h:     section \"Present But Cannot Be Compiled\"" >&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;}
+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_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"
@@ -22413,58 +20872,57 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
@@ -22472,8 +20930,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
 
@@ -22481,13 +20939,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"
 
@@ -22496,10 +20954,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
   [\\/]* | ?:[\\/]*)
@@ -22512,29 +20970,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
@@ -22545,25 +21002,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=""
@@ -22589,17 +21046,17 @@ $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
 /* confdefs.h.  */
 _ACEOF
@@ -22610,38 +21067,41 @@ $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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $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
 /* confdefs.h.  */
 _ACEOF
@@ -22650,86 +21110,93 @@ 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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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;}
+    { 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 compiler's result" >&5
+echo "$as_me: WARNING: X11/extensions/Xrandr.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   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;}
-
+    { 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: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: X11/extensions/Xrandr.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: X11/extensions/Xrandr.h:     section \"Present But Cannot Be Compiled\"" >&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;}
+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: X11/extensions/Xrandr.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_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"
@@ -22740,58 +21207,57 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
@@ -22799,53 +21265,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
   [\\/]* | ?:[\\/]*)
@@ -22858,29 +21324,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
@@ -22891,25 +21356,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=""
@@ -22930,8 +21395,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
 
@@ -22939,8 +21404,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=
@@ -22955,12 +21420,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
@@ -22973,10 +21438,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
   [\\/]* | ?:[\\/]*)
@@ -22989,29 +21454,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
@@ -23022,25 +21486,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=""
@@ -23061,16 +21525,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
@@ -23078,33 +21542,33 @@ 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
   [\\/]* | ?:[\\/]*)
@@ -23117,29 +21581,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
@@ -23150,25 +21613,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=""
@@ -23189,13 +21652,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
@@ -23207,23 +21670,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"
@@ -23232,12 +21695,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
@@ -23245,10 +21708,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
   [\\/]* | ?:[\\/]*)
@@ -23261,29 +21724,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
@@ -23294,25 +21756,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=""
@@ -23333,28 +21795,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'
@@ -23366,10 +21828,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
   [\\/]* | ?:[\\/]*)
@@ -23382,29 +21844,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
@@ -23415,25 +21876,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=""
@@ -23459,17 +21920,17 @@ $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
 /* confdefs.h.  */
 _ACEOF
@@ -23480,38 +21941,41 @@ $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>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_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 -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $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
 /* confdefs.h.  */
 _ACEOF
@@ -23520,87 +21984,94 @@ 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
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_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;}
+    { 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 compiler's result" >&5
+echo "$as_me: WARNING: hunspell.hxx: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   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;}
-
+    { 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: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: hunspell.hxx: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: hunspell.hxx:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: hunspell.hxx:     section \"Present But Cannot Be Compiled\"" >&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;}
+    { echo "$as_me:$LINENO: WARNING: hunspell.hxx: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: hunspell.hxx: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_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
 /* confdefs.h.  */
 _ACEOF
@@ -23611,38 +22082,41 @@ $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>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_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 -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $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
 /* confdefs.h.  */
 _ACEOF
@@ -23651,76 +22125,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
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_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;}
+    { 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 compiler's result" >&5
+echo "$as_me: WARNING: hunspell/hunspell.hxx: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   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;}
-
+    { 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: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: hunspell/hunspell.hxx: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: hunspell/hunspell.hxx:     section \"Present But Cannot Be Compiled\"" >&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;}
+    { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: hunspell/hunspell.hxx: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_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
 
@@ -23730,10 +22211,10 @@ 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"
@@ -23748,48 +22229,47 @@ 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>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_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 -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
@@ -23797,8 +22277,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
 
@@ -23811,8 +22291,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
@@ -23820,25 +22300,25 @@ 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
 /* confdefs.h.  */
 _ACEOF
@@ -23849,38 +22329,41 @@ $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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $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
 /* confdefs.h.  */
 _ACEOF
@@ -23889,84 +22372,91 @@ 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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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;}
+    { 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 compiler's result" >&5
+echo "$as_me: WARNING: hyphen.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   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;}
-
+    { 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: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: hyphen.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: hyphen.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: hyphen.h:     section \"Present But Cannot Be Compiled\"" >&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;}
+    { echo "$as_me:$LINENO: WARNING: hyphen.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: hyphen.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_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
 /* confdefs.h.  */
@@ -23987,29 +22477,33 @@ 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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_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
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -24028,50 +22522,52 @@ 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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_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.err conftest.$ac_objext conftest.$ac_ext
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err 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"
@@ -24082,70 +22578,69 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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"
@@ -24156,71 +22651,70 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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"
@@ -24231,92 +22725,91 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
 /* confdefs.h.  */
 _ACEOF
@@ -24327,38 +22820,41 @@ $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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $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
 /* confdefs.h.  */
 _ACEOF
@@ -24367,85 +22863,92 @@ 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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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;}
+    { 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 compiler's result" >&5
+echo "$as_me: WARNING: mythes.hxx: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   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;}
-
+    { 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: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: mythes.hxx: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mythes.hxx:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: mythes.hxx:     section \"Present But Cannot Be Compiled\"" >&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;}
+    { echo "$as_me:$LINENO: WARNING: mythes.hxx: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: mythes.hxx: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_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"
@@ -24460,48 +22963,47 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
@@ -24509,37 +23011,37 @@ _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
 /* confdefs.h.  */
 _ACEOF
@@ -24550,38 +23052,41 @@ $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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $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
 /* confdefs.h.  */
 _ACEOF
@@ -24590,85 +23095,92 @@ 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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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;}
+    { 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 compiler's result" >&5
+echo "$as_me: WARNING: lpsolve/lp_lib.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   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;}
-
+    { 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: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: lpsolve/lp_lib.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: lpsolve/lp_lib.h:     section \"Present But Cannot Be Compiled\"" >&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;}
+    { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: lpsolve/lp_lib.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_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"
@@ -24679,58 +23191,57 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
@@ -24738,27 +23249,27 @@ _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"
@@ -24769,75 +23280,74 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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`
@@ -24858,13 +23368,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.
@@ -24886,9 +23396,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
@@ -24896,31 +23406,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"`
@@ -24952,17 +23462,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
 
@@ -24970,14 +23480,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
   [\\/]* | ?:[\\/]*)
@@ -24990,28 +23500,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
@@ -25026,24 +23535,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
   [\\/]* | ?:[\\/]*)
@@ -25056,59 +23565,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
   [\\/]* | ?:[\\/]*)
@@ -25121,39 +23629,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
   [\\/]* | ?:[\\/]*)
@@ -25166,31 +23673,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
 
@@ -25201,20 +23707,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
 
@@ -25224,10 +23730,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
   [\\/]* | ?:[\\/]*)
@@ -25240,63 +23746,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
@@ -25310,10 +23815,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
   [\\/]* | ?:[\\/]*)
@@ -25326,28 +23831,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
@@ -25356,18 +23860,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
   [\\/]* | ?:[\\/]*)
@@ -25380,36 +23884,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
@@ -25421,8 +23924,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
 
 
@@ -25439,10 +23942,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
   [\\/]* | ?:[\\/]*)
@@ -25455,34 +23958,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
   [\\/]* | ?:[\\/]*)
@@ -25495,68 +23997,57 @@ 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.
-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.
-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;}
+    if test -n "`$ZIP -h | grep -i WinNT`" ; then
+{ { 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
 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:
@@ -25566,18 +24057,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:
@@ -25590,24 +24081,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;}
@@ -25621,40 +24112,40 @@ 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`
+      MSIAPATH=`/bin/find "$COMPATH/.." -iname instmsia.exe | head -n 1`
+      MSIWPATH=`/bin/find "$COMPATH/.." -iname instmsiw.exe | head -n 1`
       if test -n "$MSIAPATH" -a -n "$MSIWPATH"; then
          cp "$MSIAPATH" ./external/msi/ && chmod +x ./external/msi/instmsia.exe && MSIACOPY="OK"
          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 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"
@@ -25677,31 +24168,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
   [\\/]* | ?:[\\/]*)
@@ -25714,29 +24205,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
@@ -25747,25 +24237,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=""
@@ -25786,35 +24276,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
   [\\/]* | ?:[\\/]*)
@@ -25827,29 +24317,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
@@ -25860,25 +24349,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=""
@@ -25899,8 +24388,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
 
@@ -25911,10 +24400,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
   [\\/]* | ?:[\\/]*)
@@ -25927,29 +24416,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
@@ -25960,25 +24448,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=""
@@ -25999,15 +24487,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
 
 
@@ -26025,10 +24513,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
   [\\/]* | ?:[\\/]*)
@@ -26041,29 +24529,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
@@ -26074,25 +24561,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=""
@@ -26113,8 +24600,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
 
@@ -26125,22 +24612,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
   [\\/]* | ?:[\\/]*)
@@ -26153,29 +24640,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
@@ -26186,25 +24672,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=""
@@ -26225,37 +24711,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
   [\\/]* | ?:[\\/]*)
@@ -26268,29 +24754,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
@@ -26301,25 +24786,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=""
@@ -26340,14 +24825,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
@@ -26366,18 +24851,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
 
 
@@ -26386,10 +24871,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
   [\\/]* | ?:[\\/]*)
@@ -26402,29 +24887,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
@@ -26435,25 +24919,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=""
@@ -26474,27 +24958,25 @@ $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
 /* confdefs.h.  */
@@ -26515,56 +24997,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 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
 
@@ -26575,25 +25043,25 @@ 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
 /* confdefs.h.  */
 _ACEOF
@@ -26604,38 +25072,41 @@ $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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $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
 /* confdefs.h.  */
 _ACEOF
@@ -26644,85 +25115,92 @@ 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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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;}
+    { 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 compiler's result" >&5
+echo "$as_me: WARNING: GL/gl.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   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;}
-
+    { 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: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: GL/gl.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: GL/gl.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: GL/gl.h:     section \"Present But Cannot Be Compiled\"" >&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;}
+    { echo "$as_me:$LINENO: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_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"
@@ -26737,48 +25215,47 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
@@ -26786,16 +25263,16 @@ _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"
@@ -26810,48 +25287,47 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
@@ -26859,58 +25335,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
@@ -26918,10 +25394,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
   [\\/]* | ?:[\\/]*)
@@ -26934,29 +25410,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
@@ -26967,25 +25442,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=""
@@ -27006,30 +25481,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
 
@@ -27038,62 +25513,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"
@@ -27101,23 +25576,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
@@ -27125,40 +25596,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"
@@ -27166,30 +25637,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
@@ -27197,20 +25664,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
@@ -27218,13 +25685,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
@@ -27234,15 +25701,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"
@@ -27250,31 +25717,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
@@ -27282,20 +25745,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
@@ -27303,13 +25766,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
@@ -27319,15 +25782,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"
@@ -27335,31 +25798,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
@@ -27367,20 +25826,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
@@ -27388,13 +25847,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
@@ -27404,15 +25863,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"
@@ -27420,31 +25879,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
@@ -27452,20 +25907,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
@@ -27473,13 +25928,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
@@ -27489,15 +25944,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"
@@ -27505,31 +25960,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
@@ -27537,20 +25988,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
@@ -27558,13 +26009,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
@@ -27574,15 +26025,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"
@@ -27590,31 +26041,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
@@ -27622,20 +26069,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
@@ -27643,13 +26090,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
@@ -27659,15 +26106,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"
@@ -27675,31 +26122,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
@@ -27707,20 +26150,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
@@ -27728,13 +26171,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
@@ -27744,15 +26187,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"
@@ -27760,31 +26203,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
@@ -27792,20 +26231,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
@@ -27813,13 +26252,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
@@ -27829,15 +26268,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"
@@ -27845,31 +26284,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
@@ -27877,20 +26312,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
@@ -27898,13 +26333,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
@@ -27914,15 +26349,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"
@@ -27930,17 +26365,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
 
@@ -27948,14 +26379,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
@@ -27963,20 +26394,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
@@ -27984,13 +26415,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
@@ -28000,15 +26431,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"
@@ -28016,33 +26447,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
@@ -28050,8 +26477,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
@@ -28072,25 +26499,75 @@ 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; }
+    SYSTEM_APACHE_COMMONS=YES
+    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
+      if test -z $COMMONS_CODEC_JAR; then
+        echo "$as_me:$LINENO: checking for /usr/share/java/commons-codec-1.3.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/commons-codec-1.3.jar... $ECHO_C" >&6
+if test "${ac_cv_file__usr_share_java_commons_codec_1_3_jar+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  test "$cross_compiling" = yes &&
+  { { 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/commons-codec-1.3.jar"; then
+  ac_cv_file__usr_share_java_commons_codec_1_3_jar=yes
+else
+  ac_cv_file__usr_share_java_commons_codec_1_3_jar=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_codec_1_3_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_codec_1_3_jar" >&6
+if test $ac_cv_file__usr_share_java_commons_codec_1_3_jar = yes; then
+   COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar
+else
+
+            echo "$as_me:$LINENO: checking for /usr/share/java/commons-codec.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/commons-codec.jar... $ECHO_C" >&6
+if test "${ac_cv_file__usr_share_java_commons_codec_jar+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  test "$cross_compiling" = yes &&
+  { { 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/commons-codec.jar"; then
+  ac_cv_file__usr_share_java_commons_codec_jar=yes
+else
+  ac_cv_file__usr_share_java_commons_codec_jar=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_codec_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_codec_jar" >&6
+if test $ac_cv_file__usr_share_java_commons_codec_jar = yes; then
+   COMMONS_CODEC_JAR=/usr/share/java/commons-codecs.jar
+else
+  { { echo "$as_me:$LINENO: error: commons-codec.jar replacement not found." >&5
+echo "$as_me: error: commons-codec.jar replacement not found." >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+
+
+
+fi
+
+      else
+        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"
@@ -28098,32 +26575,80 @@ 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
+      fi
+
+      if test -z $COMMONS_LANG_JAR; then
+        echo "$as_me:$LINENO: checking for /usr/share/java/commons-lang-2.3.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/commons-lang-2.3.jar... $ECHO_C" >&6
+if test "${ac_cv_file__usr_share_java_commons_lang_2_3_jar+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  test "$cross_compiling" = yes &&
+  { { 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/commons-lang-2.3.jar"; then
+  ac_cv_file__usr_share_java_commons_lang_2_3_jar=yes
+else
+  ac_cv_file__usr_share_java_commons_lang_2_3_jar=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_lang_2_3_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_lang_2_3_jar" >&6
+if test $ac_cv_file__usr_share_java_commons_lang_2_3_jar = yes; then
+   COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar
+else
+
+            echo "$as_me:$LINENO: checking for /usr/share/java/commons-lang.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/commons-lang.jar... $ECHO_C" >&6
+if test "${ac_cv_file__usr_share_java_commons_lang_jar+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  test "$cross_compiling" = yes &&
+  { { 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/commons-lang.jar"; then
+  ac_cv_file__usr_share_java_commons_lang_jar=yes
+else
+  ac_cv_file__usr_share_java_commons_lang_jar=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_lang_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_lang_jar" >&6
+if test $ac_cv_file__usr_share_java_commons_lang_jar = yes; then
+   COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar
+else
+  { { echo "$as_me:$LINENO: error: commons-lang.jar replacement not found." >&5
+echo "$as_me: error: commons-lang.jar replacement not found." >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+
+
+
+fi
+
+      else
+        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"
@@ -28131,32 +26656,80 @@ 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
+      fi
+
+      if test -z $COMMONS_HTTPCLIENT_JAR; then
+        echo "$as_me:$LINENO: checking for /usr/share/java/commons-httpclient-3.1.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/commons-httpclient-3.1.jar... $ECHO_C" >&6
+if test "${ac_cv_file__usr_share_java_commons_httpclient_3_1_jar+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  test "$cross_compiling" = yes &&
+  { { 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/commons-httpclient-3.1.jar"; then
+  ac_cv_file__usr_share_java_commons_httpclient_3_1_jar=yes
+else
+  ac_cv_file__usr_share_java_commons_httpclient_3_1_jar=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_httpclient_3_1_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_httpclient_3_1_jar" >&6
+if test $ac_cv_file__usr_share_java_commons_httpclient_3_1_jar = yes; then
+   COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar
+else
+
+            echo "$as_me:$LINENO: checking for /usr/share/java/commons-httpclient.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/commons-httpclient.jar... $ECHO_C" >&6
+if test "${ac_cv_file__usr_share_java_commons_httpclient_jar+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  test "$cross_compiling" = yes &&
+  { { 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/commons-httpclient.jar"; then
+  ac_cv_file__usr_share_java_commons_httpclient_jar=yes
+else
+  ac_cv_file__usr_share_java_commons_httpclient_jar=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_httpclient_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_httpclient_jar" >&6
+if test $ac_cv_file__usr_share_java_commons_httpclient_jar = yes; then
+   COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient.jar
+else
+  { { echo "$as_me:$LINENO: error: commons-httpclient.jar replacement not found." >&5
+echo "$as_me: error: commons-httpclient.jar replacement not found." >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+
+
+
+fi
+
+      else
+        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"
@@ -28164,34 +26737,81 @@ 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
 
+      fi
     fi
     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
-   as_ac_File=`$as_echo "ac_cv_file_$COMMONS_LOGGING_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $COMMONS_LOGGING_JAR" >&5
-$as_echo_n "checking for $COMMONS_LOGGING_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+      if test -z $COMMONS_LOGGING_JAR; then
+        echo "$as_me:$LINENO: checking for /usr/share/java/commons-logging-1.1.1.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/commons-logging-1.1.1.jar... $ECHO_C" >&6
+if test "${ac_cv_file__usr_share_java_commons_logging_1_1_1_jar+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  test "$cross_compiling" = yes &&
+  { { 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/commons-logging-1.1.1.jar"; then
+  ac_cv_file__usr_share_java_commons_logging_1_1_1_jar=yes
+else
+  ac_cv_file__usr_share_java_commons_logging_1_1_1_jar=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" >&6
+if test $ac_cv_file__usr_share_java_commons_logging_1_1_1_jar = yes; then
+   COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar
+else
+
+            echo "$as_me:$LINENO: checking for /usr/share/java/commons-logging.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/commons-logging.jar... $ECHO_C" >&6
+if test "${ac_cv_file__usr_share_java_commons_logging_jar+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  test "$cross_compiling" = yes &&
+  { { 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/commons-logging.jar"; then
+  ac_cv_file__usr_share_java_commons_logging_jar=yes
+else
+  ac_cv_file__usr_share_java_commons_logging_jar=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_logging_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_logging_jar" >&6
+if test $ac_cv_file__usr_share_java_commons_logging_jar = yes; then
+   COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar
+else
+  { { echo "$as_me:$LINENO: error: commons-logging.jar replacement not found." >&5
+echo "$as_me: error: commons-logging.jar replacement not found." >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+
+
+
+fi
+
+      else
+        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_LOGGING_JAR"; then
   eval "$as_ac_File=yes"
@@ -28199,27 +26819,23 @@ 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-logging.jar not found." >&5
-$as_echo "$as_me: error: commons-logging.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
     fi
   else
-        { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
-        SYSTEM_APACHE_COMMONS=NO
-        BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
+    echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
+    SYSTEM_APACHE_COMMONS=NO
+    BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
   fi
 fi
 
@@ -28269,8 +26885,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
@@ -28278,18 +26894,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
@@ -28297,22 +26913,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
   [\\/]* | ?:[\\/]*)
@@ -28326,39 +26942,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
@@ -28366,18 +26981,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
@@ -28385,12 +27000,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
@@ -28432,8 +27047,8 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
    kde_test_include="ksharedptr.h"
    kde_test_library="libkdeui.so"
 
-   { $as_echo "$as_me:$LINENO: checking for Qt4 headers" >&5
-$as_echo_n "checking for Qt4 headers... " >&6; }
+   echo "$as_me:$LINENO: checking for Qt4 headers" >&5
+echo $ECHO_N "checking for Qt4 headers... $ECHO_C" >&6
    qt_header_dir="no"
    for inc_dir in $qt_incdirs ; do
       if test -r "$inc_dir/$qt_test_include" ; then
@@ -28442,16 +27057,16 @@ $as_echo_n "checking for Qt4 headers... " >&6; }
       fi
    done
 
-   { $as_echo "$as_me:$LINENO: result: $qt_header_dir" >&5
-$as_echo "$qt_header_dir" >&6; }
+   echo "$as_me:$LINENO: result: $qt_header_dir" >&5
+echo "${ECHO_T}$qt_header_dir" >&6
    if test "x$qt_header_dir" = "xno" ; then
-      { { $as_echo "$as_me:$LINENO: error: Qt4 headers not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." >&5
-$as_echo "$as_me: error: Qt4 headers not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." >&2;}
+      { { echo "$as_me:$LINENO: error: Qt4 headers not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." >&5
+echo "$as_me: error: Qt4 headers not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." >&2;}
    { (exit 1); exit 1; }; }
    fi
 
-   { $as_echo "$as_me:$LINENO: checking for Qt4 libraries" >&5
-$as_echo_n "checking for Qt4 libraries... " >&6; }
+   echo "$as_me:$LINENO: checking for Qt4 libraries" >&5
+echo $ECHO_N "checking for Qt4 libraries... $ECHO_C" >&6
    qt_lib_dir="no"
    for lib_dir in $qt_libdirs ; do
       if test -r "$lib_dir/$qt_test_library" ; then
@@ -28460,21 +27075,21 @@ $as_echo_n "checking for Qt4 libraries... " >&6; }
       fi
    done
 
-   { $as_echo "$as_me:$LINENO: result: $qt_lib_dir" >&5
-$as_echo "$qt_lib_dir" >&6; }
+   echo "$as_me:$LINENO: result: $qt_lib_dir" >&5
+echo "${ECHO_T}$qt_lib_dir" >&6
 
    if test "x$qt_lib_dir" = "xno" ; then
-      { { $as_echo "$as_me:$LINENO: error: Qt4 libraries not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." >&5
-$as_echo "$as_me: error: Qt4 libraries not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." >&2;}
+      { { echo "$as_me:$LINENO: error: Qt4 libraries not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." >&5
+echo "$as_me: error: Qt4 libraries not found.  Please specify the root of your Qt4 installation by exporting QT4DIR 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_MOC4+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $MOC4 in
   [\\/]* | ?:[\\/]*)
@@ -28488,39 +27103,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_MOC4="$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_MOC4" && ac_cv_path_MOC4="no"
   ;;
 esac
 fi
 MOC4=$ac_cv_path_MOC4
+
 if test -n "$MOC4"; then
-  { $as_echo "$as_me:$LINENO: result: $MOC4" >&5
-$as_echo "$MOC4" >&6; }
+  echo "$as_me:$LINENO: result: $MOC4" >&5
+echo "${ECHO_T}$MOC4" >&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 "$MOC4" = "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 QT4DIR 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 QT4DIR before running \"configure\"." >&2;}
    { (exit 1); exit 1; }; }
    fi
 
-      { $as_echo "$as_me:$LINENO: checking for KDE4 headers" >&5
-$as_echo_n "checking for KDE4 headers... " >&6; }
+      echo "$as_me:$LINENO: checking for KDE4 headers" >&5
+echo $ECHO_N "checking for KDE4 headers... $ECHO_C" >&6
    kde_incdir="no"
    for kde_check in $kde_incdirs ; do
       if test -r "$kde_check/$kde_test_include" ; then
@@ -28528,16 +27142,16 @@ $as_echo_n "checking for KDE4 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: KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." >&5
-$as_echo "$as_me: error: KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." >&2;}
+      { { echo "$as_me:$LINENO: error: KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." >&5
+echo "$as_me: error: KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." >&2;}
    { (exit 1); exit 1; }; }
    fi
 
-      { $as_echo "$as_me:$LINENO: checking for KDE4 libraries" >&5
-$as_echo_n "checking for KDE4 libraries... " >&6; }
+      echo "$as_me:$LINENO: checking for KDE4 libraries" >&5
+echo $ECHO_N "checking for KDE4 libraries... $ECHO_C" >&6
    kde_libdir="no"
    for kde_check in $kde_libdirs ; do
       if test -r "$kde_check/$kde_test_library" ; then
@@ -28546,11 +27160,11 @@ $as_echo_n "checking for KDE4 libraries... " >&6; }
       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: KDE4 libraries not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." >&5
-$as_echo "$as_me: error: KDE4 libraries not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." >&2;}
+      { { echo "$as_me:$LINENO: error: KDE4 libraries not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." >&5
+echo "$as_me: error: KDE4 libraries not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." >&2;}
    { (exit 1); exit 1; }; }
    fi
 
@@ -28561,34 +27175,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
   [\\/]* | ?:[\\/]*)
@@ -28601,29 +27215,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
@@ -28634,25 +27247,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=""
@@ -28673,27 +27286,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'
@@ -28701,16 +27314,14 @@ 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
 /* confdefs.h.  */
@@ -28728,44 +27339,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 gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-
-
    CXXFLAGS=$save_CXXFLAGS
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -28775,319 +27372,66 @@ 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; }
-if test -n "$enable_fontooo"; then
-  if test "$enable_fontooo" = "no"; then
-    { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-    WITH_FONTOOO=NO
-    SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO"
-  else
-    { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-    WITH_FONTOOO=YES
-    BUILD_TYPE="$BUILD_TYPE MSFONTEXTRACT"
-  fi
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "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; }
-  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; }
-    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; }
-if test "${ac_cv_header_mspack_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5
-$as_echo "$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; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <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
-  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_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking mspack.h presence" >&5
-$as_echo_n "checking mspack.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-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
-  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
-  ac_header_preproc=yes
-else
-  $as_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; }
-
-# 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
-    ;;
-  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;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for mspack.h" >&5
-$as_echo_n "checking for mspack.h... " >&6; }
-if test "${ac_cv_header_mspack_h+set}" = set; then
-  $as_echo_n "(cached) " >&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; }
-
-fi
-if test "x$ac_cv_header_mspack_h" = x""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;}
-   { (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; }
-if test "${ac_cv_lib_mspack_mspack_create_cab_decompressor+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmspack  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char mspack_create_cab_decompressor ();
-int
-main ()
-{
-return 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
-  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
-  ac_cv_lib_mspack_mspack_create_cab_decompressor=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	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
-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
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBMSPACK 1
-_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;}
-   { (exit 1); exit 1; }; }
-fi
-
-  else
-    { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "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
@@ -29095,13 +27439,13 @@ 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
@@ -29131,20 +27475,20 @@ 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
 /* confdefs.h.  */
 _ACEOF
@@ -29155,38 +27499,41 @@ $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>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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_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.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-{ $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
 /* confdefs.h.  */
 _ACEOF
@@ -29195,76 +27542,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
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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;}
+    { 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 compiler's result" >&5
+echo "$as_me: WARNING: X11/extensions/Xinerama.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   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;}
-
+    { 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: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: X11/extensions/Xinerama.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: X11/extensions/Xinerama.h:     section \"Present But Cannot Be Compiled\"" >&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;}
+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: X11/extensions/Xinerama.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_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
 
@@ -29277,10 +27631,10 @@ 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"
@@ -29291,58 +27645,57 @@ 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>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_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 -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_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 \
+rm -f conftest.err 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
@@ -29350,18 +27703,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
 
 
@@ -29375,10 +27728,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
   [\\/]* | ?:[\\/]*)
@@ -29391,28 +27744,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
 
@@ -29424,10 +27776,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
   [\\/]* | ?:[\\/]*)
@@ -29441,28 +27793,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
 
@@ -29471,8 +27822,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
@@ -29498,8 +27849,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`
@@ -29507,18 +27858,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) {
@@ -29545,11 +27896,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
@@ -29562,8 +27913,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
@@ -29576,8 +27927,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
@@ -29593,23 +27944,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
@@ -29644,178 +27995,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
 
 
@@ -29826,22 +28177,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
 
 
@@ -29850,8 +28201,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
@@ -29870,59 +28220,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"
-      ;; #(
+      ;;
     *)
       # `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
@@ -29931,54 +28261,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
 
@@ -29986,14 +28325,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.
@@ -30006,78 +28343,22 @@ 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
+DUALCASE=1; export DUALCASE # for MKS sh
 
 # Support unset when possible.
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
@@ -30087,60 +28368,33 @@ else
 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 -z "`(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
@@ -30148,122 +28402,159 @@ 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=:
@@ -30272,28 +28563,7 @@ else
   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'"
@@ -30302,14 +28572,31 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
+# 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.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -30317,107 +28604,124 @@ 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]
-                   instantiate the configuration file FILE
+  --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.59,
+  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2003 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
@@ -30431,47 +28735,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
@@ -30481,464 +28769,668 @@ 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"
-
-
-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
+cat >>$CONFIG_STATUS <<_ACEOF
 
-  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,@NO_HIDS@,$NO_HIDS,;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,@MINGW_BACKWARD_INCLUDE_PATH@,$MINGW_BACKWARD_INCLUDE_PATH,;t t
+s,@MINGW_CLIB_DIR@,$MINGW_CLIB_DIR,;t t
+s,@MINGW_SHARED_GCCLIB@,$MINGW_SHARED_GCCLIB,;t t
+s,@MINGW_GCCLIB_EH@,$MINGW_GCCLIB_EH,;t t
+s,@MINGW_SHARED_GXXLIB@,$MINGW_SHARED_GXXLIB,;t t
+s,@MINGW_GCCDLL@,$MINGW_GCCDLL,;t t
+s,@MINGW_GXXDLL@,$MINGW_GXXDLL,;t t
+s,@EXCEPTIONS@,$EXCEPTIONS,;t t
+s,@STLPORT4@,$STLPORT4,;t t
+s,@STLPORT_VER@,$STLPORT_VER,;t t
+s,@USE_SYSTEM_STL@,$USE_SYSTEM_STL,;t t
+s,@USE_CCACHE@,$USE_CCACHE,;t t
+s,@CCACHE@,$CCACHE,;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,@ENABLE_NSS_MODULE@,$ENABLE_NSS_MODULE,;t t
+s,@MOZILLABUILD@,$MOZILLABUILD,;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,@GRAPHITE_CFLAGS@,$GRAPHITE_CFLAGS,;t t
+s,@GRAPHITE_LIBS@,$GRAPHITE_LIBS,;t t
+s,@ENABLE_GRAPHITE@,$ENABLE_GRAPHITE,;t t
+s,@SYSTEM_GRAPHITE@,$SYSTEM_GRAPHITE,;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,@SYSTEM_NEON@,$SYSTEM_NEON,;t t
+s,@NEON_VERSION@,$NEON_VERSION,;t t
+s,@OPENSSL_CFLAGS@,$OPENSSL_CFLAGS,;t t
+s,@OPENSSL_LIBS@,$OPENSSL_LIBS,;t t
+s,@SYSTEM_OPENSSL@,$SYSTEM_OPENSSL,;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,@ENABLE_GTK@,$ENABLE_GTK,;t t
+s,@ENABLE_KDE@,$ENABLE_KDE,;t t
+s,@ENABLE_KDE4@,$ENABLE_KDE4,;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,@MOC4@,$MOC4,;t t
+s,@KDE4_CFLAGS@,$KDE4_CFLAGS,;t t
+s,@KDE4_LIBS@,$KDE4_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_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\(/\)' \| \
+	 .     : '\(.\)' 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\(/\)' \| \
+	 .     : '\(.\)' 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
-
 
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+  case "$ac_dir" in
+  .) ac_abs_builddir=`pwd`;;
+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+  case ${ac_top_builddir}. in
+  .) ac_abs_top_builddir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+  case $ac_srcdir in
+  .) ac_abs_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+  case $ac_top_srcdir in
+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+  esac;;
+esac
 
-_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.
@@ -30960,10 +29452,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.cmd b/configure.cmd
index 1d847525f6f9..aff7e810b520 100755
--- a/configure.cmd
+++ b/configure.cmd
@@ -3,5 +3,5 @@ setlocal
 SET MY_ANT_HOME=e:/java150/apache-ant-1.7.0
 SET JAVA_HOME=e:\java150
 SET PATH=%JAVA_HOME%\bin;%PATH%;%MY_ANT_HOME%\bin;
-sh -c "configure --with-system-openssl --with-system-icu --with-system-libxml --with-system-libxslt --disable-werror --with-use-shell=4nt --disable-mozilla --disable-epm --disable-odk --disable-qadevooo --with-x=no --disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes --disable-gcjaot --without-nas --without-fonts --with-ant-home=%MY_ANT_HOME%" | tee configure.log
+sh -c "configure --with-system-openssl --with-system-icu --with-system-libxml --with-system-libxslt --disable-werror --with-use-shell=bash --disable-mozilla --disable-epm --disable-odk --disable-qadevooo --with-x=no --disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes --disable-gcjaot --without-nas --without-fonts --with-ant-home=%MY_ANT_HOME%" | tee configure.log
 endlocal
diff --git a/configure.in b/configure.in
index aff65d6d1583..0ce538aeed8e 100644
--- a/configure.in
+++ b/configure.in
@@ -115,10 +115,6 @@ AC_ARG_ENABLE(qadevooo,
 [  --disable-qadevooo      OO.o includes some qa testsuites which some
                           packagers may wish to build without
 ],,enable_qadevooo="yes")
-AC_ARG_ENABLE(fontooo,
-[  --disable-fontooo       disable FontOOo
-                          (useful for distributions using fontconfig for OOo)
-],,enable_fontooo="yes")
 AC_ARG_ENABLE(mathmldtd,
 [  --disable-mathmldtd     disable mathmldtd
                           (useful for distributions that want to avoid packaging
@@ -130,10 +126,7 @@ AC_ARG_ENABLE(evolution2,
 ],,)
 AC_ARG_WITH(system-stdlibs,
 [  --with-system-stdlibs   use libstdc++/libgcc_s already on system
-],,checkforprelink=yes)
-AC_ARG_WITH(system-mspack,
-[  --with-system-mspack    use libmspack already installed on system
-],,)
+],,checkforstdlibproblems=yes)
 AC_ARG_ENABLE(cups,
 [  --disable-cups          disable cups support in the psprint project
 ],,enable_cups=yes)
@@ -652,10 +645,13 @@ AC_ARG_WITH(directx-home,
                           Usage: --with-directx-home=<absolute path to Microsoft DirectX SDK>
 ],,)
 AC_ARG_WITH(mozilla-build,
-[  --with-mozilla-build   For Windows users, please supply the path to the
+[  --with-mozilla-build    For Windows users, please supply the path to the
                           mozilla build tools.
  
                           Usage: --with-mozilla-build=<absolute path to mozilla build tools>
+
+						  At the moment of this writing, an installer for the mozilla build tools
+						  can be obtained from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32.
 ],[MOZILLABUILD=$withval],)
 AC_ARG_WITH(local-solenv,
 [  --with-local-solenv     If you have solenv in a location other than ./solenv,
@@ -773,9 +769,8 @@ AC_ARG_WITH(use-shell,
                           Supported options:
                             tcsh (default)
                             bash
-                            4nt (windows only)
 
-                          Usage: --with-use-shell=tcsh|bash|4nt
+                          Usage: --with-use-shell=tcsh|bash
 ],with_use_shell=$withval,with_use_shell="tcsh")
 AC_ARG_WITH(build-version,
 [  --with-build-version    Allows the builder to add a custom version tag
@@ -784,12 +779,6 @@ AC_ARG_WITH(build-version,
 
                           Usage: --with-build-version="Built by Jim"
 ],with_build_version=$withval)
-AC_ARG_ENABLE(sgistl,
-[  --enable-sgistl         for IRIX users, use this option option to build
-                          OpenOffice.org using SGI's STL.
-
-                          Usage: --enable-sgistl=yes
-],,)
 AC_ARG_WITH(alloc,
 [  --with-alloc            Define which allocator to build with
 			                 (choices are oo, system, tcmalloc)
@@ -937,9 +926,6 @@ case "$build_os" in
 		test_cups=yes
         test_randr=yes
 		test_freetype=yes
-		if getconf GNU_LIBPTHREAD_VERSION |grep -q NPTL; then
-			PTHREAD_CFLAGS="-DNPTL"
-		fi
 		_os=Linux
 		;;
 	gnu)
@@ -1019,12 +1005,6 @@ case "$build_os" in
 		PTHREAD_LIBS="-pthread -lpthread"
 		_os=NetBSD
 		;;
-	irix*)
-		test_cups=no
-        test_randr=no
-		test_freetype=yes
-		_os=IRIX
-		;;
 	aix*)
 		test_cups=no
         test_randr=no
@@ -1317,14 +1297,14 @@ AC_SUBST(HYPH_SYSTEM_DIR)
 AC_SUBST(THES_SYSTEM_DIR)
 
 dnl ===================================================================
-dnl WINNT uses tcsh, bash or 4nt all other O/S use tcsh or bash.
+dnl all O/S use tcsh or bash.
 dnl The following sets the with_use_shell variable.
 dnl ===================================================================
 AC_MSG_CHECKING([which shell to use])
 if test $_os = "WINNT"; then
    dnl ===================================================================
-   if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash" -a "$with_use_shell" != "4nt"; then
-      AC_MSG_ERROR([only "tcsh","bash" or "4nt" are supported options])
+   if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash"; then
+      AC_MSG_ERROR([only "tcsh" or "bash" are supported options])
    fi
    dnl ===================================================================
    dnl Sanity check! Native windows programs cannot use cygwin symlinks!
@@ -1356,7 +1336,7 @@ link, and copy the program to the name of the link.])
    dnl If using Mingwin32 then don't use 4NT
    dnl ===================================================================
    if test "$WITH_MINGWIN" = "yes" ; then
-      if test "$with_use_shell" = "4nt" -o "x$with_use_shell" = "x"; then
+      if test "x$with_use_shell" = "x"; then
          with_use_shell="tcsh"
       fi
       if test -z "$CC"; then
@@ -1365,8 +1345,8 @@ link, and copy the program to the name of the link.])
       fi
    fi
 elif test $_os = "OS2"; then
-   if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "4nt"; then
-      AC_MSG_ERROR([only "tcsh" or "4nt" are supported options])
+   if test "$with_use_shell" != "tcsh"; then
+      AC_MSG_ERROR([only "tcsh" is supported options])
    fi
 else 
    dnl ===================================================================
@@ -1382,11 +1362,11 @@ AC_SUBST(USE_SHELL)
 AC_SUBST(WITH_MINGWIN)
 
 dnl ===================================================================
-dnl Extra check for Windows. Non 4nt-builds need gcc to build dmake
+dnl Extra check for Windows. cygwin builds need gcc to build dmake
 dnl and g++ to build guw.exe although MS cl (or MinGW) is used to
 dnl build OOo.
 dnl ===================================================================
-if test "$_os" = "WINNT" -a "$with_use_shell" != "4nt" ; then
+if test "$_os" = "WINNT" ; then
    AC_MSG_CHECKING([for cygwin gcc/g++])
    if which gcc > /dev/null && which g++ > /dev/null ; then
       AC_MSG_RESULT([found])
@@ -1449,7 +1429,8 @@ if test "$COMPATH" = "." ; then
     dnl double square bracket to get single because of M4 quote...
     COMPATH=`echo $COMPATH | $SED "s@/[[^/:]]*\\\$@@"`;
 fi
-
+COMPATH=`echo $COMPATH | $SED "s@/[[Bb]][[Ii]][[Nn]]\\\$@@"`;
+echo $COMPATH
 dnl ===================================================================
 dnl  Test the gcc version,  3 is OK
 dnl ===================================================================
@@ -1593,7 +1574,7 @@ dnl ===================================================================
 if test "$_os" = "SunOS"; then
    if test "$CC" = "cc"; then
       AC_PATH_PROGS(_cc, cc)
-      COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
+      COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
       AC_MSG_CHECKING([the SunStudio C/C++ compiler version])
       dnl cc -V outputs to standard error!!!!
       _sunstudio_string=`$CC -V 2>&1 | grep '^cc' | sed -e 's/.* C //'`
@@ -1632,37 +1613,12 @@ fi
 AC_SUBST(HAVE_LD_HASH_STYLE)
 
 dnl ===================================================================
-dnl  Test the IRIX SGI Mips pro compiler
-dnl ===================================================================
-if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
-   if test "$CC" = "cc"; then
-      AC_PATH_PROGS(_cc, cc)
-      COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
-      AC_MSG_CHECKING([the SGI MIPSpro C compiler version])
-      dnl cc -version outputs to standard error!!!!
-      _mipspro_version=`$CC -version 2>&1 | $AWK '{ print $4 }'`
-      _mipspro_major=`echo $_mipspro_version | $AWK -F. '{ print $1 }'`
-      if test "$_mipspro_major" != "7"; then
-         AC_MSG_ERROR([found version "$_mipspro_version", use version 7.2+ of the SGI MIPSpro C compiler])
-      else
-         _mipspro_minor=`echo $_mipspro_version | $AWK -F. '{ if ($2 <= 1) print "false"; else print "true" }'`
-         if test "$_mipspro_minor" = "false"; then
-            AC_MSG_ERROR([found version "$_mipspro_version", use version 7.2+ of the SGI MIPSpro C compiler])
-         else
-            dnl compiler will do
-            AC_MSG_RESULT([checked])
-         fi
-      fi
-   fi
-fi
-
-dnl ===================================================================
 dnl  Test the Compaq compiler for OSF1
 dnl ===================================================================
 if test "$_os" = "OSF1"; then
    if test "$CC" = "cc"; then
       AC_PATH_PROGS(_cc, cc)
-      COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
+      COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
       AC_MSG_WARN([******* $_cc , $COMPATH])
       AC_MSG_CHECKING([the Compaq C compiler version])
       dnl cc -V outputs to standard error!!!!
@@ -1788,8 +1744,8 @@ if test "$_os" = "WINNT"; then
 			CC=`cygpath -u "$CC"`
 			# Remove /cl.exe from CC case insensitive
 			AC_MSG_RESULT([found ($CC)])
-			COMPATH=`echo $CC | $SED 's@/[[cC]][[lL]]\.[[eE]][[xX]][[eE]]@@'`
-			export INCLUDE=`cygpath -d "$COMPATH/../Include"`
+			COMPATH=`echo $CC | $SED 's@\/[[Bb]][[Ii]][[Nn]]\/[[cC]][[lL]]\.[[eE]][[xX]][[eE]]@@'`
+			export INCLUDE=`cygpath -d "$COMPATH/Include"`
 			dnl  Check which Microsoft C/C++ compiler is found
 			AC_MSG_CHECKING([the Version of Microsoft C/C++ Compiler])
 dnl      The following find microsoft, matches nn.nn.nnnn then pulls numbers out.         
@@ -2218,7 +2174,7 @@ _ACEOF
   if test -e "$MINGW_CLIB_DIR/libgcc_s.a"; then
     AC_MSG_CHECKING([dynamic libgcc name])
     MINGW_GCCDLL_pattern=`nm $MINGW_CLIB_DIR/libgcc_s.a | sed -ne 's@.* _libgcc\(.*\)_dll_iname@libgcc\1.dll@p' | uniq | sed -e 's@_@?@g'`
-    MINGW_GCCDLL=`cd $COMPATH && ls $MINGW_GCCDLL_pattern 2>/dev/null`
+    MINGW_GCCDLL=`cd $COMPATH/bin && ls $MINGW_GCCDLL_pattern 2>/dev/null`
     if test -n "$MINGW_GCCDLL"; then
         MINGW_SHARED_GCCLIB=YES
         AC_MSG_RESULT([use $MINGW_GCCDLL])
@@ -2235,7 +2191,7 @@ _ACEOF
   if test -e "$MINGW_CLIB_DIR/libstdc++_s.a" ; then
     AC_MSG_CHECKING([dynamic libstdc++ name])
     MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/libstdc++_s.a | sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' | uniq | sed -e 's@_@?@g'`
-    MINGW_GXXDLL=`cd $COMPATH && ls $MINGW_GXXDLL_pattern 2>/dev/null`
+    MINGW_GXXDLL=`cd $COMPATH/bin && ls $MINGW_GXXDLL_pattern 2>/dev/null`
     if test -n "$MINGW_GXXDLL"; then
         MINGW_SHARED_GXXLIB=YES
         AC_MSG_RESULT([use $MINGW_GXXDLL])
@@ -2285,21 +2241,6 @@ if test "$_os" = "Darwin"; then
    fi 
 fi 
 dnl ===================================================================
-dnl Extra checking for the IRIX compiler
-dnl ===================================================================
-if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
-   dnl MIPSpro C++ compiler packaged with MIPSpro C compiler
-   if test "$CC" = "cc"; then
-      AC_MSG_CHECKING([SGI MIPSpro C++ Compiler])
-      if test "$CXX" != "CC"; then
-         AC_MSG_WARN([SGI MIPSpro C++ was not found])
-         echo "SGI MIPSpro C++ was not found" >> warn
-      else
-         AC_MSG_RESULT([checked])
-      fi
-   fi
-fi
-dnl ===================================================================
 dnl Extra checking for the OSF compiler
 dnl ===================================================================
 if test "$_os" = "OSF1"; then
@@ -2441,23 +2382,6 @@ if test "$_os" = "SunOS"; then
 fi
 
 dnl ===================================================================
-dnl Checks for SGI STL
-dnl ===================================================================
-if test -n "$enable_sgistl" && "$enable_sgistl" != "no"; then
-	if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
-		AC_MSG_CHECKING([for SGI STL])
-		if test -d /usr/include/CC ; then
-			AC_MSG_RESULT([yes.])
-
-		else
-			AC_MSG_RESULT([not found.])
-		fi
-	else
-		AC_MSG_ERROR([Option --enable-sgistl is only valid for IRIX])
-	fi
-else
-
-dnl ===================================================================
 dnl Checks for what the default STL should be
 dnl ===================================================================
    AC_MSG_CHECKING([what the default STL should be])
@@ -2540,19 +2464,6 @@ dnl ===================================================================
 		      else
 			      AC_MSG_ERROR([STLport libraries not found])
 		      fi
-	      elif test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
-		      if test -f "$STLPORT4/lib/libstlport_mipspro_41.so"; then
-			      AC_MSG_RESULT([checked])
-			   else
-				   if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
-					   AC_MSG_RESULT([checked])
-				   elif test -f "$STLPORT4/lib/libstlport.so"; then
-					   AC_MSG_RESULT([checked])
-					   STLPORT_VER=500
-				   else
-					   AC_MSG_ERROR([STLport libraries not found])
-				   fi
-			   fi
 		   else
 			   if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
 				   AC_MSG_RESULT([checked])
@@ -2569,7 +2480,6 @@ dnl ===================================================================
          echo "using stlport. Warning, breaks your ABI compatability!" >>warn
       fi
    fi
-fi
 
 if test -z "$STLPORT4"; then
   STLPORT4="NO_STLPORT4"
@@ -2710,11 +2620,18 @@ _ACEOF
       if ! $CXX $CXXFLAGS $CPPFLAGS -fpic -S visibility.cxx 2>/dev/null > /dev/null; then
          gccvisbroken=yes
       else
-         if $EGREP -q '@PLT|\$stub' visibility.s; then
-             gccvisbroken=no;
-         else 
-             gccvisbroken=yes; 
-         fi
+         case "$build_cpu" in
+            i?86|x86_64)
+               if $EGREP -q '@PLT' visibility.s; then
+                  gccvisbroken=no
+               else 
+                  gccvisbroken=yes
+               fi
+               ;;
+            *)
+               gccvisbroken=no
+               ;;
+         esac
       fi
       rm -f visibility.s
 
@@ -2890,8 +2807,8 @@ if test "$SOLAR_JAVA" != ""; then
         _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
         _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
    
-        if test "$_jdk_ver" -lt 10600; then
-             AC_MSG_ERROR([IBM JDK is too old, you need at least 1.6])
+        if test "$_jdk_ver" -lt 10500; then
+             AC_MSG_ERROR([IBM JDK is too old, you need at least 1.5])
         fi
 
         AC_MSG_RESULT([checked (IBM JDK $_jdk)])
@@ -2975,7 +2892,7 @@ if test "$SOLAR_JAVA" != ""; then
         AC_MSG_RESULT([checked (ecj)])
         #TODO: what's to do here? some switch to do 1.5 compiling?
         JAVAFLAGS="-source 1.5 -target 1.5"
-        _gij_longver="50000"
+        _gij_longver="40200"
     fi
 fi
 
@@ -3030,7 +2947,7 @@ fi
 if test "$SOLAR_JAVA" != ""; then
     dnl first check if we have been asked to autodetect JAVA_HOME with a recent gij
     if test "$JDK" == "gcj" -a -z "$JAVA_HOME"; then
-      if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "50000"; then
+      if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "40200"; then
         cat > findhome.java <<_ACEOF
 [import java.io.File;
 
@@ -3070,7 +2987,7 @@ _ACEOF
     fi
 
     dnl second sanity check JAVA_HOME if possible
-    if test "$JDK" != "gcj" -o "$_gij_longver" -ge "50000"; then
+    if test "$JDK" != "gcj" -o "$_gij_longver" -ge "40200"; then
       # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
       if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then
 
@@ -3348,9 +3265,6 @@ if test "$_os" != "WINNT" -a \( "z$enable_epm" = "z" -o "$enable_epm" != "no" \)
 	OSF1)
 		PKGFORMAT=setld
 		;;
-	IRIX)
-		PKGFORMAT=tardist
-		;;
 	# we never should get here since we check the arciecture/os at the beginning,
 	# but go sure...
 	*)
@@ -3582,10 +3496,16 @@ dnl ===================================================================
 dnl Check for prelinked libgcc_s.so.1
 dnl ===================================================================
 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
-    AC_MSG_WARN([prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override])
-    echo "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn
+  if test -n "$checkforstdlibproblems"; then
+    if test -f /etc/rpm/macros.prelink; then
+      with_system_stdlibs=yes
+      AC_MSG_WARN([prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override])
+      echo "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn
+    elif test "$GCC" = "yes" -a ! -e `$CC -print-file-name=libgcc_s.so.1`; then
+      with_system_stdlibs=yes
+      AC_MSG_WARN([platform doesn't have a libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override])
+      echo "platform doesn't have a libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn
+    fi
   fi
 fi
 
@@ -3844,25 +3764,14 @@ if test -n "$with_system_db" -o -n "$with_system_libs" && \
         ], []
     )
     AC_MSG_CHECKING([whether db is at least 4.1])
-    for v in `seq 1 7`; do
-       AC_TRY_RUN([
+    AC_TRY_RUN([
 #include <db.h>
 
 int main(int argc, char **argv) {
-       if(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == $v) return 0;
+       if(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)) return 0;
        else return 1;
 }
-       ], [DB_VERSION_MINOR=$v], [])
-    done
-    if test "$DB_VERSION_MINOR" -gt "1"; then
-       AC_MSG_RESULT([OK])
-       DB_VERSION=4.$DB_VERSION_MINOR
-    else
-       AC_MSG_ERROR([no. you need at least db 4.1])
-    fi
-    # does not work :/
-    #AC_CHECK_LIB(db, db_create, [],
-    #  [AC_MSG_ERROR([db library not installed or functional])], [])
+    ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db 4.1])])
     AC_HAVE_LIBRARY(db, [],
       [AC_MSG_ERROR([db not installed or functional])], [])
     SCPDEFS="$SCPDEFS -DSYSTEM_DB"
@@ -4373,7 +4282,9 @@ if test "$enable_nss_module" != "no"; then
    if test "$_os" = "WINNT"; then
       AC_MSG_CHECKING([for Mozilla build tooling])
       if test -z "$MOZILLABUILD" ; then
-AC_MSG_ERROR([Mozilla build tooling not found. Use --with-mozilla-build=<absolut path to mozilla build tooling (mozilla-build)>])
+AC_MSG_ERROR([Mozilla build tooling not found.
+Use the --with-mozilla-build option after installling the tools obtained
+from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32])
       else
          if test \( "$WITH_MINGWIN" = "yes" \) ; then
             if test ! -d "$MOZILLABUILD" ; then
@@ -4679,7 +4590,8 @@ if test "$_os" != "WINNT" -a "$_os" != "OS2" -a "$_os" != "Darwin"; then
          [#include <X11/Intrinsic.h>])
    else
        AC_MSG_RESULT([yes])
-       AC_CHECK_HEADERS(X11/Xaw/Label.h,[],[AC_MSG_ERROR([Xaw include headers not found])])
+       AC_CHECK_HEADERS(X11/Xaw/Label.h,[],[AC_MSG_ERROR([Xaw include headers not found])],
+         [#include <X11/Intrinsic.h>])
        AC_CHECK_LIB(Xaw, main, [],
            [AC_MSG_ERROR(Xaw library not found or functional)], [])
    fi
@@ -5328,15 +5240,8 @@ dnl ===================================================================
 dnl Zip must be a specific type for different build types.
 dnl ===================================================================
 if test "$_os" = "WINNT"; then
-    if test "$with_use_shell" = "4nt" ; then
-         if test -z "`$ZIP -h | grep -i WinNT`" ; then
-AC_MSG_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.])
-         fi
-    else
-         if test -n "`$ZIP -h | grep -i WinNT`" ; then
+    if test -n "`$ZIP -h | grep -i WinNT`" ; then
 AC_MSG_ERROR([$ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe.])
-         fi
     fi
 fi
 AC_SUBST(ZIP_HOME)
@@ -5415,8 +5320,8 @@ if test "$_os" = "WINNT"; then
    if test -x ./external/msi/instmsia.exe -a -x ./external/msi/instmsiw.exe; then
       AC_MSG_RESULT([found])
    else
-      MSIAPATH=`/bin/find "$COMPATH/../.." -iname instmsia.exe | head -n 1`
-      MSIWPATH=`/bin/find "$COMPATH/../.." -iname instmsiw.exe | head -n 1`
+      MSIAPATH=`/bin/find "$COMPATH/.." -iname instmsia.exe | head -n 1`
+      MSIWPATH=`/bin/find "$COMPATH/.." -iname instmsiw.exe | head -n 1`
       if test -n "$MSIAPATH" -a -n "$MSIWPATH"; then
          cp "$MSIAPATH" ./external/msi/ && chmod +x ./external/msi/instmsia.exe && MSIACOPY="OK"
          cp "$MSIWPATH" ./external/msi/ && chmod +x ./external/msi/instmsiw.exe && MSIWCOPY="OK"
@@ -5933,37 +5838,74 @@ AC_SUBST(LIBSERIALIZER_JAR)
 if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
   AC_MSG_CHECKING([which Apache commons-* libs to use])
   if test "$with_system_apache_commons" = "yes"; then
-       SYSTEM_APACHE_COMMONS=YES
-       AC_MSG_RESULT([external])
+    SYSTEM_APACHE_COMMONS=YES
+    AC_MSG_RESULT([external])
     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
-   AC_CHECK_FILE($COMMONS_CODEC_JAR, [],
-        [AC_MSG_ERROR(commons-codec.jar not found.)], [])
-        if test -z "$COMMONS_LANG_JAR"; then
-                COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar
-        fi
-   AC_CHECK_FILE($COMMONS_LANG_JAR, [],
-        [AC_MSG_ERROR(commons-lang.jar not found.)], [])
-        if test -z "$COMMONS_HTTPCLIENT_JAR"; then
-                COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar
-        fi
-   AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [],
-        [AC_MSG_ERROR(commons-httpclient.jar not found.)], [])
+      if test -z $COMMONS_CODEC_JAR; then
+        AC_CHECK_FILE(/usr/share/java/commons-codec-1.3.jar, 
+          [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar ],
+          [
+            AC_CHECK_FILE(/usr/share/java/commons-codec.jar, 
+              [ COMMONS_CODEC_JAR=/usr/share/java/commons-codecs.jar ],
+              [AC_MSG_ERROR(commons-codec.jar replacement not found.)]
+            )
+          ]
+        )
+      else
+        AC_CHECK_FILE($COMMONS_CODEC_JAR, [],
+             [AC_MSG_ERROR(commons-codec.jar not found.)], [])
+      fi
+
+      if test -z $COMMONS_LANG_JAR; then
+        AC_CHECK_FILE(/usr/share/java/commons-lang-2.3.jar, 
+          [ COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar ],
+          [
+            AC_CHECK_FILE(/usr/share/java/commons-lang.jar, 
+              [ COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar ],
+              [AC_MSG_ERROR(commons-lang.jar replacement not found.)]
+            )
+          ]
+        )
+      else
+        AC_CHECK_FILE($COMMONS_LANG_JAR, [],
+             [AC_MSG_ERROR(commons-lang.jar not found.)], [])
+      fi
+
+      if test -z $COMMONS_HTTPCLIENT_JAR; then
+        AC_CHECK_FILE(/usr/share/java/commons-httpclient-3.1.jar, 
+          [ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar ],
+          [
+            AC_CHECK_FILE(/usr/share/java/commons-httpclient.jar, 
+              [ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient.jar ],
+              [AC_MSG_ERROR(commons-httpclient.jar replacement not found.)]
+            )
+          ]
+        )
+      else
+        AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [],
+             [AC_MSG_ERROR(commons-httpclient.jar not found.)], [])
+      fi
     fi
     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_LOGGING_JAR, [],
-        [AC_MSG_ERROR(commons-logging.jar not found.)], [])
-
+      if test -z $COMMONS_LOGGING_JAR; then
+        AC_CHECK_FILE(/usr/share/java/commons-logging-1.1.1.jar, 
+          [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar ],
+          [
+            AC_CHECK_FILE(/usr/share/java/commons-logging.jar, 
+              [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar ],
+              [AC_MSG_ERROR(commons-logging.jar replacement not found.)]
+            )
+          ]
+        )
+      else
+        AC_CHECK_FILE($COMMONS_LOGGING_JAR, [],
+             [AC_MSG_ERROR(commons-logging.jar not found.)], [])
+      fi
     fi
   else
-        AC_MSG_RESULT([internal])
-        SYSTEM_APACHE_COMMONS=NO
-        BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
+    AC_MSG_RESULT([internal])
+    SYSTEM_APACHE_COMMONS=NO
+    BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
   fi
 fi
 AC_SUBST(SYSTEM_APACHE_COMMONS)
@@ -6255,47 +6197,6 @@ fi
 AC_SUBST(ENABLE_KAB)
 
 dnl ===================================================================
-dnl Test whether to include FontOOo
-dnl ===================================================================
-AC_MSG_CHECKING([whether to include FontOOo])
-if test -n "$enable_fontooo"; then
-  if test "$enable_fontooo" = "no"; then
-    AC_MSG_RESULT([no])
-    WITH_FONTOOO=NO
-    SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO"
-  else
-    AC_MSG_RESULT([yes])
-    WITH_FONTOOO=YES
-    BUILD_TYPE="$BUILD_TYPE MSFONTEXTRACT"
-  fi
-else
-  AC_MSG_RESULT([no])
-  WITH_FONTOOO=NO
-  SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO"
-fi
-AC_SUBST(WITH_FONTOOO)
-
-if test "$WITH_FONTOOO" = "YES"; then
-  dnl ===============================================================
-  dnl Check whether to use libmspack from system
-  dnl ===============================================================
-  AC_MSG_CHECKING([whether to use system libmspack])
-  if test -n "$with_system_mspack" -o -n "$with_system_libs" && \
-	  test "$with_system_mspack" != "no"; then
-    AC_MSG_RESULT([yes])
-    SYSTEM_MSPACK=YES
-    AC_CHECK_HEADER(mspack.h, [],
-      [AC_MSG_ERROR([mspack.h not found, install libmspack])], [])
-    AC_CHECK_LIB(mspack, mspack_create_cab_decompressor, [],
-      [AC_MSG_ERROR(libmspack not installed or functional)], [])
-  else
-    AC_MSG_RESULT([no])
-    SYSTEM_MSPACK=NO
-  fi
-fi
-AC_SUBST(SYSTEM_MSPACK)
-
-dnl ===================================================================
 dnl Test whether to include MathMLDTD
 dnl ===================================================================
 AC_MSG_CHECKING([whether to include MathMLDTD])
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/_Validat.idt
index c8daa765f115..4098f92c3578 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/_Validat.idt
@@ -347,6 +347,12 @@ RadioButton	Value	N					Formatted		The value string associated with this button.
 RadioButton	Width	N	0	32767					The width of the button.
 RadioButton	X	N	0	32767					The horizontal coordinate of the upper left corner of the bounding rectangle of the radio button.
 RadioButton	Y	N	0	32767					The vertical coordinate of the upper left corner of the bounding rectangle of the radio button.
+Reg64	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the registry value.
+Reg64	Key	N					RegPath		The key for the registry value.
+Reg64	Name	Y					Formatted		The registry value name.
+Reg64	Registry	N					Identifier		Primary key, non-localized token.
+Reg64	Root	N	-1	3					The predefined root key for the registry value, one of rrkEnum.
+Reg64	Value	Y					Formatted		The registry value.
 Registry	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the registry value.
 Registry	Key	N					RegPath		The key for the registry value.
 Registry	Name	Y					Formatted		The registry value name.
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf
index f4da77d0d8b9..20f2a60dd195 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf
@@ -1,3 +1,4 @@
 [OOO_LAUNCH_1]
 en-US = "The Installation Wizard cannot be run properly because you are logged in as a user without sufficient administrator rights for this system."
-
+[OOO_LAUNCH_2]
+en-US = "Please use the file setup.exe to start the installation."
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
index 35d78694a664..c53ccda8d736 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
@@ -2,3 +2,4 @@ Condition	Description
 s255	l255
 WINDOWSENCODINGTEMPLATE	LaunchCondition	Condition
 Privileged	OOO_LAUNCH_1
+SETUP_USED=1 Or Installed	OOO_LAUNCH_2
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
index c8daa765f115..4098f92c3578 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
@@ -347,6 +347,12 @@ RadioButton	Value	N					Formatted		The value string associated with this button.
 RadioButton	Width	N	0	32767					The width of the button.
 RadioButton	X	N	0	32767					The horizontal coordinate of the upper left corner of the bounding rectangle of the radio button.
 RadioButton	Y	N	0	32767					The vertical coordinate of the upper left corner of the bounding rectangle of the radio button.
+Reg64	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the registry value.
+Reg64	Key	N					RegPath		The key for the registry value.
+Reg64	Name	Y					Formatted		The registry value name.
+Reg64	Registry	N					Identifier		Primary key, non-localized token.
+Reg64	Root	N	-1	3					The predefined root key for the registry value, one of rrkEnum.
+Reg64	Value	Y					Formatted		The registry value.
 Registry	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the registry value.
 Registry	Key	N					RegPath		The key for the registry value.
 Registry	Name	Y					Formatted		The registry value name.
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt
index c8daa765f115..4098f92c3578 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt
@@ -347,6 +347,12 @@ RadioButton	Value	N					Formatted		The value string associated with this button.
 RadioButton	Width	N	0	32767					The width of the button.
 RadioButton	X	N	0	32767					The horizontal coordinate of the upper left corner of the bounding rectangle of the radio button.
 RadioButton	Y	N	0	32767					The vertical coordinate of the upper left corner of the bounding rectangle of the radio button.
+Reg64	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the registry value.
+Reg64	Key	N					RegPath		The key for the registry value.
+Reg64	Name	Y					Formatted		The registry value name.
+Reg64	Registry	N					Identifier		Primary key, non-localized token.
+Reg64	Root	N	-1	3					The predefined root key for the registry value, one of rrkEnum.
+Reg64	Value	Y					Formatted		The registry value.
 Registry	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the registry value.
 Registry	Key	N					RegPath		The key for the registry value.
 Registry	Name	Y					Formatted		The registry value name.
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_ure/windows/msi_templates/_Validat.idt
index c8daa765f115..4098f92c3578 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/_Validat.idt
@@ -347,6 +347,12 @@ RadioButton	Value	N					Formatted		The value string associated with this button.
 RadioButton	Width	N	0	32767					The width of the button.
 RadioButton	X	N	0	32767					The horizontal coordinate of the upper left corner of the bounding rectangle of the radio button.
 RadioButton	Y	N	0	32767					The vertical coordinate of the upper left corner of the bounding rectangle of the radio button.
+Reg64	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the registry value.
+Reg64	Key	N					RegPath		The key for the registry value.
+Reg64	Name	Y					Formatted		The registry value name.
+Reg64	Registry	N					Identifier		Primary key, non-localized token.
+Reg64	Root	N	-1	3					The predefined root key for the registry value, one of rrkEnum.
+Reg64	Value	Y					Formatted		The registry value.
 Registry	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the registry value.
 Registry	Key	N					RegPath		The key for the registry value.
 Registry	Name	Y					Formatted		The registry value name.
diff --git a/instsetoo_native/res/DS_Store b/instsetoo_native/res/DS_Store
index d730660fb13f..3b7c9f7794b9 100644
--- a/instsetoo_native/res/DS_Store
+++ b/instsetoo_native/res/DS_Store
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 76c70ed8a435..e6ba698fae7f 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,24 +4,24 @@ Globals
 	{
 		variables
 		{
-			OOOBASEVERSION 3.2
-			OOOPACKAGEVERSION 3.2.0
-			UREPACKAGEVERSION 1.6.0
+			OOOBASEVERSION 3.3
+			OOOPACKAGEVERSION 3.3.0
+			UREPACKAGEVERSION 1.7.0
 			URELAYERVERSION 1
 			BASISROOTNAME OpenOffice.org
 			UNIXBASISROOTNAME openoffice.org
-			SERVICETAG_PRODUCTNAME OpenOffice.org 3.2 
-			SERVICETAG_PRODUCTVERSION 3.2
-			SERVICETAG_PARENTNAME OpenOffice.org 3.2 
+			SERVICETAG_PRODUCTNAME OpenOffice.org 3.3 
+			SERVICETAG_PRODUCTVERSION 3.3
+			SERVICETAG_PARENTNAME OpenOffice.org 3.3 
 			SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
-			SERVICETAG_URN urn:uuid:cd39f1d0-f2fc-11dd-8c47-080020a9ed93
+			SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93
 			HIDELICENSEDIALOG 1
 			PACKAGEPREFIX 
 			BASISPACKAGEPREFIX ooobasis
 			UREPACKAGEPREFIX openoffice.org
 			SOLSUREPACKAGEPREFIX openofficeorg
 			USE_FILEVERSION 1
-			LIBRARYVERSION 9.2.0
+			LIBRARYVERSION 9.3.0
             POOLPRODUCT 1
             REGISTRATION_HOST https://registration2.services.openoffice.org/RegistrationWeb
 			REGISTRATIONURL http://survey.services.openoffice.org/user/index.php
@@ -35,7 +35,7 @@ Globals
             CREATE_MSP_INSTALLSET 0
             UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
  			PACKAGEMAP package_names.txt,package_names_ext.txt
-			WINDOWSPATCHLEVEL 4
+			WINDOWSPATCHLEVEL 6
 		}
 	}
 }
@@ -47,7 +47,7 @@ OpenOffice
 		variables
 		{
 			PRODUCTNAME OpenOffice.org
-			PRODUCTVERSION 3.2
+			PRODUCTVERSION 3.3
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
 			SHORT_PRODUCTEXTENSION 
@@ -55,10 +55,10 @@ OpenOffice
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.2.0
-			BASEPRODUCTVERSION 3.2
+			ABOUTBOXPRODUCTVERSION 3.3.0
+			BASEPRODUCTVERSION 3.3
             PCPFILENAME openoffice.pcp
-			UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update
+			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt
 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
@@ -67,7 +67,7 @@ OpenOffice
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.2.0
+			PACKAGEVERSION 3.3.0
 			PACKAGEREVISION {milestone}
 			LICENSENAME LGPL
 			SERVICESPROJEKT 1
@@ -83,7 +83,7 @@ OpenOffice
 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
 			CHANGETARGETDIR 1
 			USE_FILEVERSION 1
-			LIBRARYVERSION 9.2.0
+			LIBRARYVERSION 9.3.0
 			PATCHCODEFILE ooo_patchcodes.txt
 			DOWNLOADBANNER	ooobanner.bmp
 			DOWNLOADBITMAP	ooobitmap.bmp
@@ -111,7 +111,7 @@ OpenOffice_wJRE
 		variables
 		{
 			PRODUCTNAME OpenOffice.org
-			PRODUCTVERSION 3.2
+			PRODUCTVERSION 3.3
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
 			SHORT_PRODUCTEXTENSION 
@@ -119,9 +119,9 @@ OpenOffice_wJRE
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.2.0
-			BASEPRODUCTVERSION 3.2
-			UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update
+			ABOUTBOXPRODUCTVERSION 3.3.0
+			BASEPRODUCTVERSION 3.3
+			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
@@ -130,7 +130,7 @@ OpenOffice_wJRE
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.2.0
+			PACKAGEVERSION 3.3.0
 			PACKAGEREVISION {milestone}
 			LICENSENAME LGPL
 			SERVICESPROJEKT 1
@@ -146,7 +146,7 @@ OpenOffice_wJRE
 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
 			CHANGETARGETDIR 1
 			USE_FILEVERSION 1
-			LIBRARYVERSION 9.2.0
+			LIBRARYVERSION 9.3.0
 			PATCHCODEFILE ooo_patchcodes.txt
 			JAVAPRODUCT 1
 			DOWNLOADBANNER	ooobanner.bmp
@@ -174,7 +174,7 @@ OpenOffice_Dev
 		variables
 		{
 			PRODUCTNAME OOo-dev
-			PRODUCTVERSION 3.2
+			PRODUCTVERSION 3.3
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
 			SHORT_PRODUCTEXTENSION 
@@ -184,22 +184,22 @@ OpenOffice_Dev
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.2.0
-			BASEPRODUCTVERSION 3.2
+			ABOUTBOXPRODUCTVERSION 3.3.0
+			BASEPRODUCTVERSION 3.3
 			DEVELOPMENTPRODUCT 1
 			BASISPACKAGEPREFIX ooobasis-dev
 			UREPACKAGEPREFIX ooodev
 			SOLSUREPACKAGEPREFIX ooodev
 			REGISTRYLAYERNAME LayerDev
-			SERVICETAG_URN urn:uuid:156a7974-f2fd-11dd-8c47-080020a9ed93
-			UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update
+			SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
+			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
 			EVAL
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.2.0
+			PACKAGEVERSION 3.3.0
 			PACKAGEREVISION {milestone}
 			LICENSENAME LGPL
 			SERVICESPROJEKT 1
@@ -216,7 +216,7 @@ OpenOffice_Dev
 			CHANGETARGETDIR 1
 			USE_FILEVERSION 1
 			JAVAPRODUCT 1
-			LIBRARYVERSION 9.2.0
+			LIBRARYVERSION 9.3.0
 			PATCHCODEFILE ooodev_patchcodes.txt
 			CODEFILENAME codes_ooodev.txt
 			DOWNLOADBANNER	ooobanner.bmp
@@ -247,8 +247,8 @@ URE
         variables
         {
             PRODUCTNAME URE
-            PRODUCTVERSION 1.6
-            PACKAGEVERSION 1.6
+            PRODUCTVERSION 1.7
+            PACKAGEVERSION 1.7
             PACKAGEREVISION 1
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
@@ -288,14 +288,14 @@ OpenOffice_SDK
         variables
         {
             PRODUCTNAME OpenOffice.org
-            PRODUCTVERSION 3.2
+            PRODUCTVERSION 3.3
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
             BRANDPACKAGEVERSION 3
-            PACKAGEVERSION 3.2.0
+            PACKAGEVERSION 3.3.0
             PACKAGEREVISION {milestone}
             PACK_INSTALLED 1
             POOLPRODUCT 0
@@ -331,7 +331,7 @@ OpenOffice_Dev_SDK
         variables
         {
             PRODUCTNAME OOo-dev
-            PRODUCTVERSION 3.2
+            PRODUCTVERSION 3.3
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION
@@ -340,7 +340,7 @@ OpenOffice_Dev_SDK
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
             BRANDPACKAGEVERSION 3
-            PACKAGEVERSION 3.2.0
+            PACKAGEVERSION 3.3.0
             PACKAGEREVISION {milestone}
             BASISPACKAGEPREFIX ooobasis-dev
             UREPACKAGEPREFIX ooodev
@@ -379,7 +379,7 @@ BrOffice
 		variables
 		{
 			PRODUCTNAME BrOffice.org
-			PRODUCTVERSION 3.2
+			PRODUCTVERSION 3.3
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
 			SHORT_PRODUCTEXTENSION 
@@ -387,12 +387,12 @@ BrOffice
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.2.0
+			ABOUTBOXPRODUCTVERSION 3.3.0
 			PROGRESSBARCOLOR 
 			PROGRESSSIZE 
 			PROGRESSPOSITION 
 			PROGRESSFRAMECOLOR 
-			UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update
+			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt
 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
@@ -401,7 +401,7 @@ BrOffice
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.2.0
+			PACKAGEVERSION 3.3.0
 			PACKAGEREVISION {milestone}
 			LICENSENAME LGPL
 			SERVICESPROJEKT 1
@@ -417,7 +417,7 @@ BrOffice
 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
 			CHANGETARGETDIR 1
 			USE_FILEVERSION 1
-			LIBRARYVERSION 9.2.0
+			LIBRARYVERSION 9.3.0
 			CODEFILENAME codes_broo.txt
 			PATCHCODEFILE bro_patchcodes.txt
 			DOWNLOADBANNER	brobanner.bmp
@@ -446,7 +446,7 @@ BrOffice_wJRE
 		variables
 		{
 			PRODUCTNAME BrOffice.org
-			PRODUCTVERSION 3.2
+			PRODUCTVERSION 3.3
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
 			SHORT_PRODUCTEXTENSION 
@@ -454,12 +454,12 @@ BrOffice_wJRE
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.2.0
+			ABOUTBOXPRODUCTVERSION 3.3.0
 			PROGRESSBARCOLOR 
 			PROGRESSSIZE 
 			PROGRESSPOSITION 
 			PROGRESSFRAMECOLOR 
-			UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update
+			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
@@ -468,7 +468,7 @@ BrOffice_wJRE
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.2.0
+			PACKAGEVERSION 3.3.0
 			PACKAGEREVISION {milestone}
 			LICENSENAME LGPL
 			SERVICESPROJEKT 1
@@ -484,7 +484,7 @@ BrOffice_wJRE
 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
 			CHANGETARGETDIR 1
 			USE_FILEVERSION 1
-			LIBRARYVERSION 9.2.0
+			LIBRARYVERSION 9.3.0
 			CODEFILENAME codes_broo.txt
 			PATCHCODEFILE bro_patchcodes.txt
 			JAVAPRODUCT 1
@@ -513,7 +513,7 @@ BrOffice_Dev
 		variables
 		{
 			PRODUCTNAME BrOo-dev
-			PRODUCTVERSION 3.2
+			PRODUCTVERSION 3.3
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
 			SHORT_PRODUCTEXTENSION 
@@ -523,7 +523,7 @@ BrOffice_Dev
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.2.0
+			ABOUTBOXPRODUCTVERSION 3.3.0
 			DEVELOPMENTPRODUCT 1
 			PROGRESSBARCOLOR 
 			PROGRESSSIZE 
@@ -533,15 +533,15 @@ BrOffice_Dev
 			UREPACKAGEPREFIX ooodev
 			SOLSUREPACKAGEPREFIX ooodev
 			REGISTRYLAYERNAME LayerDevBroffice
-			SERVICETAG_URN urn:uuid:156a7974-f2fd-11dd-8c47-080020a9ed93
-			UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update
+			SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
+			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
 			EVAL
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.2.0
+			PACKAGEVERSION 3.3.0
 			PACKAGEREVISION {milestone}
 			LICENSENAME LGPL
 			SERVICESPROJEKT 1
@@ -558,7 +558,7 @@ BrOffice_Dev
 			CHANGETARGETDIR 1
 			USE_FILEVERSION 1
 			JAVAPRODUCT 1
-			LIBRARYVERSION 9.2.0
+			LIBRARYVERSION 9.3.0
 			PATCHCODEFILE brodev_patchcodes.txt
 			CODEFILENAME codes_broodev.txt
 			DOWNLOADBANNER	brobanner.bmp
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 7d9cdbd1d027..27ef93479d36 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -156,6 +156,18 @@
         PACKED_LIB_FILE_BODY_PATCH; \
     End
 
+#define SPECIAL_LIB_FILE(id,name) \
+    File id \
+        Name    = SPECIAL_NAME(name); \
+        PACKED_LIB_FILE_BODY; \
+    End
+
+#define SPECIAL_LIB_FILE_PATCH(id,name) \
+    File id \
+        Name    = SPECIAL_NAME(name); \
+        PACKED_LIB_FILE_BODY_PATCH; \
+    End
+ 
 #define STD_RES_FILE(id,name) \
     File id \
         TXT_FILE_BODY; \
diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst
index 342053a288cb..abf5f14740da 100644
--- a/scp2/prj/build.lst
+++ b/scp2/prj/build.lst
@@ -1,4 +1,4 @@
-cp    scp2    :    l10n setup_native transex3 PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
+cp    scp2    :    l10n i18npool setup_native transex3 PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
 cp    scp2                        usr1     -    all    cp_mkout NULL
 cp    scp2\macros                 nmake    -    all    cp_langmacros NULL
 cp    scp2\source\templates       nmake    -    all    cp_langtemplates NULL
diff --git a/scp2/source/activex/file_activex.scp b/scp2/source/activex/file_activex.scp
index 8cc1c45e17e7..5f257af2e1b8 100644
--- a/scp2/source/activex/file_activex.scp
+++ b/scp2/source/activex/file_activex.scp
@@ -37,6 +37,16 @@ File gid_File_Lib_Soactivex
     Name = "so_activex.dll";
 End
 
+#ifdef BUILD_X64
+	File gid_File_Lib_Soactivex64
+		TXT_FILE_BODY;
+		Styles = (PACKED);
+		Dir = SCP2_OOO_BIN_DIR;
+		Name = "so_activex_x64.dll";
+		ComponentCondition = "VersionNT64";
+	End
+#endif
+
 File gid_File_Lib_Regactivex_Msi
     TXT_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
diff --git a/scp2/source/activex/makefile.mk b/scp2/source/activex/makefile.mk
index 25a64f07cb64..86097032f455 100644
--- a/scp2/source/activex/makefile.mk
+++ b/scp2/source/activex/makefile.mk
@@ -41,6 +41,10 @@ TARGETTYPE=CUI
 
 .INCLUDE :	settings.mk
 
+.IF "$(BUILD_X64)"!=""
+SCPDEFS+=-DBUILD_X64
+.ENDIF
+
 SCP_PRODUCT_TYPE=osl
 
 .IF "$(GUI)"=="WNT"
diff --git a/scp2/source/activex/module_activex.scp b/scp2/source/activex/module_activex.scp
index 074e5f36f064..4d39208f5d14 100644
--- a/scp2/source/activex/module_activex.scp
+++ b/scp2/source/activex/module_activex.scp
@@ -37,5 +37,5 @@ Module gid_Module_Optional_Activexcontrol
     Default = NO;
     Minimal = NO;
     ParentID = gid_Module_Optional;
-    Files = (gid_File_Lib_Soactivex, gid_File_Lib_Regactivex_Msi, gid_File_Lib_Regpatchactivex_Msi);
+    Files = (gid_File_Lib_Soactivex, gid_File_Lib_Soactivex64, gid_File_Lib_Regactivex_Msi, gid_File_Lib_Regpatchactivex_Msi);
 End
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index fa6c1cfcd661..0f34c3ad358d 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -57,7 +57,7 @@ STD_RES_FILE( gid_File_Res_Abp, abp)
 STD_UNO_LIB_FILE( gid_File_Lib_Dbp, dbp)
 STD_RES_FILE( gid_File_Res_Dbp, dbp)
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbu, dbu )
+STD_UNO_LIB_FILE( gid_File_Lib_Dbu, dbu )
 STD_RES_FILE( gid_File_Res_Dbu, dbu)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Adabasui, adabasui )
@@ -67,7 +67,7 @@ STD_RES_FILE( gid_File_Res_Cnr, cnr)
 STD_RES_FILE( gid_File_Res_Sdbcl, sdbcl)
 STD_RES_FILE( gid_File_Res_Sdberr, sdberr)
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Rpt, rpt )
+STD_UNO_LIB_FILE( gid_File_Lib_Rpt, rpt )
 STD_RES_FILE( gid_File_Res_Rpt, rpt)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Rptui, rptui )
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index 89096b80f87c..3917d5f3e92f 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -51,9 +51,9 @@ STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Date, date)
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sc, sc)
+STD_UNO_LIB_FILE( gid_File_Lib_Sc, sc)
 
-STD_LIB_FILE_PATCH( gid_File_Lib_Scui, scui)
+STD_LIB_FILE( gid_File_Lib_Scui, scui)
 
 STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
 
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index 133dc6952c94..4a30287e6fce 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -84,8 +84,8 @@ RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Inprochand
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\InprocHandler32";
-    Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
-    Styles = (PATCH);
+    Value = "<progpath>\program\inprocserv.dll";
+    Styles = ();
 End
 
 RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Insertable
@@ -203,8 +203,8 @@ RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Inprochand
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\InprocHandler32";
-    Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
-    Styles = (PATCH);
+    Value = "<progpath>\program\inprocserv.dll";
+    Styles = ();
 End
 
 RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Insertable
diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp
index 839cf429793c..67e374e6d584 100644
--- a/scp2/source/canvas/canvascommons.scp
+++ b/scp2/source/canvas/canvascommons.scp
@@ -43,7 +43,7 @@ File gid_File_Oo_Office_Canvas_Xcu
     Name = "/registry/data/org/openoffice/Office/Canvas.xcu";
 End 
 
-STD_LIB_FILE_PATCH(gid_File_Lib_CppCanvas, cppcanvas)
+STD_LIB_FILE(gid_File_Lib_CppCanvas, cppcanvas)
 STD_LIB_FILE(gid_File_Lib_CanvasTools, canvastools)
 
 #ifdef ENABLE_AGG
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index f1f1a086c997..b06ca6430fe4 100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -84,8 +84,8 @@ RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Inprochand
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
     Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\InprocHandler32";
-    Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
-    Styles = (PATCH);
+    Value = "<progpath>\program\inprocserv.dll";
+    Styles = ();
 End
 
 RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Insertable
@@ -203,8 +203,8 @@ RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Inprochand
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
     Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\InprocHandler32";
-    Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
-    Styles = (PATCH);
+    Value = "<progpath>\program\inprocserv.dll";
+    Styles = ();
 End
 
 RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Insertable
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index 5ba0cecb95d5..cb23b879fc37 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -84,8 +84,8 @@ RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Inprochand
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
     Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\InprocHandler32";
-    Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
-    Styles = (PATCH);
+    Value = "<progpath>\program\inprocserv.dll";
+    Styles = ();
 End
 
 RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Insertable
@@ -203,8 +203,8 @@ RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Inprochand
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
     Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\InprocHandler32";
-    Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
-    Styles = (PATCH);
+    Value = "<progpath>\program\inprocserv.dll";
+    Styles = ();
 End
 
 RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Insertable
diff --git a/scp2/source/layout/layout.scp b/scp2/source/layout/layout.scp
index 64629d480a20..0bb9d19ec2ab 100644
--- a/scp2/source/layout/layout.scp
+++ b/scp2/source/layout/layout.scp
@@ -38,28 +38,28 @@ End
 File gid_File_Zip_Toolkit_Layout
    Dir = gid_Dir_Share_Layout;
    USER_FILE_BODY;
-   Styles = (ARCHIVE, PATCH);
+   Styles = (ARCHIVE);
    Name = "toolkit-layout.zip";
 End
 
 File gid_File_Zip_Sc_Layout
    Dir = gid_Dir_Share_Layout;
    USER_FILE_BODY;
-   Styles = (ARCHIVE, PATCH);
+   Styles = (ARCHIVE);
    Name = "sc-layout.zip";
 End
 
 File gid_File_Zip_Svx_Layout
    Dir = gid_Dir_Share_Layout;
    USER_FILE_BODY;
-   Styles = (ARCHIVE, PATCH);
+   Styles = (ARCHIVE);
    Name = "svx-layout.zip";
 End
 
 File gid_File_Zip_Sw_Layout
    Dir = gid_Dir_Share_Layout;
    USER_FILE_BODY;
-   Styles = (ARCHIVE, PATCH);
+   Styles = (ARCHIVE);
    Name = "sw-layout.zip";
 End
 
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index 43436a75f82d..5bd506f7432b 100644
--- a/scp2/source/math/file_math.scp
+++ b/scp2/source/math/file_math.scp
@@ -40,7 +40,7 @@ End
 
 #endif
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sm , sm)
+STD_UNO_LIB_FILE( gid_File_Lib_Sm , sm)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Smd , smd)
 
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
index 5a55f1bf4b83..cc50981da023 100644
--- a/scp2/source/math/registryitem_math.scp
+++ b/scp2/source/math/registryitem_math.scp
@@ -83,8 +83,8 @@ RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Inprochand
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
     Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\InprocHandler32";
-    Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
-    Styles = (PATCH);
+    Value = "<progpath>\program\inprocserv.dll";
+    Styles = ();
 End
 
 RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Insertable
@@ -202,8 +202,8 @@ RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Inprochand
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
     Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\InprocHandler32";
-    Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
-    Styles = (PATCH);
+    Value = "<progpath>\program\inprocserv.dll";
+    Styles = ();
 End
 
 RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Insertable
diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp
index b415ea2ad9e7..470b69eb9030 100644
--- a/scp2/source/onlineupdate/file_onlineupdate.scp
+++ b/scp2/source/onlineupdate/file_onlineupdate.scp
@@ -30,7 +30,7 @@
 
 #include "macros.inc"
 
-SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH( gid_File_Lib_Updchk , updchk.uno )
+SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Updchk , updchk.uno )
 
 File gid_File_Registry_Spool_Oo_Office_Addons_Onlineupdate_Xcu
     TXT_FILE_BODY;
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 8a3b0b4443f1..88c1e02a7591 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -101,12 +101,9 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Lib_Npsoplugin,
              gid_Brand_File_Lib_Subscrib_C05,
              gid_Brand_File_Oo_Office_Compatibility_Xcu,
-             gid_Brand_File_Registry_Spool_Oo_Inet_defaultsearchengine_Xcu_C01,
              gid_Brand_File_Registry_Spool_Oo_Setup_Brand_Xcu,
              gid_Brand_File_Registry_Spool_Oo_Office_Common_Brand_Xcu,
              gid_Brand_File_Registry_Spool_Oo_Office_Ui_Brand_Xcu,
-             gid_Brand_File_Registry_Spool_Oo_Office_Writer_directcursor_Xcu_C01,
-             gid_Brand_File_Registry_Spool_Oo_Office_Writer_defaultfontarial_Xcu_C01,
              gid_Brand_File_Script_Unopkg,
              gid_Brand_File_Share_Registry_Modules_Oo_Office_Jobs_Registration,
              gid_Brand_File_Share_Xdg_Base,
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 62b569e8f730..ce9fd987d038 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -892,11 +892,6 @@ Directory gid_Dir_Share_Registry_Modules_Oo_Setup
     HostName = "Setup";
 End
 
-Directory gid_Dir_Share_Registry_Modules_Oo_Inet
-    ParentID = gid_Dir_Share_Registry_Modules_Oo;
-    HostName = "Inet";
-End
-
 Directory gid_Dir_Share_Registry_Modules_Oo_Office_Accelerators
     ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
     HostName = "Accelerators";
diff --git a/scp2/source/ooo/file_improvement.scp b/scp2/source/ooo/file_improvement.scp
index 93110fe693eb..67ec89b15963 100644
--- a/scp2/source/ooo/file_improvement.scp
+++ b/scp2/source/ooo/file_improvement.scp
@@ -49,5 +49,5 @@ End
 #endif
 
 #if defined(BUILD_SPECIAL)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oooimprovement , oooimprovement)
+STD_UNO_LIB_FILE( gid_File_Lib_Oooimprovement , oooimprovement)
 #endif
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 16855101dfd2..f9c247bd6157 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -203,13 +203,13 @@ File gid_File_Lib_Comphelper2
     Name = STRING(CONCAT3(comphelp4,COMID,.dll));
   #endif
     Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
 End
 
 STD_UNO_LIB_FILE( gid_File_Lib_Ctl , ctl)
 
-STD_LIB_FILE_PATCH( gid_File_Lib_Cui, cui)
+STD_LIB_FILE( gid_File_Lib_Cui, cui)
 
 #ifndef SYSTEM_CURL
 
@@ -269,7 +269,7 @@ End
 #endif
 #endif
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dba, dba)
+STD_UNO_LIB_FILE( gid_File_Lib_Dba, dba)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Sdbt, sdbt)
 
@@ -277,7 +277,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Dbmm, dbmm)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Dbacfg, dbacfg)
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbase2, dbase )
+STD_UNO_LIB_FILE( gid_File_Lib_Dbase2, dbase )
 File gid_File_Oo_Office_Dataaccess_Dbase_Xcu
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -301,9 +301,9 @@ File gid_File_Lib_Dbpool
   #endif
 End
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbt, dbtools )
+STD_UNO_LIB_FILE( gid_File_Lib_Dbt, dbtools )
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbaxml, dbaxml )
+STD_UNO_LIB_FILE( gid_File_Lib_Dbaxml, dbaxml )
 
 File gid_File_Lib_Dict_Ja
     TXT_FILE_BODY;
@@ -362,7 +362,7 @@ End
 
 File gid_File_Lib_Dlgprov
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -399,7 +399,42 @@ File gid_File_Lib_Vbaobj
   #endif
 End
 
+File gid_File_Lib_Vbaswobj
+    TXT_FILE_BODY;
+    Styles = (PACKED,UNO_COMPONENT);
+    RegistryID = gid_Starregistry_Services_Rdb;
+    Dir = gid_Dir_Program;
+  #ifdef UNX
+    Name = STRING(CONCAT4(libvbaswobj,DLLPOSTFIX,.uno,UNXSUFFIX));
+  #else
+    Name = STRING(CONCAT4(vbaswobj,DLLPOSTFIX,.uno,.dll));
+  #endif
+End
+
+File gid_File_Lib_Vbamsforms
+    TXT_FILE_BODY;
+    Styles = (PACKED,UNO_COMPONENT);
+    RegistryID = gid_Starregistry_Services_Rdb;
+    Dir = gid_Dir_Program;
+  #ifdef UNX
+    Name = STRING(CONCAT4(libmsforms,DLLPOSTFIX,.uno,UNXSUFFIX));
+  #else
+    Name = STRING(CONCAT4(msforms,DLLPOSTFIX,.uno,.dll));
+  #endif
+End
+
 #endif // VBA_EXTENSION
+File gid_File_Lib_Vbahelper
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    RegistryID = gid_Starregistry_Services_Rdb;
+    Dir = SCP2_OOO_BIN_DIR;
+  #ifdef UNX
+    Name = STRING(CONCAT3(libvbahelper,DLLPOSTFIX,UNXSUFFIX));
+  #else
+    Name = STRING(CONCAT3(vbahelper,DLLPOSTFIX,.dll));
+  #endif
+End
 #endif // ENABLE_VBA
 
 
@@ -427,7 +462,7 @@ End
 
 #endif
 
-STD_LIB_FILE_PATCH(gid_File_Lib_Drawinglayer,drawinglayer)
+STD_LIB_FILE(gid_File_Lib_Drawinglayer,drawinglayer)
 
 SPECIAL_UNO_LIB_FILE(gid_File_Lib_Embobj,embobj)
 
@@ -437,11 +472,11 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj)
 
 #if defined(WNT) && !defined(DISABLE_ATL)
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Emser, emser )
+STD_UNO_LIB_FILE( gid_File_Lib_Emser, emser )
 
 File gid_File_Lib_Inprocserv
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "inprocserv.dll";
 End
@@ -528,7 +563,7 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Fileacc,fileacc)
 
 File gid_File_Lib_Filterconfig1
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
     Name = SPECIAL_NAME(filterconfig1);
@@ -558,7 +593,7 @@ End
 
 File gid_File_Lib_Fps
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH,UNO_COMPONENT);
+    Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
     Name = "fps.dll";
@@ -607,7 +642,7 @@ End
 #ifdef QUARTZ
 File gid_File_Lib_Fps_Aqua
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
     Name = SPECIAL_COMPONENT_LIB_NAME(fps_aqua.uno);
@@ -675,14 +710,14 @@ End
 
 #endif
 
-STD_LIB_FILE_PATCH( gid_File_Lib_Fwe , fwe)
+STD_LIB_FILE( gid_File_Lib_Fwe , fwe)
 
 STD_LIB_FILE( gid_File_Lib_Fwi , fwi)
 
 File gid_File_Lib_Fwk
     Name = LIBNAME(fwk);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -703,7 +738,7 @@ End
 File gid_File_Lib_Go
     Name = LIBNAME(go);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -714,7 +749,7 @@ STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker)
 
 File gid_File_Lib_I18npool
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -900,12 +935,12 @@ File gid_File_Lib_Rebasemsi
     TXT_FILE_BODY;
     Name = "rebase.dll";
     Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED,PATCH,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
+    Styles = (PACKED,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
 End
 
 #endif
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Lng, lng)
+STD_UNO_LIB_FILE( gid_File_Lib_Lng, lng)
 
 File gid_File_Lib_Localedata_En
     TXT_FILE_BODY;
@@ -983,7 +1018,7 @@ STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv)
 
 File gid_File_Lib_Mozbootstrap
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -1073,7 +1108,7 @@ File gid_File_Lib_Mingw_GccS
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
     Name = MINGW_GCCDLL;
-    Styles = (PACKED, PATCH);
+    Styles = (PACKED);
 End
 
 #endif
@@ -1084,7 +1119,7 @@ File gid_File_Lib_Mingw_Stdcpp
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
     Name = MINGW_GXXDLL;
-    Styles = (PACKED, PATCH);
+    Styles = (PACKED);
 End
 
 #endif
@@ -1193,7 +1228,7 @@ End
 STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc)
 
 #ifndef WITHOUT_MOZILLA
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Pl , pl)
+STD_UNO_LIB_FILE( gid_File_Lib_Pl , pl)
 #endif
 
 STD_UNO_LIB_FILE( gid_File_Lib_Preload, preload)
@@ -1204,13 +1239,13 @@ SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistr
 File gid_File_Lib_Desktop_Detector
     Name = LIBNAME(desktop_detector);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
 File gid_File_Lib_Vclplug_Gen
     Name = LIBNAME(vclplug_gen);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@@ -1220,7 +1255,7 @@ End
 File gid_File_Lib_Vclplug_Gtk
     Name = LIBNAME(vclplug_gtk);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@@ -1229,7 +1264,7 @@ End
 File gid_File_Lib_Vclplug_Kde
     Name = LIBNAME(vclplug_kde);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@@ -1265,7 +1300,7 @@ End
 #endif
 
 #if defined UNX && ! defined QUARTZ
-STD_LIB_FILE_PATCH( gid_File_Lib_Vclplug_Svp, vclplug_svp )
+STD_LIB_FILE( gid_File_Lib_Vclplug_Svp, vclplug_svp )
 STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
 #endif
 
@@ -1316,7 +1351,7 @@ End
 File gid_File_Lib_Res
     Name = LIBNAME(res);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -1347,9 +1382,9 @@ End
 
 STD_LIB_FILE( gid_File_Lib_Sax , sax)
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oox , oox)
+STD_UNO_LIB_FILE( gid_File_Lib_Oox , oox)
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sb , sb)
+STD_UNO_LIB_FILE( gid_File_Lib_Sb , sb)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Scn, scn)
 
@@ -1366,15 +1401,15 @@ File gid_File_Lib_Scriptframe
   #endif
     RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED,PATCH,UNO_COMPONENT);
+    Styles = (PACKED,UNO_COMPONENT);
 End
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sd , sd)
-STD_LIB_FILE_PATCH( gid_File_Lib_Sdui, sdui)
+STD_UNO_LIB_FILE( gid_File_Lib_Sd , sd)
+STD_LIB_FILE( gid_File_Lib_Sdui, sdui)
 
 File gid_File_Lib_Slideshow
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -1403,27 +1438,13 @@ STD_UNO_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler )
 File gid_File_Lib_Sfx
     Name = LIBNAME(sfx);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
 
 #ifdef WNT
 
-File gid_File_Lib_OOoFilt
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "ooofilt.dll";
-End
-
-File gid_File_Lib_OOoFiltProxy
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "ooofiltproxy.dll";
-End
-
 File gid_File_Lib_Instooofiltmsi
     TXT_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
@@ -1445,7 +1466,7 @@ End
 
 #endif
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sot, sot )
+STD_UNO_LIB_FILE( gid_File_Lib_Sot, sot )
 
 #if defined(UNX) && !defined(QUARTZ)
 
@@ -1460,7 +1481,7 @@ End
 
 File gid_File_Lib_Spell
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
     Name = LIBNAME(spell);
     Dir = SCP2_OOO_BIN_DIR;
@@ -1472,24 +1493,24 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
 
 STD_LIB_FILE( gid_File_Lib_Sts , sts)
 
-STD_LIB_FILE_PATCH( gid_File_Lib_Svl, svl )
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svtools, svt )
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Svtmisc, svtmisc.uno )
+STD_UNO_LIB_FILE( gid_File_Lib_Svl, svl )
+STD_UNO_LIB_FILE( gid_File_Lib_Svtools, svt )
 
-STD_LIB_FILE_PATCH( gid_File_Lib_Svx_Core, svxcore)
-STD_LIB_FILE_PATCH( gid_File_Lib_Svx_Msfilter, svxmsfilter)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svx, svx)
+STD_LIB_FILE( gid_File_Lib_Svx_Core, svxcore)
+STD_UNO_LIB_FILE( gid_File_Lib_Svx, svx)
 STD_UNO_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sw , sw)
-STD_LIB_FILE_PATCH( gid_File_Lib_Swui, swui)
+STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter)
 
-STD_LIB_FILE_PATCH( gid_File_Lib_Msword, msword )
+STD_UNO_LIB_FILE( gid_File_Lib_Sw , sw)
+STD_LIB_FILE( gid_File_Lib_Swui, swui)
+
+STD_LIB_FILE( gid_File_Lib_Msword, msword )
 
 #if ! defined UNX
 File gid_File_Lib_Sysdtrans
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH,UNO_COMPONENT);
+    Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
     Name = "sysdtrans.dll";
@@ -1560,10 +1581,13 @@ File gid_File_Lib_Ucpchelp1
 End
 
 #ifndef DISABLE_NEON
-SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpdav1,ucpdav1)
+SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
+ #ifndef SYSTEM_NEON
+   SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon)
+ #endif
 #endif
 
-SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpfile1,ucpfile1)
+SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1)
 
 SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpftp1,ucpftp1)
 
@@ -1577,7 +1601,7 @@ SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno)
 
 File gid_File_Lib_Lnth
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
     Name = LIBNAME(lnth);
     Dir = SCP2_OOO_BIN_DIR;
@@ -1585,22 +1609,22 @@ End
 
 File gid_File_Lib_Hyph
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
     Name = LIBNAME(hyphen);
     Dir = SCP2_OOO_BIN_DIR;
 End
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Utl , utl)
+STD_UNO_LIB_FILE( gid_File_Lib_Utl , utl)
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Uui, uui )
+STD_UNO_LIB_FILE( gid_File_Lib_Uui, uui )
 
 STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx )
 
 File gid_File_Lib_Vcl
     Name = LIBNAME(vcl);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -1625,7 +1649,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Xof , xof)
 File gid_File_Lib_Xo
     Name = LIBNAME(xo);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -1688,7 +1712,7 @@ File gid_File_Lib_XSec_Framework
         Name = "xsec_fw.dll";
     #endif
     Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
 End
 
@@ -1700,7 +1724,7 @@ File gid_File_Lib_XSec_XmlSec
         Name = "xsec_xmlsec.dll";
     #endif
     Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
 End
 
@@ -1768,9 +1792,9 @@ End
 
 STD_UNO_LIB_FILE( gid_File_Lib_Guesslang, guesslang )
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Updchkui , updchk )
+STD_UNO_LIB_FILE( gid_File_Lib_Updchkui , updchk )
 
-SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH( gid_File_Lib_Updatefeed , updatefeed.uno )
+SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed.uno )
 
 #ifdef WNT
 File gid_File_Lib_Onlinecheck
@@ -1818,7 +1842,7 @@ File gid_File_Lib_Unopkgapp
     Styles = (PACKED);
 End
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oooimprovecore , oooimprovecore)
+STD_UNO_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimprovecore)
 
 #if defined WNT && !defined _gcc3 && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA && \
     !(defined M1400 && defined PROF_EDITION && !defined _STLP_DEBUG)
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 7d1d8bb5cc40..5e571e0b2e03 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -163,7 +163,7 @@ End
 File gid_File_Profile_Gengal
     BIN_FILE_BODY;
     Dir = gid_Dir_Program;
-    Styles = (PACKED, PATCH);
+    Styles = (PACKED);
     Name = PROFILENAME(gengal);
 End
 
@@ -173,7 +173,7 @@ File gid_File_Bin_Pluginapp
     BIN_FILE_BODY;
     Dir = gid_Dir_Program;
     Name = "pluginapp.bin";
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
 End
 
 #endif
@@ -348,7 +348,7 @@ End
 
 STD_FILTER_FILE( gid_File_Filter_Eme, eme)
 
-STD_FILTER_FILE_PATCH( gid_File_Filter_Sdfilt, sdfilt)
+STD_FILTER_FILE( gid_File_Filter_Sdfilt, sdfilt)
 
 STD_FILTER_FILE( gid_File_Filter_Icg, icg)
 
@@ -503,17 +503,6 @@ End
 #endif
 
 #ifdef SOLAR_JAVA
-#ifndef GCJ
-File gid_File_Jar_Sandbox
-    TXT_FILE_BODY;
-    Name = JARFILENAME(sandbox);
-    Dir = gid_Dir_Classes;
-    Styles = (PACKED);
-End
-#endif
-#endif
-
-#ifdef SOLAR_JAVA
 UNO_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework )
 UNO_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell )
 UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava )
@@ -526,7 +515,7 @@ File gid_File_Jar_Unoil
     TXT_FILE_BODY;
     Name = "unoil.jar";
     Dir = gid_Dir_Classes;
-    Styles = (PACKED,DONT_OVERWRITE,PATCH);
+    Styles = (PACKED,DONT_OVERWRITE);
 End
 
 #endif
@@ -1667,7 +1656,7 @@ End
 
 File gid_File_Oo_Office_Ui_Genericcommands_Xcu
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
     Name = "/registry/data/org/openoffice/Office/UI/GenericCommands.xcu";
 End
@@ -1730,7 +1719,7 @@ End
 
 File gid_File_Oo_Office_Linguistic_Xcs
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
     Name = "/registry/schema/org/openoffice/Office/Linguistic.xcs";
 End
@@ -2126,7 +2115,7 @@ End
 File gid_File_Rdb_Offapi
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Name = "offapi.rdb";
 End
 
@@ -2724,7 +2713,7 @@ File gid_Starregistry_Services_Rdb
     TXT_FILE_BODY;
     Name = "services.rdb";
     Dir = gid_Dir_Program;
-    Styles = (PACKED, STARREGISTRY, PATCH);
+    Styles = (PACKED, STARREGISTRY);
 #if defined WNT
     NativeServicesURLPrefix = "vnd.sun.star.expand:$BRAND_BASE_DIR/program/";
 #else
@@ -2893,7 +2882,7 @@ File gid_File_Images_Zip
     TXT_FILE_BODY;
     Dir = gid_Dir_Share_Config;
     Name = "images.zip";
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
 End
 
 File gid_File_ImagesCrystal_Zip
@@ -2903,6 +2892,13 @@ File gid_File_ImagesCrystal_Zip
     Styles = (PACKED);
 End
 
+File gid_File_ImagesOxygen_Zip
+    TXT_FILE_BODY;
+    Dir = gid_Dir_Share_Config;
+    Name = "images_oxygen.zip";
+    Styles = (PACKED);
+End
+
 File gid_File_ImagesHicontrast_Zip
     TXT_FILE_BODY;
     Dir = gid_Dir_Share_Config;
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index 14b02d2dfa83..010a3ec5efd6 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -87,7 +87,7 @@ STD_RES_FILE( gid_File_Res_San, san )
 
 STD_RES_FILE( gid_File_Res_Sd, sd )
 
-STD_RES_FILE_PATCH( gid_File_Res_Sfx, sfx )
+STD_RES_FILE( gid_File_Res_Sfx, sfx )
 
 #if defined(UNX) && !defined(QUARTZ)
 
@@ -101,11 +101,13 @@ STD_RES_FILE( gid_File_Res_Sb, sb )
 STD_RES_FILE( gid_File_Res_Svs, svs )
 
 STD_RES_FILE( gid_File_Res_Svt, svt )
-STD_RES_FILE_ONLY_PATCH( gid_File_Res_Svp, svp )
+STD_RES_FILE_ONLY( gid_File_Res_Svp, svp )
 
 STD_RES_FILE( gid_File_Res_Svx, svx )
 STD_RES_FILE( gid_File_Res_TextConversionDlgs, textconversiondlgs )
 
+STD_RES_FILE( gid_File_Res_Cui, cui )
+
 STD_RES_FILE( gid_File_Res_Sw, sw )
 
 STD_RES_FILE( gid_File_Res_Tk, tk )
@@ -113,7 +115,7 @@ STD_RES_FILE( gid_File_Res_Acc, acc )
 
 STD_RES_FILE( gid_File_Res_Tpl, tpl )
 
-STD_RES_FILE_PATCH( gid_File_Res_Uui, uui )
+STD_RES_FILE( gid_File_Res_Uui, uui )
 
 STD_RES_FILE( gid_File_Res_Vcl, vcl )
 
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 0d85cc529b63..aa8c3178c9fd 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -53,6 +53,11 @@ SCPDEFS+=-DENABLE_CRASHDUMP
 SCPDEFS+=-DBUILD_SPECIAL
 .ENDIF
 
+.IF "$(BUILD_X64)"!=""
+SCPDEFS+=-DBUILD_X64
+.ENDIF
+
+
 SCPDEFS+=-DINCLUDE_JAVA_ACCESSBRIDGE
 
 .IF "$(PROF_EDITION)"!=""
@@ -212,6 +217,9 @@ SCPDEFS+=-DISOLANG_MAJOR=$(ISOLANG_MAJOR)
 .IF "$(DISABLE_NEON)" == "TRUE"
 SCPDEFS+=-DDISABLE_NEON
 .ENDIF
+.IF "$(SYSTEM_NEON)" == "YES"
+SCPDEFS+=-DSYSTEM_NEON
+.ENDIF
 
 # if yes or unset (neon not used) -> do not install openssl library!
 .IF $(SYSTEM_OPENSSL) != "YES"
@@ -293,7 +301,6 @@ PARFILES +=                        \
         folder_ooo.par             \
         folderitem_ooo.par         \
         registryitem_ooo.par       \
-        mergemodules_ooo.par       \
         vc_redist.par              \
         windowscustomaction_ooo.par
 .ENDIF
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 9607c88b6e0c..4b293e0a6126 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -360,6 +360,7 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Ucbhelper,
 	gid_File_Lib_Ucpchelp1,
 	gid_File_Lib_Ucpdav1,
+	gid_File_Lib_Neon,
 	gid_File_Lib_Ucpfile1,
 	gid_File_Lib_Ucpftp1,
 	gid_File_Lib_Ucphier1,
@@ -410,8 +411,6 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Reg4allmsdoc,
 	gid_File_Lib_Qslnkmsi,
 	gid_File_Lib_Sdqsmsi,
-	gid_File_Lib_OOoFilt,
-	gid_File_Lib_OOoFiltProxy,
 	gid_File_Lib_Instooofiltmsi,
 	gid_File_Lib_Smplmail,
 	gid_File_Lib_Gconfebe,
@@ -868,6 +867,7 @@ Module gid_Module_Root_Files_Images
 	Styles = (HIDDEN_ROOT);
 	Files = (gid_File_Images_Zip,
              gid_File_ImagesCrystal_Zip,
+             gid_File_ImagesOxygen_Zip,
              gid_File_ImagesHicontrast_Zip,
              gid_File_ImagesIndustrial_Zip,
              gid_File_ImagesTango_Zip,
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index d28fa5bb54dd..9f6329fabc77 100755
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -96,6 +96,7 @@ Module gid_Module_Langpack_Resource_Template
              gid_File_Res_Svt,
              gid_File_Res_Svp,
              gid_File_Res_Svx,
+             gid_File_Res_Cui,
              gid_File_Res_TextConversionDlgs,
              gid_File_Res_Sw,
              gid_File_Res_Tab,
diff --git a/scp2/source/ooo/profile_ooo.scp b/scp2/source/ooo/profile_ooo.scp
index 97211fe6a5ac..34c3a5ce8957 100644
--- a/scp2/source/ooo/profile_ooo.scp
+++ b/scp2/source/ooo/profile_ooo.scp
@@ -56,7 +56,7 @@ Profile gid_Profile_Version_Ini_Basis
     ModuleID = gid_Module_Root;
     Name = PROFILENAME(version);
     Dir = gid_Dir_Program;
-    Styles = (PATCH);
+    Styles = ();
 End
 
 Profile gid_Profile_Fundamentalbasis_Ini
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
index 4e34805e33ec..6544de17f993 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -37,6 +37,13 @@ RegistryItem gid_Regitem_Bau
     Value = "soffice.StarConfigFile.6";
 End
 
+RegistryItem gid_Regitem_AppID__df595024_3257_41b3_bcf1_a51515ad205e
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "AppID\{82154420-0FBF-11d4-8313-005004526AB4}";
+    ModuleID = gid_Module_Root;
+    Value = "%PRODUCTNAME Service Manager";
+End
+
 RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af_
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "CLSID\{82154420-0FBF-11d4-8313-005004526AB4}";
@@ -44,6 +51,14 @@ RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af_
     Value = "%PRODUCTNAME Service Manager (Ver 1.0)";
 End
 
+RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af_AppID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "CLSID\{82154420-0FBF-11d4-8313-005004526AB4}";
+    ModuleID = gid_Module_Root;
+    Name = "AppID";
+    Value = "{82154420-0FBF-11d4-8313-005004526AB4}";
+End
+
 RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af__Localserver32
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "CLSID\{82154420-0FBF-11d4-8313-005004526AB4}\LocalServer32";
@@ -251,7 +266,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
 	ModuleID = gid_Module_Root;
 	Name = "INSTALLLOCATION";
 	Value = "[INSTALLLOCATION]";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Install
@@ -260,7 +275,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
 	ModuleID = gid_Module_Root;
 	Name = "INSTALLLOCATION";
 	Value = "[INSTALLLOCATION]";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Install
@@ -269,7 +284,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Install
 	ModuleID = gid_Module_Root;
 	Name = "INSTALLLOCATION";
 	Value = "[INSTALLLOCATION]";
-	Styles = (ALWAYS_REQUIRED,PATCH);
+	Styles = (ALWAYS_REQUIRED);
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Officeinstall
@@ -278,7 +293,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
 	ModuleID = gid_Module_Root;
 	Name = "OFFICEINSTALLLOCATION";
 	Value = "[OFFICEINSTALLLOCATION]";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH,UPGRADEKEY);
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,UPGRADEKEY);
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Productversion
@@ -287,7 +302,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
 	ModuleID = gid_Module_Root;
 	Name = "ProductVersion";
 	Value = "[ProductVersion]";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Officeinstall
@@ -296,7 +311,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
 	ModuleID = gid_Module_Root;
 	Name = "OFFICEINSTALLLOCATION";
 	Value = "[OFFICEINSTALLLOCATION]";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Productversion
@@ -305,7 +320,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
 	ModuleID = gid_Module_Root;
 	Name = "ProductVersion";
 	Value = "[ProductVersion]";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
@@ -314,7 +329,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
 	ModuleID = gid_Module_Root;
 	Name = "OFFICEINSTALLLOCATION";
 	Value = "[OFFICEINSTALLLOCATION]";
-	Styles = (ALWAYS_REQUIRED,PATCH);
+	Styles = (ALWAYS_REQUIRED);
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Basisinstall
@@ -323,7 +338,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
 	Value = "[BASISINSTALLLOCATION]";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Basisinstall
@@ -332,7 +347,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
 	Value = "[BASISINSTALLLOCATION]";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
@@ -341,7 +356,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
 	Value = "[BASISINSTALLLOCATION]";
-	Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_OOOBASEVERSION,PATCH);
+	Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_OOOBASEVERSION);
 End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstall
@@ -350,7 +365,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstal
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
 	Value = "[BASISINSTALLLOCATION]";
-	Styles = (ALWAYS_REQUIRED,PATCH);
+	Styles = (ALWAYS_REQUIRED);
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Ureinstall
@@ -359,7 +374,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
 	Value = "[UREINSTALLLOCATION]";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Ureinstall
@@ -368,7 +383,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
 	Value = "[UREINSTALLLOCATION]";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
@@ -377,7 +392,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
 	Value = "[UREINSTALLLOCATION]";
-	Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_URELAYERVERSION,PATCH);
+	Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_URELAYERVERSION);
 End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
@@ -386,7 +401,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
 	Value = "[UREINSTALLLOCATION]";
-	Styles = (ALWAYS_REQUIRED,PATCH);
+	Styles = (ALWAYS_REQUIRED);
 End
 
 RegistryItem gid_Regitem_Sog
@@ -518,52 +533,6 @@ RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath_Branded
     Value  = "<progpath>\program";
 End
 
-// Begin registry items for the MS Indexing server filter component
-
-RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
-// Better?: "OpenOffice.org Format Filter"
-// old:    Value = "opendocument.org Filter";
-    Value = "OpenDocument Format Filter";
-	Styles = ();
-End
-
-RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
-    Value = "[BASISINSTALLLOCATION]program\ooofiltproxy.dll";
-End
-
-RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
-    Name = "ThreadingModel";
-    Value = "Apartment";
-End
-
-RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-//? Better: "OpenOffice.org Persistent Handler"
-// old:    Value = "opendocument.org Persistent Handler";
-    Value = "OpenDocument Format Persistent Handler";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsRegistered
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}\PersistentAddinsRegistered\{89BCB740-6119-101A-BCB7-00DD010655AF}";
-    Value = "{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
-End
-
-// End registry items for the MS Indexing server filter component
-
 // "OpenWith" Windows Registry keys for extensions supported by OOo
 
 // new oxt file extension for office extension packages
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 1c260e2d2508..41f2b73adbe8 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -134,7 +134,7 @@ File gid_File_Exe_Javaldx
     BIN_FILE_BODY;
     Dir = gid_Dir_Ure_Bin;
     Name = EXENAME(javaldx);
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID, PATCH);
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "291B5981-3E41-40E2-9C3F-115A7DF1C6A1";
 End
 #endif
@@ -269,7 +269,7 @@ File gid_File_Dl_Sal
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_UNO_VER("sal", "3");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID,PATCH);
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "B1EF3AB6-611E-4027-958A-736583EB82E6";
 End
 
@@ -336,7 +336,7 @@ File gid_File_Dl_Sunjavaplugin
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("sunjavaplugin");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID, PATCH);
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "0AC6C688-876C-40C5-B24E-9257003FDC3E";
 End
 #endif
@@ -839,7 +839,7 @@ File gid_File_Dl_Libxml2
 #else
     Name = SCP2_URE_DL_VER("xml2", "2");
 #endif
-    Styles = (PACKED, PATCH, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "BE6FAD97-F84C-43E3-8392-6FE2CDA04D8E";
 End
 #endif
@@ -1208,7 +1208,7 @@ Profile gid_Profile_Version_Ini_Ure
     ModuleID = gid_Module_Root_Ure_Hidden;
     Name = PROFILENAME(version);
     Dir = gid_Dir_Ure_Bin;
-    Styles = (PATCH);
+    Styles = ();
 End
 
 ProfileItem gid_Ure_Profileitem_Version_Buildid
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index 427f698bd467..b7e6e81dc331 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -30,15 +30,29 @@
 #include "macros.inc"
 
 #if defined(WITH_VC_REDIST)
-WindowsCustomAction gid_Customaction_InstallRuntime
-	Name = "InstallRuntime";
-	Typ = "98";
-	Source = "SystemFolder";
-	Target = "[SourceDir]redist\vcredist_x86.exe /qb";
-	Inbinarytable = 0;
-    Styles = (NO_FILE);
-	Assignment1 = ("InstallUISequence", "VersionNT >= 600 and VersionNT < 700 And OLDPRODUCTSSAMEMAJOR And Not REMOVE=\"ALL\" And Not PATCH", "ExecuteAction");
-End
+
+// WindowsCustomAction gid_Customaction_InstallRuntime
+//	Name = "InstallRuntime";
+//	Typ = "98";
+//	Source = "SystemFolder";
+//	Target = "[SourceDir]redist\vcredist_x86.exe /qb";
+//	Inbinarytable = 0;
+//    Styles = (NO_FILE);
+//	Assignment1 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH", "ExecuteAction");
+//	// Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "FileCost");
+// End
+
+// WindowsCustomAction gid_Customaction_InstallRuntime_X64
+//	Name = "InstallRuntimeX64";
+//	Typ = "98";
+//	Source = "SystemFolder";
+//	Target = "[SourceDir]redist\vcredist_x64.exe /qb";
+//	Inbinarytable = 0;
+//    Styles = (NO_FILE);
+//	Assignment1 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH And VersionNT64", "ExecuteAction");
+//	// Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH And VersionNT64", "FileCost");
+// End
+
 
 ScpAction scp_Copy_vcredist_x86
   #if defined(BUILD_SPECIAL)
@@ -49,4 +63,11 @@ ScpAction scp_Copy_vcredist_x86
     Name = "vcredist_x86.exe";
     Subdir = "redist";
 End
+
+ScpAction scp_Copy_vcredist_x64
+    Copy = "vcredist_x64.exe";
+    Name = "vcredist_x64.exe";
+    Subdir = "redist";
+End
+
 #endif
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index d5ececcbac73..ceb0b156cd7b 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -75,6 +75,24 @@ WindowsCustomAction gid_Customaction_Regactivexdll2
 	Assignment1 = ("InstallExecuteSequence", "\&FEATURETEMPLATE=2 And \!FEATURETEMPLATE=3 And Not PATCH", "RemoveExistingProducts");
 End
 
+WindowsCustomAction gid_Customaction_Reg64dll1
+	Name = "Reg64dll1";
+	Typ = "65";
+	Source = "reg64msi.dll";
+	Target = "InstallReg64";
+	Inbinarytable = 1;
+	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" and VersionNT64", "end");
+End
+
+WindowsCustomAction gid_Customaction_Reg64dll2
+	Name = "Reg64dll2";
+	Typ = "65";
+	Source = "reg64msi.dll";
+	Target = "DeinstallReg64";
+	Inbinarytable = 1;
+	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" and VersionNT64", "end");
+End
+
 WindowsCustomAction gid_Customaction_Jfregcadll1
 	Name = "Jfregcadll1";
 	Typ = "65";
@@ -376,7 +394,7 @@ WindowsCustomAction gid_Customaction_Patch_Isofficerunning
 	Target = "IsOfficeRunning";
 	Inbinarytable = 1;
 	Assignment1 = ("ControlEvent", "ReadyToInstall", "InstallNow", "DoAction", "IsOfficeRunning", "1", "1");
-	Assignment2 = ("InstallExecuteSequence", "", "RunningOffice");
+	Assignment2 = ("InstallExecuteSequence", "VersionNT < 600", "RunningOffice");
 End
 
 WindowsCustomAction gid_Customaction_Full_Isofficerunning
@@ -385,7 +403,7 @@ WindowsCustomAction gid_Customaction_Full_Isofficerunning
 	Source = "shlxtmsi.dll";
 	Target = "IsOfficeRunning";
 	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "", "RunningOffice");
+	Assignment1 = ("InstallExecuteSequence", "VersionNT < 600 Or Not PATCH", "RunningOffice");
 End
 
 WindowsCustomAction gid_Customaction_Langpack_Isofficerunning
@@ -394,7 +412,7 @@ WindowsCustomAction gid_Customaction_Langpack_Isofficerunning
 	Source = "lngpckinsthlp.dll";
 	Target = "IsOfficeRunning";
 	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "PATCH", "RunningOffice");
+	Assignment1 = ("InstallExecuteSequence", "PATCH And VersionNT < 600", "RunningOffice");
 End
 
 WindowsCustomAction gid_Customaction_CheckPatchList
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp
index e7b3584b32db..dd8b8912ae8c 100644
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -35,6 +35,40 @@ Directory gid_Dir_Shlxthdl
     DosName = "shlxthdl";
 End
 
+File gid_File_Lib_OOoFilt
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Shlxthdl;
+    Name = "ooofilt.dll";
+End
+
+File gid_File_Lib_OOoFiltProxy
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Shlxthdl;
+    Name = "ooofiltproxy.dll";
+End
+
+#ifdef BUILD_X64
+
+File gid_File_Lib_OOoFilt64
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Shlxthdl;
+    Name = "ooofilt_x64.dll";
+    ComponentCondition = "VersionNT64";
+End
+
+File gid_File_Lib_OOoFiltProxy64
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Shlxthdl;
+    Name = "ooofiltproxy_x64.dll";
+    ComponentCondition = "VersionNT64";
+End
+
+#endif
+
 File gid_File_Lib_Shlxthdl
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -42,6 +76,17 @@ File gid_File_Lib_Shlxthdl
     Name = "shlxthdl.dll";
 End
 
+#ifdef BUILD_X64
+	File gid_File_Lib_Shlxthdl64
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Shlxthdl;
+    Name = "shlxthdl_x64.dll";
+    ComponentCondition = "VersionNT64";
+End
+
+#endif
+
 #if defined M1310
 File gid_File_Lib_Shlxthdl_Msvcr71
     TXT_FILE_BODY;
@@ -80,3 +125,10 @@ File gid_File_Lib_Shlxtmsi
     Dir = SCP2_OOO_BIN_DIR;
     Name = "shlxtmsi.dll";
 End
+
+File gid_File_Lib_Reg64
+    TXT_FILE_BODY;
+    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = "reg64msi.dll";
+End
diff --git a/scp2/source/winexplorerext/makefile.mk b/scp2/source/winexplorerext/makefile.mk
index ce5ae0935ba6..6fc8ef03b382 100644
--- a/scp2/source/winexplorerext/makefile.mk
+++ b/scp2/source/winexplorerext/makefile.mk
@@ -41,6 +41,10 @@ TARGETTYPE=CUI
 
 .INCLUDE :	settings.mk
 
+.IF "$(BUILD_X64)"!=""
+SCPDEFS+=-DBUILD_X64
+.ENDIF
+
 SCP_PRODUCT_TYPE=osl
 
 .IF "$(GUI)"=="WNT"
diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp
index 203648b7371e..c1f0ac7f9010 100644
--- a/scp2/source/winexplorerext/module_winexplorerext.scp
+++ b/scp2/source/winexplorerext/module_winexplorerext.scp
@@ -38,8 +38,14 @@ Module gid_Module_Optional_Winexplorerext
     ParentID = gid_Module_Optional;
     Dirs = (gid_Dir_Shlxthdl);
     Files = (gid_File_Lib_Shlxthdl,
+			 gid_File_Lib_Shlxthdl64,
+			 gid_File_Lib_OOoFilt,
+			 gid_File_Lib_OOoFiltProxy,
+			 gid_File_Lib_OOoFilt64,
+			 gid_File_Lib_OOoFiltProxy64,
              gid_File_Lib_Shlxthdl_Msvcr71,
              gid_File_Lib_Shlxthdl_Stlport,
              gid_File_Lib_Shlxtmsi,
+             gid_File_Lib_Reg64,
              gid_File_Tmp_Userinstall_Winexplorerext_Inf);    
 End
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index 54974e9dac1c..87084695ada0 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -36,16 +36,20 @@
 RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
+    Styles = (X64);
     Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32";
     Value = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\"";
+    Val64 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll\"";
 End
 
 RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_ThreadingModel
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
+    Styles = (X64);
     Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32";
     Name = "ThreadingModel";
     Value = "Apartment";
+    Val64 = "Apartment";
 End
 
 // End registry items for the Infotip handler
@@ -55,16 +59,20 @@ End
 RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
+    Styles = (X64);
     Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32";
     Value = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\"";
+    Val64 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll\"";
 End
 
 RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_ThreadingModel
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
+    Styles = (X64);
     Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32";
     Name = "ThreadingModel";
     Value = "Apartment";
+    Val64 = "Apartment";
 End
 
 // End registry items for the Thumbnail viewer
@@ -74,42 +82,106 @@ End
 RegistryItem gid_Regitem_Folder_shellex_ColumnHandlers_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
+    Styles = (X64);
     Subkey = "Folder\shellex\ColumnHandlers\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}";
     Value = "OpenOffice.org Column Handler";
+    Val64 = "OpenOffice.org Column Handler";
 End
 
 RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
+    Styles = (X64);
     Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32";
     Value = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\"";
+    Val64 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll\"";
 End
     
 RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_ThreadingModel
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
+    Styles = (X64);
     Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32";
     Name = "ThreadingModel";
     Value = "Apartment";
+    Val64 = "Apartment";
 End
     
 // End registry items for the Column handler
 
+// Begin registry items for the MS Indexing server filter component
+
+RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Root;
+    Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
+// Better?: "OpenOffice.org Format Filter"
+// old:    Value = "opendocument.org Filter";
+	Styles = (X64_ONLY); // Values: X64
+    Value = "OpenDocument Format Filter";
+    Val64 = "OpenDocument Format Filter";
+End
+
+RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Root;
+    Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
+    Styles = (X64); // Values: X64 / X64_ONLY
+    Value = "[BASISINSTALLLOCATION]program\shlxthdl\ooofiltproxy.dll";
+    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\ooofiltproxy_x64.dll";
+End
+
+RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Root;
+    Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
+    Styles = (X64); // Values: X64
+    Name = "ThreadingModel";
+    Value = "Apartment";
+    Val64 = "Apartment";
+End
+
+RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Root;
+    Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+//? Better: "OpenOffice.org Persistent Handler"
+// old:    Value = "opendocument.org Persistent Handler";
+	Styles = (X64); // Values: X64
+    Value = "OpenDocument Format Persistent Handler";
+    Val64 = "OpenDocument Format Persistent Handler";
+End
+
+RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsRegistered
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Root;
+    Styles = (X64); // Values: X64
+    Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}\PersistentAddinsRegistered\{89BCB740-6119-101A-BCB7-00DD010655AF}";
+    Value = "{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
+    Val64 = "{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
+End
+
+// End registry items for the MS Indexing server filter component
+
 // Begin registry entries for the PropertySheet handler
 
 RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
+    Styles = (X64);
     Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32";
     Value = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\"";
+    Val64 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll\"";
 End
 
 RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_ThreadingModel
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;
+    Styles = (X64);
     Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32";
     Name = "ThreadingModel";
     Value = "Apartment";
+    Val64 = "Apartment";
 End
 
-// End registry entries for the PropertySheet handler
+// End registry entries for the PropertySheet handler
\ No newline at end of file
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 545225ca8950..819ba6128663 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -84,8 +84,8 @@ RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Inprochand
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\InprocHandler32";
-    Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
-    Styles = (PATCH);
+    Value = "<progpath>\program\inprocserv.dll";
+    Styles = ();
 End
 
 RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Insertable
@@ -203,8 +203,8 @@ RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Inprochand
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\InprocHandler32";
-    Value = "[BASISINSTALLLOCATION]program\inprocserv.dll";
-    Styles = (PATCH);
+    Value = "<progpath>\program\inprocserv.dll";
+    Styles = ();
 End
 
 RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Insertable
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index 9ba398eff7b9..bafca83860cb 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -129,7 +129,6 @@ SCP1FILES +=                           \
              folder_ooo.par            \
              folderitem_ooo.par        \
              windowscustomaction_ooo.par \
-             mergemodules_ooo.par      \
              vc_redist.par             \
              registryitem_writer.par   \
              folderitem_writer.par     \
@@ -283,7 +282,6 @@ SCP2FILES +=                           \
              folder_ooo.par            \
              folderitem_ooo.par        \
              windowscustomaction_ooo.par \
-             mergemodules_ooo.par      \
              vc_redist.par             \
              registryitem_writer.par   \
              folderitem_writer.par     \
diff --git a/set_soenv.in b/set_soenv.in
index 71f6d6bf90df..4d3e41383a38 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -38,8 +38,8 @@ use File::Basename;
 # IIa. Declaring variables for the system commands, etc.
 #--------------------------------------------------------
 #
-my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment,
-     $comment4nt, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps,
+my ( $outfile, $outfile_sh, $bootfile, $newline, $comment,
+     $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps,
      $wps, $cur_dir, $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $MINGW,
      $USE_MINGW, $platform,
      $cygwinver, $empty, $no_ant, $no_stl, $no_gcc_include, 
@@ -78,7 +78,7 @@ my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV
 
 # Environment variables.
 my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $SHELL,
-     $UPD, $WORK_STAMP, 
+     $UPD, $WORK_STAMP, $SOURCE_ROOT_DIR ,
      $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV, 
      $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI, 
      $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH,
@@ -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, $MOZILLABUILD,
 	 $PROEXT,
-     $SYSTEM_PYTHON, $PYTHONPATH, $SYSTEM_MOZILLA, $EPM_FLAGS);
+     $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS);
 #
 #-------------------------------------------
 # IId. Declaring the aliases.
@@ -197,7 +197,6 @@ $ENABLEUNICODE        = "TRUE";
 $NEW_JAR_PACK         = "TRUE";
 $NO_BSYMBOLIC         = "TRUE";
 $comment              = "#";           # UNIX script comment character
-$comment4nt           = "rem";         # Windows 4nt script comment character
 
 # Setting platform dependent constant values.
 if ( $platform =~ m/solaris/ ) 
@@ -496,6 +495,17 @@ elsif ( $platform =~ m/linux/ )
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."m68k".$ds."server";
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."m68k".$ds."native_threads";
    }
+   elsif ($platform =~ m/^hppa/)
+   {  print "Setting Linux hppa specific values... ";
+      $outfile        = "LinuxHPPAEnv.Set";
+      $CPU            = "H";
+      $CPUNAME        = "HPPA";
+      $OUTPATH        = "unxlnghppa";
+      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."hppa";
+      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."hppa".$ds."server";
+      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."hppa".$ds."native_threads";
+      $EPM_FLAGS      = "-a hppa";
+   }
    elsif ($platform =~ m/^alpha/) 
    {  print "Setting Linux Alpha specific values... ";
       $outfile        = "LinuxAlphaEnv.Set"; 
@@ -581,33 +591,6 @@ elsif ( $platform =~ m/osf1/ )
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."client";
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."native_threads";
 } 
-elsif ( $platform =~ m/irix/ )
-{     print "Setting Irix specific values... ";
-      $outfile        = "IrixMipsEnv.Set";
-      $BIG_SVX        = "TRUE";
-      if ($CC =~ "gcc" ) {
-            $COM          = "GCC";
-            $OUTPATH        = "unxirgm";
-            $CVER           = "C300";
-      }
-	  else {
-	  	$COM            = "C730";
-        $CVER           = "C730";
-        $OUTPATH        = "unxirxm3";
-      }
-      $COMPATH        = '@COMPATH@';
-      $CPU            = "M";
-      $CPUNAME        = "MIPS";
-      $GUI            = "UNX";
-      $GUIBASE        = "unx";
-      $GVER           = "VCL";
-      $INPATH         = $OUTPATH.$PROEXT;
-      $OS             = "IRIX";
-      $PATH_SEPERATOR = $ps;
-      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."mips";
-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."mips".$ds."client";
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."mips".$ds."native_threads";
-}
 elsif ( $platform =~ m/cygwin/ ) 
 {
       $COMPATH        = PathFormat('@COMPATH@');
@@ -636,7 +619,6 @@ elsif ( $platform =~ m/cygwin/ )
       $PATH_SEPERATOR = ';';
       $outfile        = "winmingw.set"; 
       $COM            = "GCC";
-      $COMPATH        =~ s/\/bin$//i;
       $CVER           = "C341";
       $OUTPATH        = "wntgcci";
       $INPATH         = $OUTPATH.$PROEXT;
@@ -645,8 +627,6 @@ elsif ( $platform =~ m/cygwin/ )
   else # The MSVC section starts here
   {   $outfile        = "winenv.set";
       $COM            = "MSC";
-      # COMPATH for MSC is differently used
-      $COMPATH        =~ s/\/bin$//i;
       $OUTPATH        = "wntmsci@COMEX@";
       $INPATH         = $OUTPATH.$PROEXT;
       $COMEX          = '@COMEX@';
@@ -676,17 +656,10 @@ elsif ( $platform =~ m/cygwin/ )
               $MFC_INCLUDE = $PSDK_HOME.$ds."include".$ds."mfc";
           }
       }
-      if ( "@USE_SHELL@" ne "4nt" ) {
 	  print "Setting W32 build with bash shell specific values... ";
 	  # No speacial treatment for CC an CXX anymore.
 	  $FLIPCMD        = "slfl.pl";
 	  $PATH_SEPERATOR = ';';
-      } else			# "@USE_SHELL@" ne "4nt"
-      {   print "Setting W32 build with 4NT shell specific values... ";
-	  # Change path to lower case.
-	  $COMPATH        = lc $COMPATH;
-	  $PATH_SEPERATOR = ';';
-      }
   }
 }
 elsif ( $platform =~ m/os2/ ) 
@@ -802,6 +775,7 @@ $SRC_ROOT =~ s/\/config_office//;
 $SRC_ROOT = PathFormat($SRC_ROOT);
 CheckPathExist( $SRC_ROOT );
 
+
 #-----------------------------------------------------------------------------------------------------
 # Copy top level makefile from config_office/ to $SRC_ROOT
 #-----------------------------------------------------------------------------------------------------
@@ -831,10 +805,6 @@ elsif ("@USE_SHELL@" eq "bash")
    $SHELL_PATH = '@SHELLPATH@';
    $SHELL = '@SHELLPATH@'."\/bash";
 }
-elsif ("@USE_SHELL@" eq "4nt")
-{  # @SHELLPATH@ is NO_SHELLPATH_NEEDED for 4nt - 
-   $SHELL_PATH = '';
-}
 else {
    die "Not a recognized shell: @USE_SHELL@ !";
 }
@@ -918,20 +888,6 @@ $COMMON_BUILD_TOOLS   = '$SRC_ROOT'.$ds."external".$ds."common";
 
 # Generate alternate output file for sh?
 $outfile_sh = $outfile.".sh";
-if ($GUI eq "OS2")
-{
-   # Generate output file for 4os2?
-   $outfile_bat = $outfile;
-   $outfile_bat =~ s/set$/cmd/i;
-}
-elsif ("@USE_SHELL@" eq "4nt")
-{
-    # Generate output file for 4nt?
-    $outfile_bat = $outfile;
-    $outfile_bat =~ s/set$/bat/i;
-} else {
-    undef $outfile_bat;
-}
 
 if ($STLPORT4 ne $no_stl) {
 	$ps_STLPORT_LIB		= $ps.'$STLPORT4'.$LIB64;
@@ -993,6 +949,10 @@ if ( $platform =~ m/darwin/ )
 $WORK_STAMP            = "@SOURCEVERSION@";
 # Location of the source.
 $SOLARSRC             = '$SRC_ROOT';
+# Location of the repository.
+my @splitlist = split( /\//, $SRC_ROOT );
+pop @splitlist;
+$SOURCE_ROOT_DIR      = join("/", @splitlist);
 #
 $DEVROOT              = '$SRC_ROOT';
 # Set solenv and solver to given or default values. 
@@ -1045,7 +1005,7 @@ if ($platform =~ m/solaris/)
                         $L.$USR_DT.$LIB.
                         $L.$USR_OPENWIN.$LIB;
 }
-elsif ($platform =~ m/linux|netbsd|osf1|irix|freebsd|aix/)
+elsif ($platform =~ m/linux|netbsd|osf1|freebsd|aix/)
 {
    $SOLAREXTRALIB     = $L.$par_dir.$LIB64;
 }
@@ -1111,7 +1071,7 @@ if ($platform =~ m/cygwin|os2/)
 }
      
 # The general environment path.
-if ($platform =~ m/linux|netbsd|odf1|irix|freebsd|aix|solaris/)
+if ($platform =~ m/linux|netbsd|odf1|freebsd|aix|solaris/)
 {  $PATH              = $cur_dir.
 #                        $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
                         $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
@@ -1220,7 +1180,7 @@ elsif ($platform =~ m/cygwin/)
    }
    # Check if $SHELL_PATH is already set in PATH
    $tmppath = CygFormat($SHELL_PATH);
-   if ( ( "@USE_SHELL@" ne "4nt" ) && ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) )
+   if ( ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) )
    {   $PATH          .= $ps.$tmppath;
    }
    # Check if $CYGWIN_PATH is already set in PATH
@@ -1331,9 +1291,7 @@ if ($platform =~ m/solaris/)
                         $L.$LIB.
                         $L.$USR_LIB;
    if ( $CC =~ "gcc" ) {
-      my $temp = $COMPATH;
-      $temp =~ s:/bin$::;
-      $SOLARLIB      .= $L.$temp.$LIB;
+      $SOLARLIB      .= $L.$COMPATH.$LIB;
    }
    $SOLARLIB         .= $L.$USR_LOCAL.$LIB.
                         $L.$USR_DT.$LIB.
@@ -1345,7 +1303,7 @@ if ($platform =~ m/solaris/)
                         $L_STLPORT_LIB.
                         $L.$XLIB;
 }
-elsif ($platform =~ m/linux|netbasd|osf1|irix|aix|freebsd/)
+elsif ($platform =~ m/linux|netbasd|osf1|aix|freebsd/)
 {  $SOLARLIB          = $L.$par_dir.$LIB.
                         $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
                         $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
@@ -1388,7 +1346,7 @@ $SOLARINC             = $I.$cur_dir.
                         $I.'$SOLARENV'.$INC.
                         $I.'$SRC_ROOT'.$ds."res";
 
-if ($platform =~ m/solaris|linux|osf1|freebsd|netbsd|irix/)
+if ($platform =~ m/solaris|linux|osf1|freebsd|netbsd/)
 {
 $SOLARINC	     .= $STLPORT_stlport;
 if ($platform =~ m/linux|freebsd|netbsd/)
@@ -1402,9 +1360,8 @@ $SOLARINC            .= '/SC5 ';
 }
 # Platform dependent include path at the top of this list of include paths
 if ($platform =~ m/solaris/)
-{   my $temp;
-    $temp =~ s:$COMPATH:/bin\$:;
-    $SOLARINC         .= $I.$temp.$ds."include";
+{   
+    $SOLARINC         .= $I.$COMPATH.$ds."include";
 }
 if ($platform =~ m/linux/)
 {
@@ -1434,9 +1391,6 @@ if ($platform =~ m/linux/)
    		elsif ($platform =~ m/netbsd/)
    		{  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
    		}
-   		elsif ($platform =~ m/irix/)
-   		{  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."irix";
-   		}
 
    		#java threads include path
 
@@ -1506,14 +1460,6 @@ else
 {  AddWarning( "set_soenv", "$platform not configured for system dependant include dir" );
 }
 
-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';
-    if ($GUIBASE eq "WIN") {
-        # PYTHONPATH need to use '\' directory seperators;
-        $PYTHONPATH = WinPath( $PYTHONPATH, ";" );
-    }
-}
-
 #
 print "done\n";
 
@@ -1522,7 +1468,6 @@ print "done\n";
 #
 print "Setting the aliases... ";
 # 1. alias for a full product make. 
-# ToFile will take care for the right 4nt format
 	$mkout           = '"perl $SOLARENV/bin/mkout.pl"';
 	$deliver         = '"perl $SOLARENV/bin/deliver.pl"';
 	$build           = '"perl $SOLARENV/bin/build.pl"';
@@ -1543,12 +1488,6 @@ open( OUT, ">$outfile" ) ||
 open( OUT_SH, ">$outfile_sh" ) ||
   die "Cannot open $outfile_sh: $!\n";
 
-if(defined($outfile_bat))
-{  # Create bat environment file
-   open( OUT_BAT, ">$outfile_bat" ) ||
-   die "Cannot open $outfile_bat: $!\n";
-}
-
 #
 #------------------------------------------
 # VII. Writing the data to the output file.
@@ -1557,7 +1496,6 @@ if(defined($outfile_bat))
 # Write file header.
 CreateFileHeader( *OUT, $UPD, $platform, "(t)csh", "#" );
 CreateFileHeader( *OUT_SH, $UPD, $platform, "sh/bash/ksh", "#" );
-CreateFileHeader( *OUT_BAT, $UPD, $platform, "4nt", "rem" ) if defined($outfile_bat);
 
 ToFile( "SRC_ROOT",	     $SRC_ROOT,          "e" );
 ToFile( "SHELL",             $SHELL,             "e" );
@@ -1845,11 +1783,9 @@ ToFile( "WITHOUT_PPDS",      "@WITHOUT_PPDS@",     "e" );
 ToFile( "WITH_BINFILTER",    "@WITH_BINFILTER@",   "e" );
 ToFile( "BUILD_TYPE",        "@BUILD_TYPE@",       "e" );
 ToFile( "VERBOSE",           "@VERBOSE@",          "e" );
-ToFile( "WITH_FONTOOO",      "@WITH_FONTOOO@",     "e" );
 ToFile( "ENABLE_EVOAB2",     "@ENABLE_EVOAB2@",    "e" );
 ToFile( "GOBJECT_CFLAGS",    "@GOBJECT_CFLAGS@",   "e" );
 ToFile( "GOBJECT_LIBS",      "@GOBJECT_LIBS@",     "e" );
-ToFile( "SYSTEM_MSPACK",     "@SYSTEM_MSPACK@",    "e" );
 if ( '@ENABLE_RPATH@' eq "no" ) {
   ToFile( "LINKFLAGSRUNPATH",'',                   "e" );
 }
@@ -1953,6 +1889,7 @@ if ($platform !~ m/cygwin|os2/) {
    }
 }
 ToFile( "SOLARSRC",           $SOLARSRC,           "e" );
+ToFile( "SOURCE_ROOT_DIR",    $SOURCE_ROOT_DIR,    "e" );
 if ( $platform =~ m/cygwin/ )
 {
    ToFile( "ILIB",              $ILIB,              "e" );
@@ -1986,12 +1923,8 @@ if ( $platform =~ m/os2/ )
 }
 
 # $perlpre is only used for the following three variables
-# and only set for 4nt.
+# and only set for OS2.
 my $perlpre = "";
-if (( $platform =~ m/cygwin/ ) and ( '@USE_SHELL@' eq "4nt" )) {
-   ToFile( "HOME",              "   ",          "e" );
-   $perlpre = "perl ".${SOLARENV}.${BIN}.${ds};
-}
 if (( $platform =~ m/os2/ )) {
    $perlpre = "perl ".${SOLARENV}.${BIN}.${ds};
 }
@@ -2000,9 +1933,6 @@ ToFile( "MKOUT",         $perlpre."mkout.pl",       "e" );
 ToFile( "ZIPDEP",        $perlpre."zipdep.pl",      "e" );
 
 ToFile( "USE_SHELL",             '@USE_SHELL@',     "e" );
-if ($SYSTEM_PYTHON eq "NO") {
-    ToFile( "PYTHONPATH",        $PYTHONPATH,        "e" );
-}
 
 #
 # Writing the aliases to file.
@@ -2026,23 +1956,8 @@ if ( $platform =~ m/os2/ )
 ToFile( "endif",             $empty, "y");
 ToFile( "fi",                $empty, "z");
 
-# write make command for dmake for W32-4nt
-if ( $platform =~ m/cygwin/ and '@USE_SHELL@' eq "4nt" )
-{
-  ToFile( "build the dmake executable.", $empty, "c");
-  ToFile( "if not exist \%SOLARENV\\\%OUTPATH\\bin\\dmake.exe (cd \%SRC_ROOT\\dmake \^ set INCLUDE=\%COMPATH\\include;\%PSDK_HOME\\include \^ set LIB=\%COMPATH\\lib;\%PSDK_HOME\\lib \^ call make.bat win95-vpp40 \^ cd \%SRC_ROOT)", $empty, "x");
-  ToFile( "if not exist \%SOLARENV\\\%OUTPATH\\bin\\dmake.exe ( mkdir /S \%SOLARENV\\\%OUTPATH\\bin \^ copy dmake\\dmake.exe \%SOLARENV\\\%OUTPATH\\bin\\dmake.exe )", $empty, "x");
-  ToFile( "\@echo Warning! LIB and INCLUDE will be cleared!", $empty, "x");
-  ToFile( "\@unset INCLUDE LIB", $empty, "x");
-  ToFile( "check for correct dmake.", $empty, "c");
-  ToFile( '@if "%@SEARCH[dmake]" == "" ( @echo dmake not build or missing! Invalid build environment! ^ unset SOLARENV ^ cancel )', $empty, "x");
-  ToFile( '@dmake -V > dmakecheck.out', $empty, "x");
-  ToFile( '@ffind /Tcygwin /C /B dmakecheck.out && ( @echo Found cygwin build dmake! Invalid! ^ unset SOLARENV ^ cancel )', $empty, "x");
-  ToFile( "  ", $empty, "x");
-}
-
-# Check if the right dmake version is used. (W32-tcsh only)
-if ( $platform =~ m/cygwin/ and '@USE_SHELL@' ne "4nt" ) {
+# Check if the right dmake version is used. (W32 only)
+if ( $platform =~ m/cygwin/ ) {
     ToFile( "Check if the right dmake version is used.", $empty, "c" );
     # Invalidate build environment.
     ToFile( "WORK_STAMP", "_invalid_", "e" );
@@ -2075,9 +1990,6 @@ print OUT $unsetvars;
 print OUT_SH "export $exportvars$newline";
 print OUT_SH "unset $unsetvarssh$newline";
 
-if(defined($outfile_bat))
-{  print OUT_BAT $unsetvarsbat;
-}
 
 #
 #---------------------------
@@ -2088,10 +2000,6 @@ close( OUT ) || print "Can't close $outfile: $!";
 
 close( OUT_SH ) || print "Can't close $outfile_sh: $!";
 
-if( defined($outfile_bat))
-{  close( OUT_BAT ) || print "Can't close $outfile_bat: $!";
-}
-
 #
 #------------------------------
 # IX. Sourcing the output file.
@@ -2115,14 +2023,6 @@ if (rename( $outfile_sh, $tmp ) ne 1)
 {  `mv -f $outfile_sh $tmp`;
 }
 
-if(defined($outfile_bat))
-{
-    $tmp = $SRC_ROOT.$ds.$outfile_bat;
-    if (rename( $outfile_bat, $tmp ) ne 1)
-    {  `mv -f $outfile_bat $tmp`;
-    }
-}
-
 #
 #--------------------------------------------------------
 # XII. Message at the end.
@@ -2178,9 +2078,7 @@ if (rename( $bootfile, $tmp ) ne 1)
 }
 
 print "Configure completed\n";
-if ( "@USE_SHELL@" ne "4nt" ) {
-	print "You may now run ./bootstrap in $SRC_ROOT\n";
-}
+print "You may now run ./bootstrap in $SRC_ROOT\n";
 if ( $Warning ne "" ) {
 	print "***** WARNINGS ISSUED *****\n";
 }
@@ -2201,7 +2099,7 @@ if ( $Warning ne "" ) {
 #-------------------------------------------------------------
 sub CheckPathName 
 {  my $retrn = $_[ 0 ];
-   if (($platform =~ m/cygwin/) or ( '@USE_SHELL@' ne "4nt" ))
+   if ($platform =~ m/cygwin/)
    {  # Check if the first character is not a '/'.
       if ( !( $_[ 0 ] =~ /^\// ) ) 
       {  $retrn = $ds.$_[ 0 ];
@@ -2277,21 +2175,6 @@ sub ToFile {
       if (defined $_[ 1 ] && $_[ 1 ] ne "" ) {
          my $envvar = $_[ 1 ];
          my $envvarbash = $envvar;
-         if ("@USE_SHELL@" eq "4nt" ) {
-             # expand the variables
-             $envvar =~ s/(\$\{?\w+\}?)/$1/eeg ;
-             # Some variables need to be translated
-             if ( ($_[ 0 ] =~ /^PATH$/) and ($platform !~ m/os2/) ) {
-                 # PATH is in cygwin format, but for 4nt it needs to be DOS.
-                 $win_format_var = WinPath( $envvar, ":" );
-             } else {
-                 $win_format_var = WinFormat( $envvar );
-             }
-             # The excluded variables are translated by cygwin
-             if ( $_[ 0 ] !~ /^PATH$|^TMP$|^TEMP$|^TMPDIR$|^HOME$/i ) {
-                 $envvar = $win_format_var;
-             }
-         }
 
          # Tcsh/bash needs backslashes quoted
          $envvar =~ s/\\/\\\\/g;
@@ -2302,17 +2185,10 @@ sub ToFile {
          print OUT_SH "$_[ 0 ]=\"$envvarbash\"$newline";   # to sh file
          $exportvars .= " $_[ 0 ]";                        # add to export list for sh file
 
-         if(defined($outfile_bat)) {
-             print OUT_BAT "IF DEFINED $_[ 0 ] $unset $_[ 0 ]$newline";
-             print OUT_BAT "$set $_[ 0 ]=$win_format_var$newline";
-         }
       } else {
          printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", "unset") ; # to stdout
          $unsetvars .= "$unsetenv $_[ 0 ] >& /dev/null$newline"; # for tcsh file
          $unsetvarssh .= " $_[ 0 ]";                             # for sh file
-         if(defined($outfile_bat)) {
-             $unsetvarsbat .= "$unset $_[ 0 ] >& NUL$newline";
-         }
       }
    }
    elsif ( $_[ 2 ] eq "a" ) 
@@ -2320,13 +2196,6 @@ sub ToFile {
       print "The $_[ 0 ] is set to: $_[ 1 ]\n";    # to stdout
       print OUT "$_[ 0 ] $_[ 1 ]$newline";         # to tcsh file
       print OUT_SH "$_[ 0 ]=$_[ 1 ]$newline";      # to sh file
-      if(defined($outfile_bat)) # create the correct 4nt alias format
-      {  my $aliastmp = $_[ 1 ];
-         $aliastmp =~ s/\$/\%/g;
-         $aliastmp =~ s!/!\\!g;
-         $aliastmp =~ s!"!!g;
-         print OUT_BAT "$_[ 0 ]=".'`'.$aliastmp.'`'.$newline;
-      }
    }
    elsif ( $_[ 2 ] eq "c" ) 
    {  # Write a comment to file.
@@ -2342,23 +2211,11 @@ sub ToFile {
       print OUT_SH "$comment$newline";
       print OUT_SH "$comment $_[ 0 ]$newline";
       print OUT_SH "$comment$newline";
-      if(defined($outfile_bat)) {
-          print OUT_BAT "$newline";
-          print OUT_BAT "$comment4nt$newline";
-          print OUT_BAT "$comment4nt $_[ 0 ]$newline";
-          print OUT_BAT "$comment4nt$newline";
-      }
    }
    elsif ( $_[ 2 ] eq "n" )
    {  #Write a newline to a file
       print OUT "$newline";
       print OUT_SH "$newline";
-      print OUT_BAT "$newline" if defined($outfile_bat);
-   }
-   elsif ( $_[ 2 ] eq "x" )
-   {
-      #Write first argument as is, and nothing else
-      print OUT_BAT "$_[ 0 ]$newline" if defined($outfile_bat);
    }
    elsif ( $_[ 2 ] eq "y" )
    {
diff --git a/soldep/bootstrp/XMLBuildListParser.pm b/soldep/bootstrp/XMLBuildListParser.pm
deleted file mode 100644
index 857723657568..000000000000
--- a/soldep/bootstrp/XMLBuildListParser.pm
+++ /dev/null
@@ -1,1966 +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: XMLBuildListParser.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.
-#
-#*************************************************************************
-
-
-#************************************************************
-# Data structure and XML parser/creator for the changeover  *
-# of the current build.lst to build.xlist files             *
-# programmer: Pascal Junck, Sun Microsystems GmbH           *
-#************************************************************
-
-# The current XMLBuildListParser is the second step for the changeover to XML.
-# It was written to create a complex structure with more possibilities to store informations
-# of the 'build.lst' files in the new XML files. The important informations were parsed by the
-# 'buildlst_parser.pl' from the old files and then are (temporary) stored by the set and add
-# methods in the module 'XMLBuildListParser' and 'XML::Parser'. By the API of this module it's
-# possible to create the new XML 'build.xlist' files.
-
-# If the '$Product' or the '$JobPlatform' (as also '$BuildReqPlatform') have no value,
-# their value are automatically 'all'.
-# It doesn't matter whether it's the set/add or the get method, that receives or sends
-# these optional parameters.
-# In the created XML file the default values aren't set, because of the constraints of the
-# 'Document Type Definition'(DTD).
-# If there is no product/platform attribute in the 'build.xlist' it means a default of 'all'!
-
-# The important parameters are:
-
-#     $ModuleName      =  it's the name of the current module
-
-#     $DependencyType  =  here are the three possible scalar dependency values
-#                         for all other depending modules(of the current module):
-#                         'md-simple', 'md-always' and 'md-force'
-
-#     $Products        =  which products can be used for the module dependencies
-#                         and might have more different whitespace separated values
-#                         e.g.'so oo' (scalar type)
-
-#     $Dir             =  it means a string(scalar) with the current working directory,
-#                         with a '/'(current directory) at the beginning of the string
-
-#     $JobType         =  it means a job e.g. 'make'
-
-#     $Platforms       =  in this scalar parameter might be more than one different value,
-#                         like: 'wnt unx mac' and 'all'('all' includes the three values)
-#                         it must be whitespace separated
-
-#     @DependingDirs   =  a list(array) of all inner depending directories
-#                         of the current working directory
-
-#     %BuildReq        =  means a hash with build requirement pairs:
-#                         'BuildReqName'(key) => 'BuildReqPlatform'(value)
-
-
-
-##############################  begin of main   ########################################
-
-use strict;
-
-use XML::Parser;
-
-package XMLBuildListParser;
-
-# global variable for printing out all results at parsing
-# if the debug variable is set to '1' it prints the results to STDOUT
-my $Debug = 0;
-
-
-#############################  begin of subroutines  ###################################
-
-sub new
-{
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-
-    my $self = {};
-
-    # no real instance data yet, might change if package is extended
-    bless($self, $class);
-    $$self{'error_string'} = '';
-    $self->beginXMLStructure();
-
-    return $self;
-}
-
-# VG: procedure for a better error handling
-sub getError
-{
-   my $self = shift;
-   return $$self{'error_string'};
-};
-
-########################################################################################
-#         sub: loadXMLFile
-#        gets: $File
-#    optional: -
-#     returns: -
-# description: get the 'path' of the 'build.xlist'(s), load it in the 'xml parser tree'
-#              and fill it in the own data_structure to make it available for the API
-########################################################################################
-sub loadXMLFile
-{
-   my $self = shift;
-   my $File = shift;
-
-   if (-f $File)
-   {
-      my $TreeParse = new XML::Parser(Style => 'Tree');
-
-      my $File_ref;
-
-      eval
-      {
-         $File_ref = $TreeParse->parsefile($File);
-      };
-
-      if ($@)
-      {
-         $@ =~ s/[\r\n]//g;
-         print"ERROR: $@" if ($Debug);
-         $$self{'error_string'} = 'ERROR: ' . $@ . ". Error occured while trying to parse $File";
-
-         return 0;
-      }
-      else
-      {
-         filterXMLFile($File_ref);
-
-         $$self{"ModuleData"} = $File_ref;
-
-         return 1;
-      }
-   }
-   else
-   {
-      $$self{'error_string'} = "ERROR: cannot find file $File";
-      return 0;
-   }
-}
-
-########################################################################################
-#         sub: filterXMLFile
-#        gets: $ArrayContent_ref
-#    optional: -
-#     returns: -
-# description: filters all '0' and whitespace based pairs of the XML file
-#              -> all spaces, tabs and new lines
-########################################################################################
-sub filterXMLFile
-{
-   my $ArrayContent_ref = shift;
-
-   # get the number of elements of the array_ref
-   my $Count = getContentCount($ArrayContent_ref);
-
-   for (my $i = 0; $i < $Count;)
-   {
-      # get each content pair
-      my $Content_ref = getContent($ArrayContent_ref, $i);
-
-      # in each content pair the first element is either
-      # a tag name or the value '0'
-      my $FirstContent = getTagName($Content_ref);
-
-      # we need the second part of the content pair to check
-      # which value is inside
-      my $SecondContent = getSecondContent($Content_ref);
-
-      my $tempArray_ref = "";
-      if (($FirstContent eq "task") or ($FirstContent eq "depend"))
-      {
-        my $dir = $Content_ref->[1]->[0]->{dir};
-        $dir =~ s/\/$//;
-        $Content_ref->[1]->[0]->{dir} = $dir;
-        $i++;
-        filterXMLFile($Content_ref);
-      }
-      elsif ($FirstContent eq "0")
-      {
-         # only if there is in the first part a '0' and in the
-         # second part are whitespaces...
-         if ($SecondContent =~ /\s+/)
-         {
-            # ...make a ref at this position
-            $tempArray_ref = @$ArrayContent_ref[1];
-
-            # and delete this element pair
-            removeContent($tempArray_ref, $i);
-
-            # now we have one element pair fewer
-            $Count--;
-         }
-         else
-         {
-            # is there a '0' but in the second part not a whitespace,
-            # increase 'i' by 1
-            $i++;
-         }
-      }
-      else
-      {
-         # if it's a tag name, increase 'i' by one and call recursive
-         # the 'filterXMLFile' with the 'content ref'
-         $i++;
-
-         # look further after the '0' and whitespace content
-         filterXMLFile($Content_ref);
-      }
-   }
-}
-
-########################################################################################
-#         sub: removeContent
-#        gets: $File_ref, $Count
-#    optional: -
-#     returns: -
-# description: removes the '0' and the whitespace based pairs of the XML structure
-#              whitespace could be: tabs, new lines and whitespace itself
-########################################################################################
-sub removeContent
-{
-   my $tempArray_ref = shift;
-   my $i = shift;
-
-   my $Start = (2*$i) + 1;
-
-   splice(@$tempArray_ref, $Start, 2);
-}
-
-########################################################################################
-#         sub: beginXMLStructure
-#        gets: $ModuleData_ref
-#    optional: -
-#     returns: -
-# description: create a new beginning of the XML file structure
-########################################################################################
-sub beginXMLStructure
-{
-   my $self = shift;
-
-   # global variable for the complete filled data structure
-   my $ModuleData_ref = createTag("build-list", {});
-
-   $$self{"ModuleData"} = $ModuleData_ref;
-}
-
-########################################################################################
-#         sub: insertContent
-#        gets: $HigherLevelTag_ref, $currentTag_ref, $Pos
-#    optional: -
-#     returns: -
-# description: insert a content at the right (alphabetical sorted) position
-########################################################################################
-sub insertContent
-{
-   my $HigherLevelTag_ref = shift;
-   my $currentTag_ref = shift;
-   my $Pos = shift;
-
-   my $Array_ref = $HigherLevelTag_ref->[1];
-
-   $Pos = ($Pos*2)+1;
-
-   splice(@$Array_ref, $Pos, 0, @$currentTag_ref);
-}
-
-########################################################################################
-#         sub: saveXMLFile
-#        gets: $Path
-#    optional: -
-#     returns: -
-# description: creates a XML file of the whole data structure
-########################################################################################
-sub saveXMLFile
-{
-   my $self = shift;
-   my $Path = shift;
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   # open the filehandle 'CREATE_XML' for creating the XML files
-   open (SAVE_XML, ">".$Path)
-   or die "Error. Open the file <build.xlist> wasn't successful!\n\n";
-
-   select SAVE_XML;
-
-   print"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-   print"<!DOCTYPE build-list SYSTEM \"build_xlist.dtd\">\n";
-   print"<!--\n"
-       ."***************************************************************************\n"
-       ."*                                                                          \n"
-       ."* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.            \n"
-       ."*                                                                          \n"
-       ."* Copyright 2008 by Sun Microsystems, Inc.                                 \n"
-       ."*                                                                          \n"
-       ."* OpenOffice.org - a multi-platform office productivity suite              \n"
-       ."*                                                                          \n"
-       ."* \$RCSfile: XMLBuildListParser.pm,v $                                     \n"
-       ."*                                                                          \n"
-       ."* \$Revision: 1.3 $                                                        \n"
-       ."*                                                                          \n"
-       ."* This file is part of OpenOffice.org.                                     \n"
-       ."*                                                                          \n"
-       ."* OpenOffice.org is free software: you can redistribute it and/or modify   \n"
-       ."* it under the terms of the GNU Lesser General Public License version 3    \n"
-       ."* only, as published by the Free Software Foundation.                      \n"
-       ."*                                                                          \n"
-       ."* OpenOffice.org is distributed in the hope that it will be useful,        \n"
-       ."* but WITHOUT ANY WARRANTY; without even the implied warranty of           \n"
-       ."* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            \n"
-       ."* GNU Lesser General Public License version 3 for more details             \n"
-       ."* (a copy is included in the LICENSE file that accompanied this code).     \n"
-       ."*                                                                          \n"
-       ."* You should have received a copy of the GNU Lesser General Public License \n"
-       ."* version 3 along with OpenOffice.org.  If not, see                        \n"
-       ."* <http://www.openoffice.org/license.html>                                 \n"
-       ."* for a copy of the LGPLv3 License.                                        \n"
-       ."*                                                                          \n"
-       ."***************************************************************************\n"
-       ."-->\n";
-
-   printTag($ModuleData_ref);
-
-   # flush the buffer
-   # it's the same like the both lines below here, but we make it manually without module 'IO'
-   # use IO::Handle;
-   # SAVE_XML -> autoflush(1);
-   $| = 1;
-
-   select STDOUT;
-
-   close (SAVE_XML);
-
-}
-
-########################################################################################
-#         sub: printTag
-#        gets: $Tag_ref
-#    optional: -
-#     returns: -
-# description: prints out each tag of the existing data structure (XML tree)
-########################################################################################
-sub printTag
-{
-   my $Tag_ref = shift;
-
-   # the first time we call this function the 'pos counter' has the default value of '0',
-   # because it is for the begin tag -> it shouldn't have a distance to the left side
-   my $PosCounter = shift || 0;
-
-   # makes it possible that each tag has a specified distance from the left sided margin
-   my $Distance = " " x $PosCounter;
-
-   # it's possible that the content is a text(case 1) between a begin and end tag
-   # or a tag name(case 2)
-   # case 1: (    0      , "Text between the begin and end tag" )
-   my $TagName = getTagName($Tag_ref);
-
-   if ($TagName eq "0")
-   {
-        print"$Tag_ref->[1]";
-   }
-   # case 2: ( "TagName" , (...) )
-   else
-   {
-      # open the tag
-      # only a new line if it is not the first tag
-      print"\n" if ($PosCounter != 0);
-      print $Distance."<".$TagName;
-
-      my $Attributes_ref  = getAttributesRef($Tag_ref);
-
-      # print all sorted attributes of this tag
-      foreach my $Attribute (sort keys %$Attributes_ref)
-      {
-         my $value = $$Attributes_ref{$Attribute};
-         print" $Attribute=\"$value\"";
-      }
-
-      # get the number of elements of the array
-      my $ContentCount = getContentCount($Tag_ref);
-
-      # close the tag
-      # if it is an empty tag create a '/' before we close it with '>'
-      print"/" if ($ContentCount == 0);
-      print">";
-
-      # get and print all tags recursive
-      for (my $i = 0; $i < $ContentCount; $i++)
-      {
-         # here we get the content of the current tag,
-         # we rise the 'pos counter' that each level of tags
-         # has a specified distance from the left side
-         printTag(getContent($Tag_ref, $i), $PosCounter + 2);
-      }
-
-      # check that the tag has a text between the begin and end tag
-      # first: had the tag further inner tags?
-      if ($ContentCount > 0)
-      {
-         my $Content_ref = getContent($Tag_ref, 0);
-         my $TagName = getTagName($Tag_ref);
-         my $TagContent = getTagName($Content_ref);
-
-         # if a tag has a begin tag and a following text, create the end tag behind the text
-         print"</$TagName>" if ($TagContent eq "0");
-
-         print"\n".$Distance."</$TagName>" if ($TagContent ne "0");
-      }
-   }
-}
-
-########################################################################################
-#         sub: getTagName
-#        gets: $Content_ref
-#    optional: -
-#     returns: $TagName
-# description: gets a reference of an array and returns the tag name at position '0'
-########################################################################################
-sub getTagName
-{
-   my $Content_ref = shift;
-
-   my $TagName = $$Content_ref[0];
-
-   return $TagName;
-}
-
-########################################################################################
-#         sub: getSecondContent
-#        gets: $Content_ref
-#    optional: -
-#     returns: $SecondContent
-# description: gets a reference of an array and returns the second value(index '1')
-########################################################################################
-sub getSecondContent
-{
-   my $Content_ref = shift;
-
-   my $SecondContent = $$Content_ref[1];
-
-   return $SecondContent;
-}
-
-########################################################################################
-#         sub: createSortKey
-#        gets: $DependencyType, $DepModuleName
-#    optional: -
-#     returns: $SortKey
-# description: creates a key with a number(depending of the dependency type)
-#              and a string and returns it
-########################################################################################
-sub createSortKey
-{
-   my $DependencyType = shift;
-   my $DepModuleName = shift;
-
-   my $DepTypeAsValue = 0;
-
-   if ($DependencyType eq "md-simple")
-   {
-      $DepTypeAsValue = 1;
-   }
-   elsif ($DependencyType eq "md-always")
-   {
-      $DepTypeAsValue = 2;
-   }
-   elsif ($DependencyType eq "md-force")
-   {
-      $DepTypeAsValue = 3;
-   }
-
-   my $SortKey = $DepTypeAsValue.$DepModuleName;
-
-   return $SortKey;
-}
-
-########################################################################################
-#         sub: searchTag
-#        gets: $TagName, $Tag_ref
-#    optional: -
-#     returns: $TagValues_ref
-# description: gets a reference and goes in the lower level tag,
-#              looks after the specified tag name and returns the reference
-#              of itself and the neighbour element
-########################################################################################
-sub searchTag
-{
-   my $TagName = shift;
-   my $Tag_ref = shift;
-
-   my $TagSerie_ref = $Tag_ref->[1];
-
-   # (all elements of the array) - 1 => highest index of the array
-   my $IndexEnd = scalar(@$TagSerie_ref)-1;
-
-   my $TagValues_ref = undef;
-
-   for (my $i = 1; $i <= $IndexEnd; $i += 2)
-   {
-      if ($TagSerie_ref->[$i] eq $TagName)
-      {
-         @$TagValues_ref = @$TagSerie_ref[$i..$i+1];
-
-         last;
-      }
-   }
-
-   return $TagValues_ref;
-}
-
-########################################################################################
-#         sub: createTag
-#        gets: $TagName, $Attribute_ref
-#    optional: -
-#     returns: $Tag_ref
-# description: creates an anonymous array with a tag name and the reference of its
-#              attributes; then returns the reference of this array
-########################################################################################
-sub createTag
-{
-   my $TagName = shift;
-   my $Attribute_ref = shift;
-
-   my $Tag_ref = [$TagName, [$Attribute_ref]];
-
-   return $Tag_ref;
-}
-
-########################################################################################
-#         sub: createText
-#        gets: $Text
-#    optional: -
-#     returns: $TagText_ref
-# description: creates an anonymous array(which contains a '0' and a string)
-#              for the data structure and returns a reference of it
-########################################################################################
-sub createText
-{
-   my $Text = shift;
-
-   my $TagText_ref = [0, $Text];
-
-   return $TagText_ref;
-}
-
-########################################################################################
-#         sub: addContent
-#        gets: $Tag_ref, $NextInfos_ref
-#    optional: -
-#     returns: -
-# description: creates and adds a tag with its following content
-########################################################################################
-sub addContent
-{
-   # '$NextInfos_ref' has two infos:
-   # either:  '0' and a string                          -> [Tag, [{}, 0     ,  string ]]
-   #     or:  'tag' and a ref of a anonymous array      -> [Tag, [{}, newTag, [.....] ]]
-   my $Tag_ref = shift;
-   my $NextInfos_ref = shift;
-
-   my $SecondPart_ref = $Tag_ref->[1];
-
-   # '$Tag_ref' gets now the right structure:
-   # e.g.  ['tag1', [{}, 0, "text of tag1" ...]...]
-   # or    ['tag1', [{}, 'tag2', [...]     ...]...]
-   push(@$SecondPart_ref, @$NextInfos_ref);
-}
-
-########################################################################################
-#         sub: getContent
-#        gets: $Tag_ref, $i
-#    optional: -
-#     returns: \@Content (ref of array 'content')
-# description: creates and returns a reference of an array with two elements,
-#              which are a part of the array of the current tag
-########################################################################################
-sub getContent
-{
-   my $Tag_ref = shift;
-   my $i = shift;
-
-   # e.g.
-   #          [ "tag 1",  [  {} ,  0 , "string", "tag 2", [{}..], "tag 3", [{}..], ..] ..]
-   # $Tag_ref [  [0]     [1]                                                           ..]
-   # $Content_ref         [ [0]   [1]    [2]       [3]    [4]      [5]     [6]     ..]
-
-   my $Content_ref = $$Tag_ref[1];
-
-   # '$start' contains: elements with the index 1, 3, 5 ...(and so on)
-   #  '$end'  contains: elements with the index 2, 4, 6 ...(and so on)
-   my $start = (2 * $i) + 1;
-   my $end = $start + 1;
-
-   my @Content = @$Content_ref[$start..$end];
-
-   return \@Content;
-}
-
-########################################################################################
-#         sub: getAttribute
-#        gets: $Tag_ref, $AttributeName
-#    optional: -
-#     returns: $Attribute
-# description: finds and returns an attribute as a string
-########################################################################################
-sub getAttribute
-{
-   my $Tag_ref = shift;
-   my $AttributeName = shift;
-
-   #          [ "tag1",  [   { attribute1 = "..",    attribute2 = ".." } , "tag2"...  ]  ]
-   # Tag_ref  [  [0]    [1]                                                           ]  ]
-   #                    [  [0]->'attribute1'    , [0]->'attribute2'      ,   [1] ...  ]  ]
-
-   # get the scalar of the value of the 'AttributeName' in the anonymous hash
-   my $Attribute = $Tag_ref->[1]->[0]->{$AttributeName};
-
-   return $Attribute;
-}
-
-########################################################################################
-#         sub: getAttributeRef
-#        gets: $Tag_ref
-#    optional: -
-#     returns: $Attribute_ref
-# description: finds and returns the reference of the hash which contains the attributes
-########################################################################################
-sub getAttributesRef
-{
-   my $Tag_ref = shift;
-
-   #         [ "tag1",  [   {  attribute1 = "..",    attribute2 = ".." } , "tag2"... ]  ]
-   # Tag_ref [  [0]   [1]                                                            ]  ]
-   #                   [   [0]                                           ,  [1]      ]  ]
-
-   # get the reference of the anonymous hash
-   my $Attribute_ref = $Tag_ref->[1]->[0];
-
-   return $Attribute_ref;
-}
-
-########################################################################################
-#         sub: getContentCount
-#        gets: $Tag_ref
-#    optional: -
-#     returns: $IndexValue
-# description: returns the sum of elements pairs of the array (less the anonymous hash)
-########################################################################################
-sub getContentCount
-{
-   my $Tag_ref = shift;
-
-   # get the content array (address of the inner array)
-   my $Content_ref = $$Tag_ref[1];
-
-   # get the number of the element pairs of the array (without the anonymous hash)
-   my $IndexValue = scalar(@$Content_ref);
-   $IndexValue = ($IndexValue-1)/2;
-
-   return $IndexValue;
-}
-
-########################################################################################
-#         sub: getIterationData
-#        gets: $TagName
-#    optional: -
-#     returns: $IndexValue, $TagDepend_ref
-# description: gets a tag name and returns the sum of elements pairs of the array
-#             (less the anonymous hash) and the reference of the anonymous array
-########################################################################################
-sub getIterationData
-{
-   my $self = shift;
-   my $TagName = shift;
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   my $TagDepend_ref = searchTag($TagName, $ModuleData_ref);
-   my $IndexValue = getContentCount($TagDepend_ref);
-
-   return ($IndexValue, $TagDepend_ref);
-}
-
-########################################################################################
-#         sub: printErrorMessage
-#        gets: $BuildReqPlatforms or $Platforms or $Products
-#    optional: -
-#     returns: -
-# description: it's an error, if a platform or a product content (e.g.'so oo')
-#              has at least one valid value and also the value 'all',
-#              because 'all' includes all other possible values
-########################################################################################
-sub printErrorMessage
-{
-   my $self = shift;
-   my $Content = shift;
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   my $Module_ref = searchTag("module-name", $ModuleData_ref);
-   my $ModuleContent_ref = getContent($Module_ref, 0);
-   my $Module = @$ModuleContent_ref[1];
-
-   print"Error in module <$Module> in Content <$Content>!\n";
-   print"The value 'all' includes all currently existing valid values.\n\n";
-}
-
-########################################################################################
-#         sub: adjustRedundancy
-#        gets: $Task_ref, $JobPlatform, $BuildReq_ref
-#    optional: -
-#     returns: -
-# description: the tag <task> (it means 'job') should be created with no redundant infos,
-#              like: <task dir="/uno" platform="unx"> ...
-#                    <task dir="/uno" platform="wnt"> ...
-#                       <build-requirement name="test10" platform="wnt">
-#
-#              it should be: <task dir="/uno" platform="unx wnt">
-#                               <build-requirement name="test10" platform="wnt">
-########################################################################################
-sub adjustRedundancy
-{
-   my $Task_ref = shift;
-   my $JobPlatform = shift;
-   my $BuildReq_ref = shift;
-
-   my %sortedJobPlatforms = ();
-   my @JobPlatforms = ();
-   my $PlatformContent = "";
-
-   # get the 'task platforms' in one content
-   my $Attributes_ref = getAttributesRef($Task_ref);
-
-   # get the existing 'task platform'
-   my $existingPlatform = getAttribute($Task_ref, "platform");
-   $existingPlatform = "all" if (!($existingPlatform));
-
-   if ( ($existingPlatform ne "all") && ($JobPlatform ne "all") )
-   {
-      # get the sorted platform content
-      $sortedJobPlatforms{$JobPlatform} = "";
-      $sortedJobPlatforms{$existingPlatform} = "";
-
-      @JobPlatforms = sort keys %sortedJobPlatforms;
-
-      $PlatformContent = join " ", @JobPlatforms;
-
-      $$Attributes_ref{"platform"} = $PlatformContent;
-   }
-   elsif ( ($existingPlatform ne "all") && ($JobPlatform eq "all") )
-   {
-      delete $$Attributes_ref{"platform"};
-   }
-
-   if ($BuildReq_ref)
-   {
-      my $JobType_ref = getContent($Task_ref, 0);
-
-      # if it exists add the 'build requirements' at the
-      # previous(with the same directory as the current) <task> tag
-      addBuildReq($JobType_ref, $BuildReq_ref);
-   }
-}
-
-########################################################################################
-#         sub: addBuildReq
-#        gets: $JobTypeInfos_ref, $BuildReq_ref
-#    optional: -
-#     returns: -
-# description: add the 'build requirements' to the existing data structure
-#              case 1: if the 'job directory' is not redundant
-#              case 2: if it is redundant create it to the first existing 'job'
-########################################################################################
-sub addBuildReq
-{
-   my $JobTypeInfos_ref = shift;
-   my $BuildReq_ref = shift;
-
-   my @sortedBuildReqPlatforms = ();
-
-   foreach my $BuildReqName (sort keys %$BuildReq_ref)
-   {
-      my $BuildReqPlatforms = $$BuildReq_ref{$BuildReqName};
-
-      $BuildReqPlatforms = "all" if (!($BuildReqPlatforms));
-
-      my $Attributes_ref = {"name" => "$BuildReqName"};
-
-      # it's wrong, if in a platform content(e.g. "unx wnt") are at least
-      # one or more platform(s) and within a 'all' term,
-      # because 'all' is default and means it includes all other possible values!
-      if ( ($BuildReqPlatforms ne "all") && ($BuildReqPlatforms =~ /\ball\b/) )
-      {
-         printErrorMessage($BuildReqPlatforms);
-      }
-      elsif (!($BuildReqPlatforms =~ /\ball\b/))
-      {
-         @sortedBuildReqPlatforms = sort(split(/\s+/, $BuildReqPlatforms));
-         $BuildReqPlatforms = join " ", @sortedBuildReqPlatforms;
-
-         $$Attributes_ref{"platform"} = "$BuildReqPlatforms";
-      }
-
-      # create the tag <build-requirement>
-      my $BuildReqInfos_ref = createTag("build-requirement", $Attributes_ref);
-
-      # append the <build-requirement> tag to the <'$JobType'> tag
-      addContent($JobTypeInfos_ref, $BuildReqInfos_ref);
-   }
-}
-
-########################################################################################
-#         sub: checkJobRedundancy
-#        gets: $Task_ref, $JobType, $DependingDirs_ref, $JobPlatform, $BuildReq_ref
-#    optional: -
-#     returns: $LineIsRedundant
-# description: checks whether the values of the 'job' line are redundant, like:
-#              'job dir', 'job'(e.g.: make) and 'depending dirs'
-########################################################################################
-sub checkJobRedundancy
-{
-   my $Task_ref = shift;
-   my $JobType = shift;
-   my $DependingDirs_ref = shift;
-   my $JobPlatform = shift;
-   my $BuildReq_ref = shift;
-
-   my $LineIsRedundant = 0;
-
-
-   # get the ref of the existing 'depending directories'
-   # if they also equal with the current 'depending directories',
-   # make one tag instead of two, which differences only in the platform
-   # (and the 'build requirement', if it exists)
-   my $JobType_ref = getContent($Task_ref, 0);
-   my $JobName = getTagName($JobType_ref);
-
-   # get the existing 'task platform'
-   my $existingPlatform = getAttribute($Task_ref, "platform");
-
-   # are the jobs equal?
-   if ($JobType eq $JobName)
-   {
-      my @existingDepDirs = ();
-
-      my $IndexEnd = getContentCount($JobType_ref);
-
-      # get all existing 'depending dirs' of this redundant 'job'
-      for (my $j = 0; $j < $IndexEnd; $j++)
-      {
-         my $Content_ref = getContent($JobType_ref, $j);
-
-         my $TagName = getTagName($Content_ref);
-
-         # create an array of the 'depending directories'
-         if ($TagName eq "depend")
-         {
-            my $DepDir = getAttribute($Content_ref, "depend");
-
-            push(@existingDepDirs, $DepDir);
-         }
-      }
-
-      # if now the current 'depending dirs' equal with the existing,
-      # we know that is redundant and have to create only one instead
-      # of two tags, e.g.
-      #            before: <task dir="/uno" platform="unx">...
-      #                    <task dir="/uno" platform="wnt"> ...
-      #                       <build-requirement name="test10" platform="wnt">
-      #
-      #      it should be: <task dir="/uno" platform="unx wnt">
-      #                       <build-requirement name="test10" platform="wnt">
-      if (@$DependingDirs_ref eq @existingDepDirs)
-      {
-         $LineIsRedundant = 1;
-
-         # check redundant directories and create no redundant 'task dirs'
-         adjustRedundancy($Task_ref, $JobPlatform, $BuildReq_ref);
-      }
-   }
-
-   return $LineIsRedundant;
-}
-
-########################################################################################
-#         sub: existsTag
-#        gets: $TagName
-#    optional: -
-#     returns: $TagExists_ref
-# description: checks whether that a tag exists and returns the ref of the content
-########################################################################################
-sub existsTag
-{
-   my $self = shift;
-   my $TagName = shift;
-
-   my $TagExists_ref = undef;
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   # check whether that the <module-depend> tag exists
-   $TagExists_ref = searchTag($TagName, $ModuleData_ref);
-
-   return $TagExists_ref;
-}
-
-########################################################################################
-#                           API - (internal) 'set/add' methods                         #
-########################################################################################
-
-########################################################################################
-#         sub: setModuleName
-#        gets: $ModuleName
-#    optional: -
-#     returns: -
-# description: gets the name of the current module and set it at the right position
-#              in the data structure
-########################################################################################
-sub setModuleName
-{
-   my $self = shift;
-   my $ModuleName = shift;
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   my $Tag_ref = createTag("module-name", {});
-   my $TagText_ref = createText($ModuleName);
-
-   addContent($Tag_ref, $TagText_ref);
-
-   addContent($ModuleData_ref, $Tag_ref);
-}
-
-########################################################################################
-#         sub: addModuleDependencies
-#        gets: $ModuleName, $DependencyType, $Products
-#    optional: $Products(default: 'all' -> includes currently 'so' and 'oo')
-#              but the default should not set in the data structure,
-#              it's only a 'Document Type Definition' based term
-#     returns: -
-# description: add the module dependencies and their attributes into the data structure
-########################################################################################
-sub addModuleDependencies
-{
-   my $self = shift;
-   my $ModuleName = shift;
-   my $DependencyType = shift;
-   my $Products = shift || "all";
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   my @sortedProducts = ();
-
-   # change all possible upper cases to lower cases
-   $Products =~ s/($Products)/\L$Products/;
-
-   # before we add the module dependencies, we have to prove that the <module-depend> tag was set
-   # because this tag must be set once before the module dependency tags begin
-   my $ModuleDepend_ref = searchTag("module-depend", $ModuleData_ref);
-
-   # if it doesn't exist, create this tag '<module-depend>'
-   if (!($ModuleDepend_ref))
-   {
-      $ModuleDepend_ref = createTag("module-depend", {});
-
-      # add it to the global data structure
-      addContent($ModuleData_ref, $ModuleDepend_ref);
-   }
-
-   my $Attributes_ref = {"module" => "$ModuleName"};
-
-   # it's wrong, if in a product content(e.g. "so") are at least
-   # one or more product(s) and within a 'all' term,
-   # because 'all' is default and means it includes all other possible values!
-   if ( ($Products ne "all") && ($Products =~ /\ball\b/) )
-   {
-      printErrorMessage($Products);
-   }
-   elsif (!($Products =~ /\ball\b/))
-   {
-      @sortedProducts = sort(split(/\s+/ ,$Products));
-      $Products = join " ", @sortedProducts;
-
-      $$Attributes_ref{"product"} = "$Products";
-   }
-
-   my $ModuleDependenciesInfos_ref = createTag("$DependencyType", $Attributes_ref);
-
-   my $currentKey = createSortKey($DependencyType, $ModuleName);
-
-   # search and get the position in which we have to insert the current 'module depend name'
-   # at first get the current 'module depend name'
-   my $currentName = getAttribute($ModuleDependenciesInfos_ref, "module");
-
-   # get the information about the number of 'Contents'(= elements) of the array
-   my $ContentCount = getContentCount($ModuleDepend_ref);
-
-   # we have to sort the serie of the 'name' contents,
-   # therefore we need a 'Pos'(position) of the array in which we want to sort in the 'name' content
-   my $Pos = 0;
-
-   # and we need a control variable 'isInsert'
-   # that we won't add the 'name' and the content more than one time
-   my $isInsert = 0;
-
-   for (my $i = 0; $i < $ContentCount; $i++)
-   {
-      # get each 'Content' of the array = ('task', ARRAY(...))
-      my $Content_ref = getContent($ModuleDepend_ref, $i);
-      my $TagName = getTagName($Content_ref);
-
-      # get the existing 'task dir' to compare it with the current 'task dir'
-      my $existingName = getAttribute($Content_ref, "module");
-
-      my $existingKey = createSortKey(getTagName($Content_ref), $existingName);
-
-      # compare both dirs...
-      # only if the 'current dir' is lower than a 'existing dir'
-      # insert it in the data structure
-      if ($currentKey lt $existingKey)
-      {
-         $Pos = $i;
-
-         insertContent($ModuleDepend_ref, $ModuleDependenciesInfos_ref, $Pos);
-
-         $isInsert = 1;
-
-         last;
-      }
-   }
-   # only if the 'current name' is greater (or equal) than the other 'existing names'
-   # insert it at the end of the data structure
-   addContent($ModuleDepend_ref, $ModuleDependenciesInfos_ref) if ($isInsert == 0);
-}
-
-########################################################################################
-#         sub: addJob
-#        gets: $Dir, $JobType, $JobPlatform, $DependingDirs_ref, $BuildReq_ref,
-#              $JobPlatform, $DependingDirs_ref, $BuildReq_ref
-#    optional: $JobPlatform(default: 'all' -> includes all other possible values),
-#              $DependingDirs_ref, $BuildReq_ref
-#     returns: -
-# description: add the infos about a job from the old build lists(by ascii parser) and
-#              sort it in the data structure
-########################################################################################
-sub addJob
-{
-   my $self = shift;
-   my $Dir = shift;
-   my $JobType = shift;
-   my $JobPlatform = shift || "all";
-   my $DependingDirs_ref = shift;
-   my $BuildReq_ref = shift;
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   # before we add the "build" tag, we have to prove that the <build> tag was set
-   # because this tag must be set once before the job tag(s) follows
-   my $buildTag_ref = searchTag("build", $ModuleData_ref);
-
-   # if it doesn't exist, create the tag '<build>'
-   if (!($buildTag_ref))
-   {
-      # If the tag wasn't found, create it
-      $buildTag_ref = createTag("build", {});
-
-      # add it to the global data structure
-      addContent($ModuleData_ref, $buildTag_ref);
-   }
-
-   my $Attributes_ref = {"dir" => "$Dir"};
-
-   # it's wrong, if a 'job platform' content(e.g. "unx wnt") has at least
-   # one or more 'job platform(s)' and an 'all' term,
-   # because 'all' is default and means it includes all other possible values
-   if ( ($JobPlatform ne "all") && ($JobPlatform =~ /\ball\b/) )
-   {
-      printErrorMessage($JobPlatform);
-   }
-   elsif (!($JobPlatform =~ /\ball\b/))
-   {
-      my @sortedPlatforms = sort(split /\s+/, $JobPlatform);
-      $JobPlatform = join " ", @sortedPlatforms;
-
-      $$Attributes_ref{"platform"} = "$JobPlatform";
-   }
-
-   # create the tags: <task>, <make> and (if it exists)...
-   #                  <depend> and/or <build-requirement>
-   my $taskInfos_ref = createTag("task", $Attributes_ref);
-
-   # search and get the position in which we have to insert the current task
-   # at first get the current 'task directory'
-   my $currentDir = getAttribute($taskInfos_ref, "dir");
-
-   # get the information about the number of 'Contents'(= elements) of the array
-   my $IndexValue = getContentCount($buildTag_ref);
-
-   # we have to sort the serie of the 'task contents',
-   # therefore we need a '$pos'(position) of the array in which we want to sort in the 'task content'
-   my $Pos = 0;
-
-   # and we need a control variable 'isInsert'
-   # that we won't add the 'task content' more than one time
-   my $isInsert = 0;
-
-   # control variable for the redundancy check
-   my $LineIsRedundant = 0;
-
-   # go in the array of the corresponding <build> tag element
-   for (my $i = 0; $i < $IndexValue; $i++)
-   {
-      # get each content of the <build> tag => ('task1', ARRAY1(...), task2...)
-      my $Task_ref = getContent($buildTag_ref, $i);
-
-      # get the existing 'task dir' to compare it with the current 'task dir'
-      my $existingDir = getAttribute($Task_ref, "dir");
-
-      # is the 'job dir' redundant?
-      if ($currentDir eq $existingDir)
-      {
-         $LineIsRedundant = checkJobRedundancy($Task_ref, $JobType, $DependingDirs_ref, $JobPlatform, $BuildReq_ref);
-      }
-
-      # if it's not a redundant line, compare both dirs:
-      # only if the 'current dir' is lower than an 'existing dir'
-      # insert it in the data structure
-      if ( ($LineIsRedundant == 0) && ($currentDir lt $existingDir) )
-      {
-         $Pos = $i;
-
-         insertContent($buildTag_ref, $taskInfos_ref, $Pos);
-
-         $isInsert = 1;
-
-         last;
-      }
-   }
-
-   # only if the 'current dir' is greater (or equal) than the other 'existing dirs'
-   # and it is not redundant insert it at the end of the data structure
-   if ( ($isInsert == 0) && ($LineIsRedundant == 0) )
-   {
-      addContent($buildTag_ref, $taskInfos_ref);
-   }
-
-   if ($LineIsRedundant == 0)
-   {
-      # create the <'$JobType'> tag
-      my $JobTypeInfos_ref = createTag($JobType, {});
-
-      # append the <'$JobType'> tag to the <task> tag
-      addContent($taskInfos_ref, $JobTypeInfos_ref);
-
-      # before we add the "depend" infos
-      # we have to get the alphabetical sorted 'Depending Directories'
-      @$DependingDirs_ref = sort(@$DependingDirs_ref) if ($DependingDirs_ref);
-
-      foreach my $DependDir (@$DependingDirs_ref)
-      {
-         my $DependInfos_ref = createTag("depend", {"dir" => "$DependDir"});
-
-         # append the <depend> tag to the <'$JobType'> tag
-         addContent($JobTypeInfos_ref, $DependInfos_ref);
-      }
-
-      # if a 'build requirement' exists, create the tag <build-requirement>
-      if ($BuildReq_ref)
-      {
-         addBuildReq($JobTypeInfos_ref, $BuildReq_ref);
-      }
-   }
-}
-
-########################################################################################
-#                           end of (internal) 'set/add' methods                        #
-########################################################################################
-
-
-########################################################################################
-#                             API - (external) 'get' methods                           #
-########################################################################################
-
-########################################################################################
-#         sub: getModuleDependencies
-#        gets: $Product, $DependencyType
-#    optional: $Product(default: 'all', means all currently used valid values),
-#              $DependencyType(default: 'md-simple', 'md-always' and 'md-force')
-#     returns: @ModuleDependencies
-# description: gets a ref of an array (with the products) and creates and
-#              returns an array with the sorted depending modules
-########################################################################################
-sub getModuleName {
-   my $self = shift;
-   if ($self->existsTag("module-name")) {
-       my ($IndexValue, $ModuleDepend_ref) = $self->getIterationData("module-name");
-       return $$ModuleDepend_ref[1][2];
-   };
-   return "";
-
-};
-sub getModuleDependencies
-{
-   my $self = shift;
-   my $Products_ref = shift;
-   my $DependencyType = shift || "all";
-
-   push(@$Products_ref, "all") if (!scalar @$Products_ref);
-
-   my $Product = "";
-   my %tempModuleDeps = ();
-   my @ModuleDependencies = ();
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   # check whether that the <module-depend> tag exists
-   if ($self->existsTag("module-depend"))
-   {
-      # change all possible upper cases to lower cases
-      $DependencyType =~ s/($DependencyType)/\L$DependencyType/ if ($DependencyType ne "all");
-
-      foreach $Product (@$Products_ref)
-      {
-         # change all possible upper cases to lower cases
-         $Product =~ s/($Product)/\L$Product/;
-
-         my $ProductContent = undef;
-         my $ModuleDependencyName = "";
-
-         # get the number of elements and the ref of the <module-depend> tag
-         my ($IndexValue, $ModuleDepend_ref) = $self->getIterationData("module-depend");
-
-         for (my $i = 0; $i < $IndexValue; $i++)
-         {
-            my $Content_ref = getContent($ModuleDepend_ref, $i);
-
-            my $ModuleDependencyName = getAttribute($Content_ref, "module");
-
-            # get the name of each existing tag
-            my $TagName = getTagName($Content_ref);
-
-            $ProductContent = getAttribute($Content_ref, "product");
-
-            # if the attribute 'product' wasn't set in the internal data structure,
-            # it means the default of 'all' is valid and includes all other possible values
-            $ProductContent = "all" if (!($ProductContent));
-
-            if ($Product ne "all")
-            {
-               if ($DependencyType ne "all")
-               {
-                  # if the caller wants all (e.g.)'so' product based dependency types,
-                  # we must get the 'so' and the 'all' matching products
-                  # because 'all' matches also the product 'so'
-                  if ( ($DependencyType eq $TagName) &&
-                       ((($ProductContent eq "all") || $ProductContent =~ /\b($Product)\b/)) )
-                  {
-                     $tempModuleDeps{$ModuleDependencyName} = "";
-
-                     print"ModuleDeps (Product != 'all' && DepType != 'all') = <$ModuleDependencyName>\n" if ($Debug);
-                  }
-               }
-               # we get from the caller only the 'product' parameter,
-               # 'dependency type' is now 'all'(default) and includes all possible values
-               elsif ( ($ProductContent =~ /\b($Product)\b/) || ($ProductContent eq "all") )
-               {
-                  $tempModuleDeps{$ModuleDependencyName} = "";
-
-                  print"ModuleDeps (Product != 'all' && DepType = 'all') = <$ModuleDependencyName>\n" if ($Debug);
-               }
-            }
-            # now the product is 'all' and we only need to check the 'dependency type'
-            elsif ($DependencyType ne "all")
-            {
-               if ($DependencyType eq $TagName)
-               {
-                  $tempModuleDeps{$ModuleDependencyName} = "";
-
-                  print"ModuleDeps (Product = 'all' && DepType != 'all') = <$ModuleDependencyName>\n" if ($Debug);
-               }
-            }
-            else
-            {
-               $tempModuleDeps{$ModuleDependencyName} = "";
-
-               print"ModuleDeps (Product = 'all' && DepType = 'all') = <$ModuleDependencyName>\n" if ($Debug);
-            }
-         }
-      }
-
-      @ModuleDependencies = sort keys %tempModuleDeps;
-   }
-
-   print"ModuleDependencies            =  <@ModuleDependencies>\n" if ($Debug);
-
-   return @ModuleDependencies;
-}
-
-########################################################################################
-#         sub: getModuleDepType
-#        gets: $DepModuleName
-#    optional: -
-#     returns: $DependencyType
-# description: gets a module name and returns the dependency type of it
-########################################################################################
-sub getModuleDepType
-{
-   my $self = shift;
-   my $DepModuleName = shift;
-
-   my $DependencyType = "";
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   # check whether that the <module-depend> tag exists
-   if ($self->existsTag("module-depend"))
-   {
-      # change all possible upper cases to lower cases
-      $DepModuleName =~ s/($DepModuleName)/\L$DepModuleName/;
-
-      my ($IndexValue, $ModuleDepend_ref) = $self->getIterationData("module-depend");
-
-      for (my $i = 0; $i < $IndexValue; $i++)
-      {
-         my $Content_ref = getContent($ModuleDepend_ref, $i);
-         my $existingModuleName = getAttribute($Content_ref, "module");
-
-         if ($DepModuleName eq $existingModuleName)
-         {
-            $DependencyType = getTagName($Content_ref);
-            last;
-         }
-      }
-   }
-
-   print"DependencyType                =  <$DependencyType>\n" if ($Debug);
-
-   return $DependencyType;
-}
-
-########################################################################################
-#         sub: getModuleProducts
-#        gets: $DepModuleName
-#    optional: -
-#     returns: @ModuleProducts
-# description: gets a module name and returns the associated products
-########################################################################################
-sub getModuleProducts
-{
-   my $self = shift;
-   my $DepModuleName = shift;
-
-   my @ModuleProducts = ();
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   # check whether that the <module-depend> tag exists
-   if ($self->existsTag("module-depend"))
-   {
-      # change all possible upper cases to lower cases
-      $DepModuleName =~ s/($DepModuleName)/\L$DepModuleName/;
-
-      my $ProductContent = undef;
-
-      my ($IndexValue, $ModuleDepend_ref) = $self->getIterationData("module-depend");
-
-      for (my $i = 0; $i < $IndexValue; $i++)
-      {
-         my $Content_ref = getContent($ModuleDepend_ref, $i);
-
-         my $existingModuleName = getAttribute($Content_ref, "module");
-
-         # if the attribute 'product' wasn't set in the internal data structure,
-         # it means the default of 'all' is valid and includes all other possible values
-         $ProductContent = getAttribute($Content_ref, "product");
-
-         if ($DepModuleName eq $existingModuleName)
-         {
-            $ProductContent = "all" if (!($ProductContent));
-
-            @ModuleProducts = split /\s+/, $ProductContent;
-
-            last;
-         }
-      }
-   }
-
-   print"Products                      =  <@ModuleProducts>\n" if ($Debug);
-
-   return @ModuleProducts;
-}
-
-########################################################################################
-#         sub: getProducts
-#        gets: -
-#    optional: -
-#     returns: @ModuleProducts
-# description: returns the products of the whole depending modules
-#              each found product name may occurs only once in the module products array
-########################################################################################
-sub getProducts
-{
-   my $self = shift;
-   my $ProductContent = undef;
-   my @tempProducts = ();
-   my @ModuleProducts = ();
-   my %Products = ();
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   # check whether that the <module-depend> tag exists
-   if ($self->existsTag("module-depend"))
-   {
-      my ($IndexValue, $ModuleDepend_ref) = $self->getIterationData("module-depend");
-
-      for (my $i = 0; $i < $IndexValue; $i++)
-      {
-         my $Content_ref = getContent($ModuleDepend_ref, $i);
-
-         $ProductContent = getAttribute($Content_ref, "product");
-
-         # if the attribute 'product' wasn't set in the internal data structure,
-         # it means the default of 'all' is valid and includes all other possible values
-         # but here we need only all 'not-all' values!
-         if (!($ProductContent))
-         {
-            $ProductContent="";
-         }
-         else
-         {
-            # here are the products of the current depending module
-            @tempProducts = split /\s+/, $ProductContent;
-
-            foreach my $Product (@tempProducts)
-            {
-               $Products{$Product} = "";
-            }
-         }
-      }
-
-      # fill the sorted 'module products' in the array
-      @ModuleProducts = sort keys %Products;
-   }
-
-   print"All ModuleProducts            =  <@ModuleProducts>\n" if ($Debug);
-
-   return @ModuleProducts;
-}
-
-########################################################################################
-#         sub: getJobDirectories
-#        gets: $JobType, $JobPlatform
-#    optional: $JobType, $JobPlatform(default: 'all' -> includes all possible values)
-#     returns: @JobDirectories
-# description: creates and returns an array with the sorted directories, which
-#              fulfil the expected values of the job type and the job platform
-########################################################################################
-sub getJobDirectories
-{
-   my $self = shift;
-   my $JobType = shift;
-   my $JobPlatform = shift || "all";
-
-   my @JobDirectories = ();
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   # check whether that the <build> tag exists
-   if ($self->existsTag("build"))
-   {
-      # change all possible upper cases to lower cases
-      $JobType =~ s/($JobType)/\L$JobType/ if ($JobType);
-      $JobPlatform =~ s/($JobPlatform)/\L$JobPlatform/ if ($JobPlatform ne "all");
-
-      my $PlatformContent = undef;
-      my %tempJobDirectories = ();
-
-      # get the ref of the <build> tag
-      my ($IndexValue, $Build_ref)  = $self->getIterationData("build");
-
-      for (my $i = 0; $i < $IndexValue; $i++)
-      {
-         my $Content_ref = getContent($Build_ref, $i);
-
-         my $PlatformContent = getAttribute($Content_ref, "platform");
-         my $existingDir = getAttribute($Content_ref, "dir");
-
-         # three cases are possible...
-         if ($JobType)
-         {
-            my $JobType_ref = getContent($Content_ref, 0);
-            my $existingJobType = getTagName($JobType_ref);
-
-            # if the attribute 'job platform' wasn't set in the internal data structure,
-            # it means the default of 'all' is valid and includes all other possible values
-            $PlatformContent = "all" if (!($PlatformContent));
-
-            # first case: we get from the caller the parameters 'job type' and 'job platform'
-            if ($JobPlatform ne "all")
-            {
-               # if the caller wants all e.g.'wnt' job platform based directories,
-               # we have to get the 'wnt' or the 'all' matching platform
-               # because 'all' includes also 'wnt'
-               if ( ($JobType eq $existingJobType) &&
-                    (($PlatformContent =~ /\b($JobPlatform)\b/) || ($PlatformContent eq "all")) )
-               {
-                  $tempJobDirectories{$existingDir} = "";
-               }
-            }
-            # second case: we get from the caller only the 'job type' parameter
-            #              'job platform' is now 'all'(default) and includes all possible values
-            elsif ($JobType eq $existingJobType)
-            {
-               $tempJobDirectories{$existingDir} = "";
-            }
-         }
-         # third case: we get from the caller no parameter; now we take each existing 'job directory',
-         #             no matter which 'job type' and 'job platform' it has
-         else
-         {
-            $tempJobDirectories{$existingDir} = "";
-         }
-      }
-
-      # sort each unique 'job directory' alphabetical
-      @JobDirectories = sort keys %tempJobDirectories;
-   }
-   print"JobDirectories                =  <@JobDirectories>\n" if ($Debug);
-
-   return @JobDirectories;
-}
-
-########################################################################################
-#         sub: getDirDependencies
-#        gets: $Dir, $JobType, $JobPlatform
-#    optional: $JobPlatform(default: 'all' -> includes all possible values)
-#     returns: @JobDependencies
-# description: creates and returns an array with the sorted depending directories
-########################################################################################
-sub getDirDependencies
-{
-   my $self = shift;
-   my $Dir = shift;
-   my $JobType = shift;
-   my $JobPlatform = shift || "all";
-
-   my @JobDependencies = ();
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   # check whether that the <build> tag exists
-   if ($self->existsTag("build"))
-   {
-      # change all possible upper cases to lower cases
-      $JobType =~ s/($JobType)/\L$JobType/;
-      $JobPlatform =~ s/($JobPlatform)/\L$JobPlatform/ if ($JobPlatform ne "all");
-
-      my $PlatformContent = undef;
-      my %tempJobDependencies = ();
-
-      # first we need a reference of the higher level tag <build>
-      my ($IndexValue, $Build_ref) = $self->getIterationData("build");
-
-      # get all 'job directories' with the matching values of the 'job type' and the 'job platform'
-      my @tempDepDirs = ();
-      @tempDepDirs = $self->getJobDirectories($JobType, $JobPlatform);
-
-      # get each content of the <build> tag
-      for (my $i = 0; $i < $IndexValue; $i++)
-      {
-         # get the ref of the content of the <build> tag
-         my $Task_ref = getContent($Build_ref, $i);
-
-         # get both attributes: 'job dir' and 'job platform'
-         my $existingDir = getAttribute($Task_ref, "dir");
-         my $PlatformContent = getAttribute($Task_ref, "platform");
-
-         # if the attribute 'job platform' wasn't set in the internal data structure,
-         # it means the default of 'all' is valid and includes all other possible values
-         $PlatformContent = "all" if (!($PlatformContent));
-
-         # get the 'job type' ref which is inside the <task> tag on position '0'
-         my $JobType_ref = getContent($Task_ref, 0);
-
-         my $existingJobType = getTagName($JobType_ref);
-
-         if ( ($Dir eq $existingDir) && ($JobType eq $existingJobType) )
-         {
-            # each 'job type' can have several 'depends' and 'build requirements'
-            # here we get the number of the including elements
-            my $IndexEnd = getContentCount($JobType_ref);
-
-            for (my $j = 0; $j < $IndexEnd; $j++)
-            {
-               # create a ref of the existing content
-               my $Content_ref = getContent($JobType_ref, $j);
-
-               # the content_ref can be 'depend' or 'build requirement'
-               # but we only need the 'depend' informations
-               next if (getTagName($Content_ref) ne "depend");
-
-               # get the 'depend dir'
-               my $DependDir = getAttribute($Content_ref, "dir");
-
-               # look in the list of all existing 'job directories'
-               foreach my $DepDir (@tempDepDirs)
-               {
-                  # get it, if one of these 'job dirs' is equal with one of the 'depending dirs'
-                  if ($DepDir eq $DependDir)
-                  {
-                     # get all unique values only once
-                     $tempJobDependencies{$DepDir} = "";
-                  }
-               }
-            }
-         }
-      }
-
-      # get the unique sorted values in the array
-      @JobDependencies = sort keys %tempJobDependencies;
-   }
-
-   print"Depending Dirs                =  <@JobDependencies>\n" if ($Debug);
-
-   return @JobDependencies;
-}
-
-########################################################################################
-#         sub: getJobTypes
-#        gets: $Dir
-#    optional: -
-#     returns: @JobTypes
-# description: creates and returns an array with the sorted 'job types'
-########################################################################################
-sub getJobTypes
-{
-   my $self = shift;
-   my $Dir = shift;
-
-   my @JobTypes = ();
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   # check whether that the <build> tag exists
-   if ($self->existsTag("build"))
-   {
-      # it's for creating unique 'job types' which exists only once in the (later) array
-      my %tempJobTypes = ();
-
-      # first we need a reference of the higher level tag <build>
-      my ($IndexValue, $Build_ref)  = $self->getIterationData("build");
-
-      for (my $i = 0; $i < $IndexValue; $i++)
-      {
-         # get the ref of the <build> tag
-         my $Task_ref = getContent($Build_ref, $i);
-         my $existingDir = getAttribute($Task_ref, "dir");
-
-         # we only need the 'task(s)' with the matching dir
-         next if ($Dir ne $existingDir);
-
-         # get the ref of the <task> tag at the position '0'
-         my $JobType_ref = getContent($Task_ref, 0);
-         my $JobType = getTagName($JobType_ref);
-
-         # get the 'job type' as a key in the hash
-         # so we can guarantee that each 'job type' stays unique!
-         $tempJobTypes{$JobType} = "";
-      }
-
-      # fill the unique sorted 'job types' in the array
-      @JobTypes = sort keys %tempJobTypes;
-   }
-
-   print"JobTypes                      =  <@JobTypes>\n" if ($Debug);
-
-   return @JobTypes;
-}
-
-########################################################################################
-#         sub: getJobBuildReqs
-#        gets: $Dir, $BuildReqPlatform
-#    optional: $BuildReqPlatform(default: 'all' -> includes all possible values)
-#     returns: @JobBuildRequirements
-# description: creates and returns an array with the sorted 'job build requirements'
-########################################################################################
-sub getJobBuildReqs
-{
-   my $self = shift;
-   my $Dir = shift;
-   my $BuildReqPlatform = shift || "all";
-
-   my @JobBuildRequirements = ();
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   # check whether that the <build> tag exists
-   if ($self->existsTag("build"))
-   {
-      # change all possible upper cases to lower cases
-      $BuildReqPlatform =~ s/($BuildReqPlatform)/\L$BuildReqPlatform/ if ($BuildReqPlatform ne "all");
-
-      my $BuildReqPlatformContent = undef;
-      my %tempJobBuildRequirements = ();
-
-      # first we need a reference of the higher level tag <build>
-      my ($IndexValue, $Build_ref)  = $self->getIterationData("build");
-
-      for (my $i = 0; $i < $IndexValue; $i++)
-      {
-         # get the ref to the content of the array of the <build> tag
-         my $Task_ref = getContent($Build_ref, $i);
-
-         # get the attribute 'task dir'
-         my $existingDir = getAttribute($Task_ref, "dir");
-
-         # get the 'job type' ref which is inside the <task> tag
-         my $JobType_ref = getContent($Task_ref, 0);
-
-         # each 'job type' can have several 'depends' and 'build requirements'
-         # here we get the number of the included elements
-         my $IndexEnd = getContentCount($JobType_ref);
-
-         for (my $j = 0; $j < $IndexEnd; $j++)
-         {
-            # create a ref of the existing content
-            my $Content_ref = getContent($JobType_ref, $j);
-
-            # the content_ref can be 'build requirement' or 'depend'
-            # but we need only the 'build requirement' informations
-            next if (getTagName($Content_ref) ne "build-requirement");
-
-            my $BuildReqName = getAttribute($Content_ref, "name");
-            $BuildReqPlatformContent = getAttribute($Content_ref, "platform");
-
-            $BuildReqPlatformContent = "all" if (!($BuildReqPlatformContent));
-
-            if ($BuildReqPlatform ne "all")
-            {
-               # compare the parameters: 'dir' and 'platform'
-               # other values('wnt', 'unx' and 'mac') for 'platform'
-               # including the value 'all' in the existing 'platform' list
-               # get each 'build requirement name' only once (unique)
-               if ( ($Dir eq $existingDir) &&
-                    (($BuildReqPlatformContent =~ /\b($BuildReqPlatform)\b/) || ($BuildReqPlatformContent =~ /\ball\b/)) )
-               {
-                  $tempJobBuildRequirements{$BuildReqName} = "";
-
-                  print"JobBuildRequirements   (if)   =  <$BuildReqName>\n" if ($Debug);
-               }
-            }
-            # if the 'build requirement platform' was not allocated, it is "all" (default)
-            # now we only need to compare the directories
-            elsif ($Dir eq $existingDir)
-            {
-               $tempJobBuildRequirements{$BuildReqName} = "";
-
-               print"JobBuildRequirements (elsif)  =  <$BuildReqName>\n" if ($Debug);
-            }
-         }
-      }
-
-      # fill the unique sorted 'build requirement names' in the array
-      @JobBuildRequirements = sort keys %tempJobBuildRequirements;
-   }
-
-   print"JobBuildRequirements          =  <@JobBuildRequirements>\n" if ($Debug);
-
-   return @JobBuildRequirements;
-}
-
-########################################################################################
-#         sub: getJobBuildReqPlatforms
-#        gets: $Dir, $BuildReqName
-#    optional: -
-#     returns: @JobBuildReqPlatforms
-# description: creates and returns an array with
-#              the sorted 'job build requirement platforms'
-########################################################################################
-sub getJobBuildReqPlatforms
-{
-   my $self = shift;
-   my $Dir = shift;
-   my $JobBuildReqName = shift;
-
-   my @JobBuildReqPlatforms = ();
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   # check whether that the <build> tag exists
-   if ($self->existsTag("build"))
-   {
-      # change all possible upper cases to lower cases
-      $JobBuildReqName =~ s/($JobBuildReqName)/\L$JobBuildReqName/;
-
-      my $BuildReqPlatformContent = undef;
-      my @tempPlatforms = ();
-      my %tempJobBuildReqPlatforms = ();
-
-      # first we need a reference of the higher level tag <build>
-      my ($IndexValue, $Build_ref)  = $self->getIterationData("build");
-
-      for (my $i = 0; $i < $IndexValue; $i++)
-      {
-         # get the ref to the content of the array of the <build> tag
-         my $Task_ref = getContent($Build_ref, $i);
-
-         # get the attribute 'task dir'
-         my $existingDir = getAttribute($Task_ref, "dir");
-
-         # get the 'job type' ref which is inside the <task> tag
-         my $JobType_ref = getContent($Task_ref, 0);
-
-         # each 'job type' can have several 'depends' and 'build requirements'
-         # here we get the number of the included elements
-         my $IndexEnd = getContentCount($JobType_ref);
-
-         for (my $j = 0; $j < $IndexEnd; $j++)
-         {
-            # create a ref of the existing content
-            my $Content_ref = getContent($JobType_ref, $j);
-
-            # the content_ref can be 'build requirement' or 'depend'
-            # but we need only the 'build requirement' informations
-            next if (getTagName($Content_ref) ne "build-requirement");
-
-            my $existingJobBuildReqName = getAttribute($Content_ref, "name");
-            $BuildReqPlatformContent = getAttribute($Content_ref, "platform");
-
-            $BuildReqPlatformContent = "all" if (!($BuildReqPlatformContent));
-
-            if ( ($Dir eq $existingDir) && ($JobBuildReqName eq $existingJobBuildReqName) )
-            {
-               # here are the platforms of the current 'build requirement'
-               @tempPlatforms = split /\s+/, $BuildReqPlatformContent;
-
-               foreach my $BuildReqPlatform (@tempPlatforms)
-               {
-                  $tempJobBuildReqPlatforms{$BuildReqPlatform} = "";
-               }                                                                                                                                        #########
-            }
-         }
-      }
-
-      # fill the unique sorted 'build requirement platforms' in the array
-      @JobBuildReqPlatforms = sort keys %tempJobBuildReqPlatforms;
-   }
-
-   print"JobBuildReqPlatforms          =  <@JobBuildReqPlatforms>\n" if ($Debug);
-
-   return @JobBuildReqPlatforms;
-}
-
-########################################################################################
-#         sub: getJobPlatforms
-#        gets: $Dir
-#    optional: -
-#     returns: @JobPlatforms
-# description: creates and returns an array with the sorted depending 'job platforms'
-########################################################################################
-sub getJobPlatforms
-{
-   my $self = shift;
-   my $Dir = shift;
-
-   my @JobPlatforms = ();
-
-   my $ModuleData_ref = $$self{"ModuleData"};
-
-   # check whether that the <build> tag exists
-   if ($self->existsTag("build"))
-   {
-      my $PlatformContent = undef;
-      my %tempJobPlatforms = ();
-
-      # control variable: if a value 'all' exists in the platform content
-      #                   it doesn't matter which platforms are also existing,
-      #                   because 'all' includes all possible values!
-      my $allExists = 0;
-
-      # first we need a reference of the higher level tag <build>
-      my ($IndexValue, $Build_ref) = $self->getIterationData("build");
-
-      for (my $i = 0; $i < $IndexValue; $i++)
-      {
-         my $Task_ref = getContent($Build_ref, $i);
-
-         # get the attributes of the <task> tag
-         my $existingTaskDir = getAttribute($Task_ref, "dir");
-         $PlatformContent = getAttribute($Task_ref, "platform");
-
-         # if it is not set in the data structure,
-         # it has automatically the default value 'all'
-         $PlatformContent = "all" if (!($PlatformContent));
-
-         if ($Dir eq $existingTaskDir)
-         {
-            # if a platform value 'all' exists, we remember it
-            # and don't look further after other platforms
-            if ($PlatformContent =~ /\ball\b/)
-            {
-               $allExists = 1;
-
-               @JobPlatforms = "all";
-
-               last;
-            }
-
-            my @tempPlatforms = ();
-
-            push(@tempPlatforms, split(/\s+/, $PlatformContent));
-
-            foreach my $Platform (@tempPlatforms)
-            {
-               $tempJobPlatforms{$Platform} = "";
-            }
-         }
-      }
-
-      # fill the unique sorted 'job platforms' in the array,
-      # but only if the content "all" is not present in the platform content
-      @JobPlatforms = sort keys %tempJobPlatforms if ($allExists == 0);
-   }
-
-   print"JobPlatforms                  =  <@JobPlatforms>\n" if ($Debug);
-
-   return @JobPlatforms;
-}
-
-########################################################################################
-#                                 end of 'get' methods                                 #
-########################################################################################
-
-1 ;
diff --git a/soldep/bootstrp/XmlBuildList.cxx b/soldep/bootstrp/XmlBuildList.cxx
deleted file mode 100644
index 670a3eb7f771..000000000000
--- a/soldep/bootstrp/XmlBuildList.cxx
+++ /dev/null
@@ -1,436 +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: XmlBuildList.cxx,v $
- * $Revision: 1.5 $
- *
- * 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 <EXTERN.h>               /* from the Perl distribution     */
-
-#ifdef WNT
-#include <tools/prewin.h>
-#include "perl.h"
-#include <tools/postwin.h>
-#else
-#include "perl.h"
-#endif
-#undef Copy                     /* from Perl handy.h */
-
-#include <soldep/XmlBuildList.hxx>
-#include "XmlBuildListDef.hxx"
-
-#ifdef __cplusplus
-#  define EXTERN_C extern "C"
-#else
-#  define EXTERN_C extern
-#endif
-
-static PerlInterpreter *my_perl;  /***    The Perl interpreter    ***/
-static const char * DEP_MD_SIMPLE_STR = "md-simple";
-
-EXTERN_C void boot_DynaLoader (pTHX_ CV* cv);
-static void xs_init (pTHX);
-static void dl_init (pTHX);
-
-static void xs_init(pTHX)
-{
-        char *file = __FILE__;
-        dXSUB_SYS;
-        {
-        /* DynaLoader is a special case */
-        newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
-        }
-}
-
-static void dl_init(pTHX)
-{
-    char *file = __FILE__;
-    dTARG;
-    dSP;
-/* Dynamicboot strapping code*/
-        SAVETMPS;
-        targ=sv_newmortal();
-        FREETMPS;
-/* end Dynamic bootstrapping code */
-#ifdef MACOSX
-    *file=0; // how does this works???
-    sp=0;
-#endif
-}
-
-FullByteStringList::FullByteStringList()
-                    : FullByteStingListImpl(),
-                    nRef (0)
-{
-}
-
-FullByteStringList::~FullByteStringList()
-{
-    ByteString* pStr = First();
-    while (pStr)
-    {
-        delete pStr;
-        pStr = Next();
-    }
-}
-
-ULONG FullByteStringList::GetPos (ByteString& rStr)
-{
-    ULONG nCurPos = GetCurPos();
-    ULONG nPos = 0;
-    ByteString* pStr = First();
-    while (pStr)
-    {
-        if (*pStr == rStr)
-        {
-            GetObject (nCurPos);
-            return nPos;
-        }
-        pStr = Next();
-        nPos ++;
-    }
-    GetObject (nCurPos);
-    return LIST_ENTRY_NOTFOUND;
-}
-
-FullByteStringListWrapper& FullByteStringListWrapper::operator=( const FullByteStringListWrapper& rFullByteStringListWrapper )
-{
-    if (pStringList)
-        if (pStringList->GetRef() == 0)
-            delete pStringList;
-        else
-            pStringList->DecRef();
-
-    pStringList = rFullByteStringListWrapper.GetStringList();
-    if (pStringList)
-        pStringList->IncRef();
-    return *this;
-}
-
-FullByteStringListWrapper::~FullByteStringListWrapper ()
-{
-    if (pStringList)
-    {
-        if (pStringList->GetRef() == 0)
-            delete pStringList;
-        else
-            pStringList->DecRef();
-    }
-}
-
-//
-// Function initializes Perl
-// ATTENTION: No check built in - YET TO DO
-//
-void XmlBuildList::initPerl(const char* ModulePath) {
-    if (PerlInitialized)
-        return;
-    my_perl = perl_alloc();
-    if (!my_perl)
-        throw XmlBuildListException("Cannot initialize perl");
-    perl_construct(my_perl);
-    char* embedding[] = {"", "-e", "0"};
-    int exitstatus = perl_parse(my_perl, xs_init, 3, embedding, (char **)NULL);
-    if (!exitstatus) {
-        dl_init(aTHX);
-        exitstatus = perl_run(my_perl);
-    }
-    //perl_run(my_perl);
-    // Create a variable (s. perlguts)
-    SV* sv = get_sv("main::module_path", TRUE);
-    sv_setpv(sv, ModulePath);
-    eval_pv("use lib $main::module_path; use XMLBuildListParser;", FALSE);
-    checkOperationSuccess();
-    eval_pv("$main::build_lst_obj = XMLBuildListParser->new();", FALSE);
-    checkOperationSuccess();
-    eval_pv("@array = ();", FALSE);
-    checkOperationSuccess();
-    PerlInitialized = TRUE;
-};
-
-// Function proves if the $@ perl variable is set, if yes -
-// last operation was unsuccessfull -> throws exception
-void XmlBuildList::checkOperationSuccess() {
-    char* op_result = SvPV_nolen(get_sv("main::@", FALSE));
-    if (strcmp(op_result, ""))
-        throw XmlBuildListException(op_result);
-}
-
-//
-// Function generates a regular array with NULL as last element
-// from the Perl-object @array
-//
-FullByteStringList* XmlBuildList::extractArray() {
-    FullByteStringList* pStringList = new FullByteStringList();
-    AV* theArrayObj = get_av("main::array", FALSE);
-    I32 arrayLength = av_len(theArrayObj); // $#array value
-    if (arrayLength == -1)
-        return pStringList;
-
-    SV** string_ptr;
-    char* pStoredString;
-    // populate vector with strings (char*)
-    for (int i = 0; i <= arrayLength; i++) {
-        string_ptr = av_fetch(theArrayObj, i, NULL);
-        //pStoredString = savepv(SvPV_nolen(*string_ptr));
-        pStoredString = SvPV_nolen(*string_ptr);
-        ByteString* pStr = new ByteString(pStoredString);
-        pStringList->Insert(pStr, LIST_APPEND);
-    };
-    return pStringList;
-};
-
-
-char* XmlBuildList::getError() {
-    eval_pv("$main::string1 = $main::build_lst_obj->getError();", FALSE);
-    checkOperationSuccess();
-    return SvPV_nolen(get_sv("main::string1", FALSE));
-};
-
-/*****************************************************************************/
-XmlBuildList::XmlBuildList(const ByteString& rModulePath)
-/*****************************************************************************/
-                : PerlInitialized (FALSE)
-{
-    initPerl(rModulePath.GetBuffer());
-    string_obj1 = get_sv("main::string1", TRUE);
-    string_obj2 = get_sv("main::string2", TRUE);
-    string_obj3 = get_sv("main::string3", TRUE);
-    if (!(string_obj1 && string_obj2 && string_obj3))
-        throw XmlBuildListException("Cannot initialize Perl string objects");
-};
-
-//
-// Function uninitializes Perl
-//
-/*****************************************************************************/
-XmlBuildList::~XmlBuildList()
-/*****************************************************************************/
-{
-    if (!PerlInitialized)
-        return;
-    perl_destruct(my_perl);
-    perl_free(my_perl);
-    PerlInitialized = FALSE;
-};
-
-/*****************************************************************************/
-void XmlBuildList::loadXMLFile(const ByteString& rBuildList)
-/*****************************************************************************/
-{
-    sv_setpv(string_obj1, rBuildList.GetBuffer());
-    eval_pv("$main::string2 = $main::build_lst_obj->loadXMLFile($main::string1);", FALSE);
-    checkOperationSuccess();
-    if(!SvTRUE(string_obj2)) {
-        const char* Message = getError();
-        throw XmlBuildListException(Message);
-    };
-};
-
-/*****************************************************************************/
-FullByteStringListWrapper XmlBuildList::getProducts()
-/*****************************************************************************/
-{
-    eval_pv("@array = $main::build_lst_obj->getProducts();", FALSE);
-    checkOperationSuccess();
-    FullByteStringList* pList = extractArray();
-    return FullByteStringListWrapper(pList);
-}
-
-/*****************************************************************************/
-FullByteStringListWrapper XmlBuildList::getJobDirectories(const ByteString& rJobType, const ByteString& rJobPlatform)
-/*****************************************************************************/
-{
-    sv_setpv(string_obj1, rJobType.GetBuffer());
-    sv_setpv(string_obj2, rJobPlatform.GetBuffer());
-    eval_pv("@array = $main::build_lst_obj->getJobDirectories($main::string1, $main::string2);", FALSE);
-    checkOperationSuccess();
-    FullByteStringList* pList = extractArray();
-    return FullByteStringListWrapper(pList);
-}
-
-/*****************************************************************************/
-FullByteStringListWrapper XmlBuildList::getModuleDependencies(const ByteString& rProduct, const ByteString& rDependencyType)
-/*****************************************************************************/
-{
-    FullByteStringList* pProducts = new FullByteStringList();
-    FullByteStringListWrapper aProducts (pProducts);
-    if (rProduct != "")
-        aProducts.Insert (new ByteString(rProduct), LIST_APPEND);
-    return getModuleDependencies(aProducts, rDependencyType);
-};
-
-/*****************************************************************************/
-FullByteStringListWrapper XmlBuildList::getModuleDependencies(FullByteStringListWrapper& rProducts, const ByteString& rDependencyType)
-/*****************************************************************************/
-{
-    eval_pv("@products = ();", FALSE);
-    checkOperationSuccess();
-    AV* theArrayObj = get_av("main::products", FALSE);
-    FullByteStringList* pProducts = rProducts.GetStringList();
-    ByteString* pStr = pProducts->First();
-    while (pStr)
-    {
-        sv_setpv(string_obj2, pStr->GetBuffer());
-        av_push(theArrayObj, string_obj2);
-        pStr = pProducts->Next();
-    }
-
-    sv_setpv(string_obj1, rDependencyType.GetBuffer());
-    eval_pv("@array = $main::build_lst_obj->getModuleDependencies(\\@products, $main::string1);", FALSE);
-    checkOperationSuccess();
-    FullByteStringList* pList = extractArray();
-    return FullByteStringListWrapper(pList);
-};
-
-/*****************************************************************************/
-FullByteStringListWrapper XmlBuildList::getJobBuildReqs(const ByteString& rJobDir, const ByteString& rBuildReqPlatform)
-/*****************************************************************************/
-{
-    sv_setpv(string_obj1, rJobDir.GetBuffer());
-    sv_setpv(string_obj2, rBuildReqPlatform.GetBuffer());
-    eval_pv("@array = $main::build_lst_obj->getJobBuildReqs($main::string1, $main::string2);", FALSE);
-    checkOperationSuccess();
-    FullByteStringList* pList = extractArray();
-    return FullByteStringListWrapper(pList);
-}
-
-/*****************************************************************************/
-ByteString XmlBuildList::getModuleDepType(const ByteString& rDepModuleName)
-/*****************************************************************************/
-{
-    sv_setpv(string_obj1, rDepModuleName.GetBuffer());
-    eval_pv("$main::string1 = $main::build_lst_obj->getModuleDepType($main::string1);", FALSE);
-    checkOperationSuccess();
-    char* pString = SvPV_nolen(get_sv("main::string1", FALSE));
-    ByteString sDependencyType(pString);
-    return sDependencyType;
-}
-
-/*****************************************************************************/
-sal_Bool XmlBuildList::hasModuleDepType(FullByteStringListWrapper& rProducts, const ByteString& rDependencyType)
-/*****************************************************************************/
-{
-    FullByteStringListWrapper aDepencendModules = getModuleDependencies(rProducts, rDependencyType);
-    if (aDepencendModules.Count()>0)
-    {
-        return sal_True;
-    }
-    return sal_False;
-}
-
-/*****************************************************************************/
-FullByteStringListWrapper XmlBuildList::getModuleDepTypes(FullByteStringListWrapper& rProducts)
-/*****************************************************************************/
-{
-    FullByteStringList * pList = new FullByteStringList();
-
-    ByteString aDepType = ByteString( DEP_MD_SIMPLE_STR );
-    bool bHasType = hasModuleDepType(rProducts, aDepType);
-    if (bHasType)
-        pList->Insert(new ByteString (aDepType));
-
-    aDepType = ByteString(DEP_MD_ALWAYS_STR);
-    bHasType = hasModuleDepType(rProducts, aDepType);
-    if (bHasType)
-        pList->Insert(new ByteString (aDepType));
-
-    aDepType = ByteString(DEP_MD_FORCE_STR);
-    bHasType = hasModuleDepType(rProducts, aDepType);
-    if (bHasType)
-        pList->Insert(new ByteString (aDepType));
-
-    return FullByteStringListWrapper (pList);
-}
-
-/*****************************************************************************/
-FullByteStringListWrapper XmlBuildList::getModuleProducts(const ByteString& rDepModuleName)
-/*****************************************************************************/
-{
-    sv_setpv(string_obj1, rDepModuleName.GetBuffer());
-    eval_pv("@array = $main::build_lst_obj->getModuleProducts($main::string1);", FALSE);
-    checkOperationSuccess();
-    FullByteStringList* pList = extractArray();
-    return FullByteStringListWrapper(pList);
-};
-
-/*****************************************************************************/
-ByteString XmlBuildList::getModuleName()
-/*****************************************************************************/
-{
-    eval_pv("$main::string1 = $main::build_lst_obj->getModuleName();", FALSE);
-    checkOperationSuccess();
-    char* pString = SvPV_nolen(get_sv("main::string1", FALSE));
-    ByteString sModuleName(pString);
-    return sModuleName;
-}
-
-/*****************************************************************************/
-FullByteStringListWrapper XmlBuildList::getDirDependencies(const ByteString& rJobDir, const ByteString& rJobType, const ByteString& rJobPlatform)
-/*****************************************************************************/
-{
-    sv_setpv(string_obj1, rJobDir.GetBuffer());
-    sv_setpv(string_obj2, rJobType.GetBuffer());
-    sv_setpv(string_obj3, rJobPlatform.GetBuffer());
-    eval_pv("@array = $main::build_lst_obj->getDirDependencies($main::string1, $main::string2, $main::string3);", FALSE);
-    checkOperationSuccess();
-    FullByteStringList* pList = extractArray();
-    return FullByteStringListWrapper(pList);
-};
-
-/*****************************************************************************/
-FullByteStringListWrapper XmlBuildList::getJobTypes(const ByteString& rJobDir)
-/*****************************************************************************/
-{
-    sv_setpv(string_obj1, rJobDir.GetBuffer());
-    eval_pv("@array = $main::build_lst_obj->getJobTypes($main::string1);", FALSE);
-    checkOperationSuccess();
-    FullByteStringList* pList = extractArray();
-    return FullByteStringListWrapper(pList);
-};
-
-/*****************************************************************************/
-FullByteStringListWrapper XmlBuildList::getJobPlatforms(const ByteString& rJobDir)
-/*****************************************************************************/
-{
-    sv_setpv(string_obj1, rJobDir.GetBuffer());
-    eval_pv("@array = $main::build_lst_obj->getJobPlatforms($main::string1);", FALSE);
-    checkOperationSuccess();
-    FullByteStringList* pList = extractArray();
-    return FullByteStringListWrapper(pList);
-};
-
-/*****************************************************************************/
-FullByteStringListWrapper XmlBuildList::getJobBuildReqPlatforms(const ByteString& rJobDir, const ByteString& rBuildReqName)
-/*****************************************************************************/
-{
-    sv_setpv(string_obj1, rJobDir.GetBuffer());
-    sv_setpv(string_obj2, rBuildReqName.GetBuffer());
-    eval_pv("@array = $main::build_lst_obj->getJobBuildReqPlatforms($main::string1, $main::string2);", FALSE);
-    checkOperationSuccess();
-    FullByteStringList* pList = extractArray();
-    return FullByteStringListWrapper(pList);
-};
diff --git a/soldep/bootstrp/makefile.mk b/soldep/bootstrp/makefile.mk
index d38b25982b86..ac56f781b791 100644
--- a/soldep/bootstrp/makefile.mk
+++ b/soldep/bootstrp/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # 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
@@ -35,10 +35,8 @@ PRJNAME=soldep
 TARGET=bootstrpdt
 ENABLE_EXCEPTIONS=true
 
-
 # --- Settings -----------------------------------------------------
 
-#.INCLUDE :  $(PRJ)$/util$/perl.mk
 .INCLUDE :  settings.mk
 
 # fixme, code is not yet 64 bit clean
@@ -50,7 +48,7 @@ all:
 # --- Files --------------------------------------------------------
 
 EXCEPTIONSFILES= \
-          $(SLO)$/prj.obj	
+                  $(SLO)$/prj.obj
 
 SLOFILES=\
           $(SLO)$/dep.obj \
@@ -58,7 +56,8 @@ SLOFILES=\
           $(SLO)$/prodmap.obj \
           $(SLO)$/appdef.obj \
            $(SLO)$/hashtbl.obj		\
-          $(SLO)$/prj.obj \
+          $(SLO)$/prj.obj
+
 
 SHL1TARGET	=$(TARGET)$(DLLPOSTFIX)
 SHL1IMPLIB	=$(TARGET)
@@ -69,7 +68,7 @@ SHL1STDLIBS=\
             $(TOOLSLIB) \
             $(BTSTRPLIB)		\
             $(VOSLIB)			\
-            $(SALLIB)
+            $(SALLIB)   
 
 DEF1NAME    =$(SHL1TARGET)
 DEF1DEPN	=$(MISC)$/$(SHL1TARGET).flt
diff --git a/soldep/bootstrp/minormk.cxx b/soldep/bootstrp/minormk.cxx
index 2d87f0a35fc6..2a8a69dbc3b5 100644
--- a/soldep/bootstrp/minormk.cxx
+++ b/soldep/bootstrp/minormk.cxx
@@ -29,10 +29,10 @@
  ************************************************************************/
 
 #include "minormk.hxx"
+#include "prodmap.hxx"
 #include <appdef.hxx>
 #include <tools/fsys.hxx>
 #include <tools/geninfo.hxx>
-#include "prodmap.hxx"
 
 //
 // class MinorMk
diff --git a/soldep/inc/XmlBuildListDef.hxx b/soldep/inc/XmlBuildListDef.hxx
deleted file mode 100755
index 7f68059e18f5..000000000000
--- a/soldep/inc/XmlBuildListDef.hxx
+++ /dev/null
@@ -1,50 +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: XmlBuildListDef.hxx,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.
- *
- ************************************************************************/
-
-#ifndef _XMLBUILDLISTDEF_HXX
-#define _XMLBUILDLISTDEF_HXX
-
-enum DepTypes
-{
-    mdsimple,
-    mdalways,
-    mdforce
-};
-
-#define DEP_MD_SIMPLE   1;
-//#define DEP_MD_ALWAYS 2;
-//#define DEP_MD_FORCE  4;
-
-//static const char * DEP_MD_ALWAYS_STR =   "md-always";
-//static const char * DEP_MD_FORCE_STR  =   "md-force";
-
-#endif
-
-
diff --git a/soldep/inc/soldep/XmlBuildList.hxx b/soldep/inc/soldep/XmlBuildList.hxx
deleted file mode 100644
index cfab946d453c..000000000000
--- a/soldep/inc/soldep/XmlBuildList.hxx
+++ /dev/null
@@ -1,160 +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: XmlBuildList.hxx,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.
- *
- ************************************************************************/
-
-#ifndef _XMLBUILDLIST_HXX
-#define _XMLBUILDLIST_HXX
-
-#ifndef _STRING_HXX
-#include <tools/string.hxx>
-#endif
-
-#ifndef _LIST_HXX
-#include <tools/list.hxx>
-#endif
-
-#include <sal/types.h>
-
-class FullByteStringListWrapper;
-
-struct STRUCT_SV;
-
-DECLARE_LIST ( FullByteStingListImpl, ByteString* )
-
-class FullByteStringList : public FullByteStingListImpl
-{
-    friend  class FullByteStringListWrapper;
-    ULONG           nRef;
-    void            IncRef() { nRef ++; }
-    void            DecRef() { nRef --; }
-    ULONG           GetRef() { return nRef; }
-public:
-    FullByteStringList();
-    ~FullByteStringList();
-    ULONG           GetPos (ByteString& rStr);
-    ULONG           GetPos( const ByteString* p ) const { return FullByteStingListImpl::GetPos(p); }
-    ULONG           GetPos( const ByteString* p, ULONG nStartIndex,
-                        BOOL bForward = TRUE ) const { return
-                        FullByteStingListImpl::GetPos(p, nStartIndex, bForward); }
-};
-
-class FullByteStringListWrapper
-{
-private:
-    FullByteStringList*  pStringList;
-
-public:
-    FullByteStringListWrapper (FullByteStringList* pList) {pStringList = pList;}
-    ~FullByteStringListWrapper ();
-
-    FullByteStringList* GetStringList() const {return pStringList;}
-
-    void        Insert( ByteString* p ){pStringList->Insert(p);}
-    void        Insert( ByteString* p, ULONG nIndex ){pStringList->Insert(p, nIndex);}
-    void        Insert( ByteString* pNew, ByteString* pOld ){pStringList->Insert(pNew, pOld);}
-
-    ByteString*       Remove(){return pStringList->Remove();}
-    ByteString*       Remove( ULONG nIndex ){return pStringList->Remove(nIndex);}
-    ByteString*       Remove( ByteString* p )
-                    { return pStringList->Remove(p); }
-
-    ByteString*       Replace( ByteString* p ){ return pStringList->Replace(p); }
-    ByteString*       Replace( ByteString* p, ULONG nIndex ){ return pStringList->Replace(p, nIndex); }
-    ByteString*       Replace( ByteString* pNew, ByteString* pOld )
-                    { return pStringList->Replace( pNew, pOld ); }
-
-    ULONG       Count() const { return pStringList->Count(); }
-    void        Clear(){pStringList->Clear(); }
-
-    ByteString*       GetCurObject() const { return pStringList->GetCurObject(); }
-    ULONG       GetCurPos() const { return pStringList->GetCurPos(); }
-    ByteString*       GetObject( ULONG nIndex ) const { return pStringList->GetObject( nIndex ); }
-    ULONG       GetPos( const ByteString* p ) const { return pStringList->GetPos(p); }
-    ULONG       GetPos( const ByteString* p, ULONG nStartIndex,
-                        BOOL bForward = TRUE ) const { return
-                        pStringList->GetPos(p, nStartIndex, bForward); }
-    ULONG       GetPos (ByteString& rStr) { return pStringList->GetPos(rStr); }
-
-    ByteString*       Seek( ULONG nIndex ) { return pStringList->Seek(nIndex); }
-    ByteString*       Seek( ByteString* p ) { return pStringList->Seek(p); }
-
-    ByteString*       First() { return pStringList->First(); };
-    ByteString*       Last() { return pStringList->Last(); };
-    ByteString*       Next() { return pStringList->Next(); };
-    ByteString*       Prev() { return pStringList->Prev(); };
-
-    FullByteStringListWrapper & operator= ( const FullByteStringListWrapper &);
-};
-
-
-class XmlBuildListException {
-    private:
-        const char* ExceptionMessage;
-    public:
-        XmlBuildListException(const char* Message)
-            :ExceptionMessage(Message) {};
-        const char* getMessage() {return ExceptionMessage;};
-};
-
-class XmlBuildList {
-    protected:
-        bool PerlInitialized;
-        void initPerl(const char* ModulePath);
-        // Set of arrays for each function, which uses char* arrays
-        // as a return value. Each call to such function clears its array up
-        // before it's being populated
-        FullByteStringList* extractArray();
-        // C objects for $string1 & $string2 Perl variables
-        STRUCT_SV* string_obj1;
-        STRUCT_SV* string_obj2;
-        STRUCT_SV* string_obj3;
-        char* getError();
-        void checkOperationSuccess();
-    public:
-        // alternative to constructor
-        XmlBuildList(const ByteString& rModulePath);
-        ~XmlBuildList();
-        void loadXMLFile(const ByteString& rBuildList);
-        FullByteStringListWrapper getProducts();
-        FullByteStringListWrapper getJobDirectories(const ByteString& rJobType, const ByteString& rJobPlatform);
-        FullByteStringListWrapper getModuleDependencies(const ByteString& rProduct, const ByteString& rDependencyType);
-        FullByteStringListWrapper getModuleDependencies(FullByteStringListWrapper& rProducts, const ByteString& rDependencyType);
-        FullByteStringListWrapper getJobBuildReqs(const ByteString& rJobDir, const ByteString& rBuildReqPlatform);
-        ByteString getModuleDepType(const ByteString& rDepModuleName);
-        FullByteStringListWrapper getModuleDepTypes(FullByteStringListWrapper& rProducts);
-        sal_Bool hasModuleDepType(FullByteStringListWrapper& rProducts, const ByteString& rDependencyType);
-        FullByteStringListWrapper getModuleProducts(const ByteString& rDepModuleName);
-        ByteString getModuleName();
-        FullByteStringListWrapper getDirDependencies(const ByteString& rJobDir, const ByteString& rJobType, const ByteString& rJobPlatform);
-        FullByteStringListWrapper getJobTypes(const ByteString& rJobDir);
-        FullByteStringListWrapper getJobPlatforms(const ByteString& rJobDir);
-        FullByteStringListWrapper getJobBuildReqPlatforms(const ByteString& rJobDir, const ByteString& rBuildReqName);
-};
-
-#endif
diff --git a/soldep/inc/soldep/depper.hxx b/soldep/inc/soldep/depper.hxx
index 42517832c645..7caffca8662e 100644
--- a/soldep/inc/soldep/depper.hxx
+++ b/soldep/inc/soldep/depper.hxx
@@ -74,7 +74,7 @@ class FixedText;
 #define     OBJWIN_X_SPACING        50
 #define     OBJWIN_Y_SPACING        12
 #define     DEPPER_MAX_DEPTH        100
-#define     DEPPER_MAX_WIDTH        9
+#define     DEPPER_MAX_WIDTH        12
 #define     DEPPER_MAX_LEVEL_WIDTH      10 * DEPPER_MAX_WIDTH
 
 
diff --git a/soldep/inc/soldep/objwin.hxx b/soldep/inc/soldep/objwin.hxx
index 13568561c95d..884507a2fa81 100644
--- a/soldep/inc/soldep/objwin.hxx
+++ b/soldep/inc/soldep/objwin.hxx
@@ -139,6 +139,7 @@ public:
 
         BOOL            ConnectionExistsInAnyDirection( ObjectWin *pWin );
         void    DrawOutput( OutputDevice* pDevice, const Point& rOffset  );
+        BOOL    IsTop();
 };
 
 DECL_DEST_LIST( TmpObjWinList, ObjWinList, ObjectWin* )
@@ -155,6 +156,7 @@ public:
                ~ObjectList() {};
     void       ResetSelectedObject();
     ObjectWin* GetPtrByName( const ByteString& rText );
+    ObjectList* FindTopLevelModules();
 };
 
 #endif
diff --git a/soldep/prj/d.lst b/soldep/prj/d.lst
index 25dd1b8530c9..73301a558e61 100644
--- a/soldep/prj/d.lst
+++ b/soldep/prj/d.lst
@@ -27,7 +27,6 @@ mkdir: %COMMON_DEST%\res%_EXT%\img\additional
 ..\inc\soldep\prj.hxx %_DEST%\inc%_EXT%\soldep\prj.hxx
 ..\inc\dep.hxx %_DEST%\inc%_EXT%\soldep\dep.hxx
 ..\inc\prodmap.hxx %_DEST%\inc%_EXT%\soldep\prodmap.hxx
-..\inc\soldep\XmlBuildList.hxx %_DEST%\inc%_EXT%\soldep\XmlBuildList.hxx
 ..\inc\appdef.hxx %_DEST%\inc%_EXT%\soldep\appdef.hxx
 ..\inc\soldep\soldlg.hrc %_DEST%\inc%_EXT%\soldep\soldlg.hrc
 
diff --git a/soldep/source/connctr.cxx b/soldep/source/connctr.cxx
index 8eaba9ace236..acba58ce48d9 100644
--- a/soldep/source/connctr.cxx
+++ b/soldep/source/connctr.cxx
@@ -1,168 +1,168 @@
-/*************************************************************************
- *
- * 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: connctr.cxx,v $
- * $Revision: 1.6 $
- *
- * 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.
- *
- ************************************************************************/
-#ifdef _MSC_VER
-#pragma warning(disable:4100)
-#endif
-#include <soldep/connctr.hxx>
-#include <soldep/objwin.hxx>
-#include <soldep/depwin.hxx>
-#include "math.h"
-
-BOOL Connector::msbHideMode = FALSE;
-
-Connector::Connector( DepWin* pParent, WinBits nWinStyle ) :
-mpStartWin( 0L ),
-mpEndWin( 0L ),
-mnStartId( 0 ),
-mnEndId( 0 ),
-bVisible( FALSE ),
-len( 70 )
-{
-    mpParent = pParent;
-    if ( mpParent )
-        mpParent->AddConnector( this );
-}
-
-Connector::~Connector()
-{
-    if ( mpStartWin )
-        mpStartWin->RemoveConnector( this );
-    if ( mpEndWin )
-        mpEndWin->RemoveConnector( this );
-    if ( mpParent )
-        mpParent->RemoveConnector( this );
-    mpParent->Invalidate( Rectangle( mStart, mEnd ));
-    mpParent->Invalidate( Rectangle( mEnd - Point( 3, 3), mEnd + Point( 3, 3)));
-}
-
-void Connector::Initialize( ObjectWin* pStartWin, ObjectWin* pEndWin, BOOL bVis )
-{
-    mpStartWin = pStartWin;
-    mpEndWin = pEndWin;
-    mpStartWin->AddConnector( this );
-    mpEndWin->AddConnector( this );
-    mCenter = GetMiddle();
-    mStart = pStartWin->GetFixPoint( mCenter );
-    mEnd = pEndWin->GetFixPoint( mCenter );
-    mnStartId = pStartWin->GetId();
-    mnEndId = pEndWin->GetId();
-    bVisible = bVis;
-
-//  if ( mpParent->IsPaintEnabled())
-    if ( IsVisible() )
-    {
-        mpParent->DrawLine( mEnd, mStart );
-        mpParent->DrawEllipse( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2)));
-    }
-    UpdateVisibility(); //null_Project
-}
-
-void Connector::UpdateVisibility()
-{
-    bVisible = mpStartWin->IsVisible() && mpEndWin->IsVisible();
-}
-
-
-Point Connector::GetMiddle()
-{
-    Point aStartPoint = mpStartWin->GetPosPixel();
-    Size aStartSize = mpStartWin->GetSizePixel();
-    int nMoveHorz, nMoveVert;
-    aStartPoint.Move( aStartSize.Width() / 2, aStartSize.Height() / 2 );
-
-    Point aEndPoint = mpEndWin->GetPosPixel();
-    Size aEndSize = mpEndWin->GetSizePixel();
-
-    aEndPoint.Move( aEndSize.Width() / 2, aEndSize.Height() / 2 );
-
-    Point aRetPoint = aEndPoint;
-
-    nMoveHorz = aStartPoint.X() - aEndPoint.X();
-    if ( nMoveHorz )
-        nMoveHorz /= 2;
-    nMoveVert = aStartPoint.Y() - aEndPoint.Y();
-    if ( nMoveVert )
-        nMoveVert /= 2;
-    aRetPoint.Move( nMoveHorz, nMoveVert );
-    return aRetPoint;
-
-}
-
-void Connector::Paint( const Rectangle& rRect )
-{
-    //MyApp *pApp = (MyApp*)GetpApp();
-    //SolDep *pSoldep = pApp->GetSolDep();
-    if (msbHideMode)
-    {
-    if (!(mpStartWin->IsNullObject())) //null_project
-    {
-        if ( mpStartWin->GetMarkMode() == 0 || mpStartWin->GetMarkMode() == MARKMODE_DEPENDING )
-        {
-            mpStartWin->SetViewMask(0); //objwin invisible
-        } else
-        {
-            mpStartWin->SetViewMask(1); //objwin visible
-        }
-    }
-    if (!(mpEndWin->IsNullObject()))
-    {
-        if ( mpEndWin->GetMarkMode() == 0 || mpEndWin->GetMarkMode() == MARKMODE_DEPENDING )
-        {
-            mpEndWin->SetViewMask(0); //objwin invisible
-        } else
-        {
-            mpEndWin->SetViewMask(1); //objwin visible
-        }
-    }
-    UpdateVisibility();
-    } else //IsHideMode
-    {
-        //bVisible = TRUE;
-        if (!(mpStartWin->IsNullObject())) //null_project
-        {
-             mpStartWin->SetViewMask(1);
-        }
-        if (!(mpEndWin->IsNullObject())) //null_project
-        {
-             mpEndWin->SetViewMask(1);
-        }
-        UpdateVisibility();
-    }
-    if ( (mpStartWin->GetBodyText() != ByteString("null")) &&              //null_project
-         (mpEndWin->GetBodyText() != ByteString("null")) && IsVisible())  //null_project
-    {
-        mpParent->DrawLine( mEnd, mStart );
-        mpParent->DrawEllipse( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2)));
-    }
-}
-
+/*************************************************************************

+ *

+ * 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: connctr.cxx,v $

+ * $Revision: 1.6 $

+ *

+ * 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.

+ *

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

+#ifdef _MSC_VER

+#pragma warning(disable:4100)

+#endif

+#include <soldep/connctr.hxx>

+#include <soldep/objwin.hxx>

+#include <soldep/depwin.hxx>

+#include "math.h"

+

+BOOL Connector::msbHideMode = FALSE;

+

+Connector::Connector( DepWin* pParent, WinBits nWinStyle ) :

+mpStartWin( 0L ),

+mpEndWin( 0L ),

+mnStartId( 0 ),

+mnEndId( 0 ),

+bVisible( FALSE ),

+len( 70 )

+{

+    mpParent = pParent;

+    if ( mpParent )

+        mpParent->AddConnector( this );

+}

+

+Connector::~Connector()

+{

+    if ( mpStartWin )

+        mpStartWin->RemoveConnector( this );

+    if ( mpEndWin )

+        mpEndWin->RemoveConnector( this );

+    if ( mpParent )

+        mpParent->RemoveConnector( this );

+    mpParent->Invalidate( Rectangle( mStart, mEnd ));

+    mpParent->Invalidate( Rectangle( mEnd - Point( 3, 3), mEnd + Point( 3, 3)));

+}

+

+void Connector::Initialize( ObjectWin* pStartWin, ObjectWin* pEndWin, BOOL bVis )

+{

+    mpStartWin = pStartWin;

+    mpEndWin = pEndWin;

+    mpStartWin->AddConnector( this );

+    mpEndWin->AddConnector( this );

+    mCenter = GetMiddle();

+    mStart = pStartWin->GetFixPoint( mCenter );

+    mEnd = pEndWin->GetFixPoint( mCenter );

+    mnStartId = pStartWin->GetId();

+    mnEndId = pEndWin->GetId();

+    bVisible = bVis;

+

+//  if ( mpParent->IsPaintEnabled())

+    if ( IsVisible() )

+    {

+        mpParent->DrawLine( mEnd, mStart );

+        mpParent->DrawEllipse( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2)));

+    }

+    UpdateVisibility(); //null_Project

+}

+

+void Connector::UpdateVisibility()

+{

+    bVisible = mpStartWin->IsVisible() && mpEndWin->IsVisible();

+}

+

+

+Point Connector::GetMiddle()

+{

+    Point aStartPoint = mpStartWin->GetPosPixel();

+    Size aStartSize = mpStartWin->GetSizePixel();

+    int nMoveHorz, nMoveVert;

+    aStartPoint.Move( aStartSize.Width() / 2, aStartSize.Height() / 2 );

+

+    Point aEndPoint = mpEndWin->GetPosPixel();

+    Size aEndSize = mpEndWin->GetSizePixel();

+

+    aEndPoint.Move( aEndSize.Width() / 2, aEndSize.Height() / 2 );

+

+    Point aRetPoint = aEndPoint;

+

+    nMoveHorz = aStartPoint.X() - aEndPoint.X();

+    if ( nMoveHorz )

+        nMoveHorz /= 2;

+    nMoveVert = aStartPoint.Y() - aEndPoint.Y();

+    if ( nMoveVert )

+        nMoveVert /= 2;

+    aRetPoint.Move( nMoveHorz, nMoveVert );

+    return aRetPoint;

+

+}

+

+void Connector::Paint( const Rectangle& rRect )

+{

+    //MyApp *pApp = (MyApp*)GetpApp();

+    //SolDep *pSoldep = pApp->GetSolDep();

+    if (msbHideMode)

+    {

+    if (!(mpStartWin->IsNullObject())) //null_project

+    {

+        if ( mpStartWin->GetMarkMode() == 0 || mpStartWin->GetMarkMode() == MARKMODE_DEPENDING )

+        {

+            mpStartWin->SetViewMask(0); //objwin invisible

+        } else

+        {

+            mpStartWin->SetViewMask(1); //objwin visible

+        }

+    }

+    if (!(mpEndWin->IsNullObject()))

+    {

+        if ( mpEndWin->GetMarkMode() == 0 || mpEndWin->GetMarkMode() == MARKMODE_DEPENDING )

+        {

+            mpEndWin->SetViewMask(0); //objwin invisible

+        } else

+        {

+            mpEndWin->SetViewMask(1); //objwin visible

+        }

+    }

+    UpdateVisibility();

+    } else //IsHideMode

+    {

+        //bVisible = TRUE;

+        if (!(mpStartWin->IsNullObject())) //null_project

+        {

+             mpStartWin->SetViewMask(1);

+        }

+        if (!(mpEndWin->IsNullObject())) //null_project

+        {

+             mpEndWin->SetViewMask(1);

+        }

+        UpdateVisibility();

+    }

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

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

+    {

+        mpParent->DrawLine( mEnd, mStart );

+        mpParent->DrawEllipse( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2)));

+    }

+}

+

 void Connector::DrawOutput( OutputDevice* pDevice, const Point& rOffset )

 {

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

@@ -174,102 +174,102 @@ void Connector::DrawOutput( OutputDevice* pDevice, const Point& rOffset )
         pDevice->DrawEllipse( aRect );

     }

 }

-
-void Connector::UpdatePosition( ObjectWin* pWin, BOOL bPaint )
-{
-//  more than one call ?
-//
-    Point OldStart, OldEnd;
-    static ULONG nCallCount = 0;
-
-    //MyApp *pApp = (MyApp*)GetpApp();
-    //SolDep *pSoldep = pApp->GetSolDep();
-    if (msbHideMode)
-        bVisible = 1;
-
-    if ( nCallCount )           // only one call
-        nCallCount++;
-    else
-    {
-        nCallCount++;
-        while ( nCallCount )
-        {
-            if ( bPaint )
-            {
-                OldStart = mStart;
-                OldEnd = mEnd;
-            }
-            mCenter = GetMiddle();
-            mStart=mpStartWin->GetFixPoint( mCenter, bPaint );
-            mEnd=mpEndWin->GetFixPoint( mCenter, bPaint );
-            if ( bPaint )
-            {
-                mpParent->Invalidate( Rectangle( OldStart, OldEnd ));
-                mpParent->Invalidate( Rectangle( OldEnd - Point( 2, 2), OldEnd + Point( 2, 2)));
-//Don't paint "null_project" connectors
-                if ( (mpStartWin->GetBodyText() != ByteString("null")) &&               //null_project
-                     (mpEndWin->GetBodyText() != ByteString("null")))                   //null_project
-                {
-                    Paint ( Rectangle( mEnd - Point( 3, 3), mEnd + Point( 3, 3)));
-                    Paint ( Rectangle( mEnd, mStart ));
-                }
-            }
-            nCallCount--;
-        }
-    }
-}
-
-USHORT Connector::Save( SvFileStream& rOutFile )
-{
-    rOutFile << mpStartWin->GetId();
-    rOutFile << mpEndWin->GetId();
-
-    return 0;
-}
-
-USHORT Connector::Load( SvFileStream& rInFile )
-{
-    rInFile >> mnStartId;
-    rInFile >> mnEndId;
-
-    return 0;
-}
-
-ObjectWin* Connector::GetOtherWin( ObjectWin* pWin )
-{
-// get correspondent object ptr
-    if ( mpStartWin == pWin )
-        return mpEndWin;
-    else
-        if ( mpEndWin == pWin )
-            return mpStartWin;
-
-    return NULL;
-}
-
-ULONG Connector::GetOtherId( ULONG nId )
-{
-// get correspondent object id
-    if ( mnStartId == nId )
-        return mnEndId;
-    else
-        if ( mnEndId == nId )
-            return mnStartId;
-
-    return NULL;
-}
-
-ULONG Connector::GetLen()
-{
-    double dx, dy;
-
-    dx = mStart.X() - mEnd.X();
-    dy = mStart.Y() - mEnd.Y();
-
-    return (ULONG) sqrt( dx * dx + dy * dy );
-}
-
-BOOL Connector::IsStart( ObjectWin* pWin )
-{
-    return pWin == mpStartWin;
-}
+

+void Connector::UpdatePosition( ObjectWin* pWin, BOOL bPaint )

+{

+//  more than one call ?

+//

+    Point OldStart, OldEnd;

+    static ULONG nCallCount = 0;

+

+    //MyApp *pApp = (MyApp*)GetpApp();

+    //SolDep *pSoldep = pApp->GetSolDep();

+    if (msbHideMode)

+        bVisible = 1;

+

+    if ( nCallCount )           // only one call

+        nCallCount++;

+    else

+    {

+        nCallCount++;

+        while ( nCallCount )

+        {

+            if ( bPaint )

+            {

+                OldStart = mStart;

+                OldEnd = mEnd;

+            }

+            mCenter = GetMiddle();

+            mStart=mpStartWin->GetFixPoint( mCenter, bPaint );

+            mEnd=mpEndWin->GetFixPoint( mCenter, bPaint );

+            if ( bPaint )

+            {

+                mpParent->Invalidate( Rectangle( OldStart, OldEnd ));

+                mpParent->Invalidate( Rectangle( OldEnd - Point( 2, 2), OldEnd + Point( 2, 2)));

+//Don't paint "null_project" connectors

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

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

+                {

+                    Paint ( Rectangle( mEnd - Point( 3, 3), mEnd + Point( 3, 3)));

+                    Paint ( Rectangle( mEnd, mStart ));

+                }

+            }

+            nCallCount--;

+        }

+    }

+}

+

+USHORT Connector::Save( SvFileStream& rOutFile )

+{

+    rOutFile << mpStartWin->GetId();

+    rOutFile << mpEndWin->GetId();

+

+    return 0;

+}

+

+USHORT Connector::Load( SvFileStream& rInFile )

+{

+    rInFile >> mnStartId;

+    rInFile >> mnEndId;

+

+    return 0;

+}

+

+ObjectWin* Connector::GetOtherWin( ObjectWin* pWin )

+{

+// get correspondent object ptr

+    if ( mpStartWin == pWin )

+        return mpEndWin;

+    else

+        if ( mpEndWin == pWin )

+            return mpStartWin;

+

+    return NULL;

+}

+

+ULONG Connector::GetOtherId( ULONG nId )

+{

+// get correspondent object id

+    if ( mnStartId == nId )

+        return mnEndId;

+    else

+        if ( mnEndId == nId )

+            return mnStartId;

+

+    return NULL;

+}

+

+ULONG Connector::GetLen()

+{

+    double dx, dy;

+

+    dx = mStart.X() - mEnd.X();

+    dy = mStart.Y() - mEnd.Y();

+

+    return (ULONG) sqrt( dx * dx + dy * dy );

+}

+

+BOOL Connector::IsStart( ObjectWin* pWin )

+{

+    return pWin == mpStartWin;

+}

diff --git a/soldep/source/depapp.cxx b/soldep/source/depapp.cxx
index ab64557dbcf1..6b000cc6fbce 100644
--- a/soldep/source/depapp.cxx
+++ b/soldep/source/depapp.cxx
@@ -1,150 +1,150 @@
-/*************************************************************************
- *
- * 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: depapp.cxx,v $
- * $Revision: 1.6 $
- *
- * 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 "depapp.hxx"
+/*************************************************************************

+ *

+ * 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: depapp.cxx,v $

+ * $Revision: 1.6 $

+ *

+ * 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 "depapp.hxx"

 #include <ucbhelper/contentbroker.hxx>

 #include <ucbhelper/configurationkeys.hxx>

-
-void MyApp::Main()
-{
-#if defined(WNT)
-    pDebugFile = fopen( "fprintf.out", "w" );
-#endif
-
-    pMyApp = GetpApp();
-    MyWin aMainWin( NULL, WB_APP | WB_STDWORK );
-    pAppWindow = &aMainWin;
-   // 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 ));
-    pSolDep->Hide();
-    aMainWin.Show();
-    Help aHelp;
-    SetHelp(&aHelp);
-    aHelp.EnableContextHelp();
-    aHelp.EnableQuickHelp();
-    Execute();
-    delete pResMgr;
-    delete pSolDep;
-}
-
-// -----------------------------------------------------------------------
-
-MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :
-    WorkWindow( pParent, nWinStyle )//,aToolBox( this, DtSodResId(TID_SOLDEP_MAIN)),
-        // depper aTaskBarFrame(this, 0)
-{
-//depper    aTaskBarFrame.EnableAlwaysOnTop();
-
-//depper    aMenuBar.InsertItem( 1, XubString( RTL_CONSTASCII_USTRINGPARAM( "~Source" ) ) );
-//depper    aMenuBar.InsertItem( 2, XubString( RTL_CONSTASCII_USTRINGPARAM( "~Exit" ) ) );
-//depper    SetMenuBar( &aMenuBar );
-//depper    aToolBox.SetPosSizePixel( Point( 0,0 ), Size( 1100,35 ));
-//    aToolBox.Show();
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::MouseMove( const MouseEvent& rMEvt )
-{
-    WorkWindow::MouseMove( rMEvt );
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
-{
-    WorkWindow::MouseButtonDown( rMEvt );
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::MouseButtonUp( const MouseEvent& rMEvt )
-{
-    WorkWindow::MouseButtonUp( rMEvt );
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::KeyInput( const KeyEvent& rKEvt )
-{
-    WorkWindow::KeyInput( rKEvt );
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::KeyUp( const KeyEvent& rKEvt )
-{
-    WorkWindow::KeyUp( rKEvt );
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::Paint( const Rectangle& rRect )
-{
-    WorkWindow::Paint( rRect );
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::Resize()
-{
-    ((MyApp*)GetpApp())->GetSolDep()->Resize();
-    WorkWindow::Resize();
-}
-
-SAL_IMPLEMENT_MAIN()
-{
-    //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 );
-
-    Reference< XMultiServiceFactory > xMS( xComponentContext->getServiceManager(), UNO_QUERY);
-
-    InitVCL( xMS );
-    ::comphelper::setProcessServiceFactory(xMS);
-    com::sun::star::uno::Sequence< com::sun::star::uno::Any > aArgs(2);
+

+void MyApp::Main()

+{

+#if defined(WNT)

+    pDebugFile = fopen( "fprintf.out", "w" );

+#endif

+

+    pMyApp = GetpApp();

+    MyWin aMainWin( NULL, WB_APP | WB_STDWORK );

+    pAppWindow = &aMainWin;

+   // 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 ));

+    pSolDep->Hide();

+    aMainWin.Show();    

+    Help aHelp;

+    SetHelp(&aHelp);

+    aHelp.EnableContextHelp();

+    aHelp.EnableQuickHelp();

+    Execute();

+    delete pResMgr;

+    delete pSolDep;

+}

+

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

+

+MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :

+    WorkWindow( pParent, nWinStyle )//,aToolBox( this, DtSodResId(TID_SOLDEP_MAIN)),

+        // depper aTaskBarFrame(this, 0)

+{

+//depper    aTaskBarFrame.EnableAlwaysOnTop();

+

+//depper    aMenuBar.InsertItem( 1, XubString( RTL_CONSTASCII_USTRINGPARAM( "~Source" ) ) );

+//depper    aMenuBar.InsertItem( 2, XubString( RTL_CONSTASCII_USTRINGPARAM( "~Exit" ) ) );

+//depper    SetMenuBar( &aMenuBar );

+//depper    aToolBox.SetPosSizePixel( Point( 0,0 ), Size( 1100,35 ));

+//    aToolBox.Show();

+}

+

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

+

+void MyWin::MouseMove( const MouseEvent& rMEvt )

+{

+    WorkWindow::MouseMove( rMEvt );

+}

+

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

+

+void MyWin::MouseButtonDown( const MouseEvent& rMEvt )

+{

+    WorkWindow::MouseButtonDown( rMEvt );

+}

+

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

+

+void MyWin::MouseButtonUp( const MouseEvent& rMEvt )

+{

+    WorkWindow::MouseButtonUp( rMEvt );

+}

+

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

+

+void MyWin::KeyInput( const KeyEvent& rKEvt )

+{

+    WorkWindow::KeyInput( rKEvt );

+}

+

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

+

+void MyWin::KeyUp( const KeyEvent& rKEvt )

+{

+    WorkWindow::KeyUp( rKEvt );

+}

+

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

+

+void MyWin::Paint( const Rectangle& rRect )

+{

+    WorkWindow::Paint( rRect );

+}

+

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

+

+void MyWin::Resize()

+{

+    ((MyApp*)GetpApp())->GetSolDep()->Resize();

+    WorkWindow::Resize();

+}

+

+SAL_IMPLEMENT_MAIN()

+{

+    //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 );

+

+    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;
-}
+

+    aMyApp.Main();

+    DeInitVCL();

+    return 0;

+}

diff --git a/soldep/source/objwin.cxx b/soldep/source/objwin.cxx
index 56eacedb4093..baa24d41fce0 100644
--- a/soldep/source/objwin.cxx
+++ b/soldep/source/objwin.cxx
@@ -1,487 +1,487 @@
-/*************************************************************************
- *
- * 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: objwin.cxx,v $
- * $Revision: 1.6 $
- *
- * 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 <tools/list.hxx>
-#include <tools/debug.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/help.hxx>
+/*************************************************************************

+ *

+ * 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: objwin.cxx,v $

+ * $Revision: 1.6 $

+ *

+ * 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 <tools/list.hxx>

+#include <tools/debug.hxx>

+#include <vcl/svapp.hxx>

+#include <vcl/help.hxx>

 #include <vcl/wall.hxx>

-
-#include <soldep/objwin.hxx>
-#include <soldep/depwin.hxx>
-//#include "depapp.hxx"
-#include <soldep/depper.hxx>
-//#include "prjdep.hxx"
-#include <soldep/connctr.hxx>
-#include <stdio.h>
-
-static Color aDefaultColor = 0L;
-static Wallpaper* pDefaultWallpaper = 0L;
-
-// Initialize static class member
-BOOL ObjectWin::msbHideMode = FALSE;
-ULONG ObjectWin::msnGlobalViewMask = 0;
-
-
-UINT32 aColorMap[] = {
-    COL_TRANSPARENT,        //MARKMODE_DEFAULT    0
-    COL_GREEN,              //MARKMODE_DEPENDING  1
-    COL_RED,                //MARKMODE_NEEDED     2
-    COL_MAGENTA,            //1+2
-    COL_YELLOW,             //MARKMODE_ACTIVATED  4
-    COL_LIGHTGREEN,         //1+4
-    COL_LIGHTRED,           //2+4
-    COL_LIGHTMAGENTA,       //1+2+4
-    COL_BLUE,               //MARKMODE_SELECTED   8
-    COL_LIGHTGRAY,          //1+8
-    COL_CYAN,               //2+8
-    COL_LIGHTCYAN,          //1+2+8
-    COL_LIGHTBLUE,          //4+8
-    COL_BROWN,              //1+4+8
-    COL_BLACK,              //2+4+8
-    COL_BLUE                //1+2+4+8
-};
-
-
-//
-// class ObjectWin
-//
-
-/*****************************************************************************/
-ObjectWin::ObjectWin( Window* pParent, WinBits nWinStyle )
-/*****************************************************************************/
-                : Window( pParent, nWinStyle ),
-                msBodyText( "" ),
-                msTipText( "" ),
-                mnObjectId( 0 ),
-                mnMarkMode( 0 ),
-                mnViewMask( 0 ),
-                mbVisible( FALSE ),
-                mbMenuExecute( FALSE ),
-                mbVisited( FALSE ),
-                mnRootDist( 0 ),
-                mnHeadDist( 0 ),
-                mbFixed( FALSE )
-{
-    SetBackground( Wallpaper( Color( COL_WHITE )));
-
-    aTipTimer.SetTimeout( 500 );
-    aTipTimer.SetTimeoutHdl(
-    LINK( this, ObjectWin, TipHdl ));
-
-    SetFont( Font( GetFont() ) );
+

+#include <soldep/objwin.hxx>

+#include <soldep/depwin.hxx>

+//#include "depapp.hxx"

+#include <soldep/depper.hxx>

+//#include "prjdep.hxx"

+#include <soldep/connctr.hxx>

+#include <stdio.h>

+

+static Color aDefaultColor = 0L;

+static Wallpaper* pDefaultWallpaper = 0L;

+

+// Initialize static class member

+BOOL ObjectWin::msbHideMode = FALSE;

+ULONG ObjectWin::msnGlobalViewMask = 0;

+

+

+UINT32 aColorMap[] = {

+    RGB_COLORDATA( 0xFF, 0xFF, 0x80 ),             //MARKMODE_DEFAULT    0

+    COL_GREEN,              //MARKMODE_DEPENDING  1

+    COL_RED,                //MARKMODE_NEEDED     2

+    COL_MAGENTA,            //1+2

+    COL_GRAY,               //MARKMODE_ACTIVATED  4

+    COL_LIGHTGREEN,         //1+4

+    COL_LIGHTRED,           //2+4

+    COL_LIGHTMAGENTA,       //1+2+4

+    COL_BLUE,               //MARKMODE_SELECTED   8

+    COL_LIGHTGRAY,          //1+8

+    COL_CYAN,               //2+8

+    COL_LIGHTCYAN,          //1+2+8

+    COL_LIGHTBLUE,          //4+8

+    COL_BROWN,              //1+4+8

+    COL_BLACK,              //2+4+8

+    COL_BLUE                //1+2+4+8

+};

+

+

+//

+// class ObjectWin

+//

+

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

+ObjectWin::ObjectWin( Window* pParent, WinBits nWinStyle )

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

+                : Window( pParent, nWinStyle ),

+                msBodyText( "" ),

+                msTipText( "" ),

+                mnObjectId( 0 ),

+                mnMarkMode( 0 ),

+                mnViewMask( 0 ),

+                mbVisible( FALSE ),

+                mbMenuExecute( FALSE ),

+                mbVisited( FALSE ),

+                mnRootDist( 0 ),

+                mnHeadDist( 0 ),

+                mbFixed( FALSE )

+{

+    SetBackground( Wallpaper( aColorMap[0] ));

+

+    aTipTimer.SetTimeout( 500 );

+    aTipTimer.SetTimeoutHdl(

+    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_ADD_CONNECTOR, String::CreateFromAscii( "New connection" ));
-    mpPopup->InsertItem( OBJWIN_REMOVE_WIN, String::CreateFromAscii( "Remove object" ));
-    mpPopup->InsertItem( OBJWIN_VIEW_CONTENT, String::CreateFromAscii( "View content" ));
-//  mpPopup->InsertSeparator();
-    mpPopup->SetSelectHdl( LINK( this, ObjectWin, PopupSelected ));
-    mpPopup->SetDeactivateHdl( LINK( this, ObjectWin, PopupDeactivated ));
-    mnPopupStaticItems = mpPopup->GetItemCount();
-
-    if ( ! pDefaultWallpaper )
-    {
-        pDefaultWallpaper = new Wallpaper( GetBackground() );
-        aDefaultColor = GetTextColor();
-    }
-    Hide();
-}
-
-/*****************************************************************************/
-ObjectWin::~ObjectWin()
-/*****************************************************************************/
-{
-    while ( mConnections.Count() > 0 )
-    {
-        delete mConnections.GetObject( 0 );
-    }
-}
-
-void ObjectWin::SetHideMode(BOOL bHide)
-{
-    msbHideMode = bHide;
-    mConnections.GetObject(0)->SetHideMode(msbHideMode);
-}
-
-BOOL ObjectWin::ToggleHideMode()
-{
-    msbHideMode = !msbHideMode;
-    mConnections.GetObject(0)->SetHideMode(msbHideMode);
-    return msbHideMode;
-}
-
-/*****************************************************************************/
-void ObjectWin::SetViewMask( ULONG nMask )
-/*****************************************************************************/
-{
-    mnViewMask = nMask;
-    // Compares
-    if ( mnViewMask & msnGlobalViewMask) {
-        mbVisible = TRUE;
-        Show();
-    }
-    else {
-        Hide();
-        mbVisible = FALSE;
-    }
-    for ( ULONG i = 0; i < mConnections.Count(); i++ )
-        mConnections.GetObject( i )->UpdateVisibility();
-}
-
-/*****************************************************************************/
-void ObjectWin::SetBodyText( const ByteString& rNewString )
-/*****************************************************************************/
-{
-    msBodyText = rNewString;
-}
-
-/*****************************************************************************/
-ByteString& ObjectWin::GetBodyText()
-/*****************************************************************************/
-{
-    return msBodyText;
-}
-
-/*****************************************************************************/
-void ObjectWin::SetTipText( const ByteString& rNewString )
-/*****************************************************************************/
-{
-    msTipText = rNewString;
-}
-
-/*****************************************************************************/
-ByteString& ObjectWin::GetTipText()
-/*****************************************************************************/
-{
-    return msTipText;
-}
-
-/*****************************************************************************/
-Point ObjectWin::GetFixPoint( const Point& rRefPoint, BOOL bUseRealPos )
-/*****************************************************************************/
-{
-    Point aLocalPoint;
-    if ( bUseRealPos )
-        aLocalPoint = GetPosPixel();
-    else
-        aLocalPoint = GetCalcPosPixel();
-
-    Size aLocalSize = GetSizePixel();
-    Point aRetPoint;
-
-    USHORT nRefX = aLocalPoint.X() + aLocalSize.Width() / 2 ;
-    USHORT nRefY = aLocalPoint.Y() + aLocalSize.Height() / 2 ;
-
-    // always false...
-    //if ( nRefX < 0 ) nRefX = 0;
-    //if ( nRefY < 0 ) nRefY = 0;
-
-    if ( rRefPoint.X() > nRefX )
-    {
-        if ( rRefPoint.Y() > nRefY )
-        {
-            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))
-            {
-                aRetPoint.X() = aLocalPoint.X() + aLocalSize.Width();
-                aRetPoint.Y() = nRefY;
-            }
-            else
-            {
-                aRetPoint.X() = nRefX;
-                aRetPoint.Y() = aLocalPoint.Y() + aLocalSize.Height();
-            }
-        }
-        else
-        {
-            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))
-            {
-                aRetPoint.X() = aLocalPoint.X() + aLocalSize.Width();
-                aRetPoint.Y() = nRefY;
-            }
-            else
-            {
-                aRetPoint.X() = nRefX;
-                aRetPoint.Y() = aLocalPoint.Y();
-            }
-        }
-    }
-    else
-    {
-        if ( rRefPoint.Y() > nRefY )
-        {
-            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))
-            {
-                aRetPoint.X() = aLocalPoint.X();
-                aRetPoint.Y() = nRefY;
-            }
-            else
-            {
-                aRetPoint.X() = nRefX;
-                aRetPoint.Y() = aLocalPoint.Y() + aLocalSize.Height();
-            }
-        }
-        else
-        {
-            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))
-            {
-                aRetPoint.X() = aLocalPoint.X();
-                aRetPoint.Y() = nRefY;
-            }
-            else
-            {
-                aRetPoint.X() = nRefX;
-                aRetPoint.Y() = aLocalPoint.Y();
-            }
-        }
-    }
-
-    return PixelToLogic(aRetPoint);
-
-}
-
-/*****************************************************************************/
-void ObjectWin::AddConnector( Connector* pNewCon )
-/*****************************************************************************/
-{
-    mConnections.Insert( pNewCon );
-}
-
-/*****************************************************************************/
-BOOL ObjectWin::ConnectionExistsInAnyDirection( ObjectWin *pWin )
-/*****************************************************************************/
-{
-    for ( ULONG i = 0; i < mConnections.Count(); i++ )
-        if ( mConnections.GetObject( i )->GetOtherWin( this ) == pWin )
-            return TRUE;
-
-    return FALSE;
-}
-
-/*****************************************************************************/
-void ObjectWin::RemoveConnector( Connector* pOldCon )
-/*****************************************************************************/
-{
-    mConnections.Remove( pOldCon );
-}
-
-/*****************************************************************************/
-Connector* ObjectWin::GetConnector( ULONG nIndex )
-/*****************************************************************************/
-{
-    ULONG nConCount = mConnections.Count();
-
-    if ( nIndex < nConCount )
-        return mConnections.GetObject( nIndex );
-    return NULL;
-}
-
-/*****************************************************************************/
-Connector* ObjectWin::GetConnector( ULONG nStartId, ULONG nEndId )
-/*****************************************************************************/
-{
-    if ( mnObjectId != nStartId )
-        return NULL;
-
-    USHORT i;
-    Connector* pCon;
-    ULONG nConCount = mConnections.Count();
-
-    for ( i = 0; i < nConCount; i++ )
-    {
-        pCon = mConnections.GetObject( i );
-        if ( pCon->GetOtherWin( this )->GetId() == nEndId )
-            return pCon;
-    }
-    return NULL;
-}
-
-void ObjectWin::SetAllConnectorsUnvisible()
-{
-    Connector* pCon;
-    ULONG nConCount = mConnections.Count();
-    for ( ULONG i = 0; i < nConCount; i++ )
-    {
-        pCon = mConnections.GetObject( i );
-        if (pCon) pCon->SetVisibility( FALSE );
-    }
-}
-
-/*****************************************************************************/
-void ObjectWin::SetMarkMode( ULONG nMarkMode )
-/*****************************************************************************/
-{
-    //Wallpaper aWallpaper;
-
-    if ( nMarkMode == MARKMODE_DEFAULT )
-    {
-        if ( pDefaultWallpaper )
-        {
-            maObjWallpaper = GetBackground();
-            maObjWallpaper.SetColor( pDefaultWallpaper->GetColor() );
-            SetBackground( maObjWallpaper );
-            SetTextColor( aDefaultColor );
-        }
-    }
-    else
-    {
-        mnMarkMode |= nMarkMode;
-        maObjWallpaper = GetBackground();
-        maObjWallpaper.SetColor( aColorMap[ mnMarkMode ] );
-        SetBackground( maObjWallpaper );
-        SetTextColor( COL_WHITE );
-    }
-
-    Invalidate();
-}
-
-/*****************************************************************************/
-void ObjectWin::UnsetMarkMode( ULONG nMarkMode )
-/*****************************************************************************/
-{
-    //Wallpaper aWallpaper;
-
-    ULONG nOldMode = mnMarkMode;
-    mnMarkMode &= ( !nMarkMode );
-
-    if ( nOldMode != mnMarkMode ) {
-        if ( mnMarkMode == MARKMODE_DEFAULT )
-        {
-            if ( pDefaultWallpaper )
-            {
-                maObjWallpaper = GetBackground();
-                maObjWallpaper.SetColor( pDefaultWallpaper->GetColor() );
-                SetBackground( maObjWallpaper );
-                SetTextColor( aDefaultColor );
-            }
-        }
-        else
-        {
-            maObjWallpaper = GetBackground();
-            maObjWallpaper.SetColor( aColorMap[ mnMarkMode ] ); //mnMarkMode
-            SetBackground( maObjWallpaper );
-            SetTextColor( COL_WHITE );
-        }
-        Invalidate();
-    }
-}
-
-/*****************************************************************************/
-void ObjectWin::MarkNeeded( BOOL bReset )
-/*****************************************************************************/
-{
-    Connector* pCon;
-    ObjectWin* pWin;
-
-    ULONG nConCount = mConnections.Count();
-    ULONG i;
-
-    for ( i = 0; i < nConCount; i++ )
-    {
-        pCon = mConnections.GetObject( i );
-        if ( pCon && !pCon->IsStart( this))
-        {
-            pWin = pCon->GetOtherWin( this );
-            if ( pWin )
-            {
-                if ( bReset )
-                    pWin->UnsetMarkMode( MARKMODE_NEEDED );
-                else
-                    pWin->SetMarkMode( MARKMODE_NEEDED );
-                pWin->MarkNeeded( bReset );                    // recursive call
-            }
-        }
-    }
-}
-
-/*****************************************************************************/
-void ObjectWin::MarkDepending( BOOL bReset )
-/*****************************************************************************/
-{
-    //if ( !bReset )
-    //  return;
-
-    Connector* pCon;
-    ObjectWin* pWin;
-
-    ULONG nConCount = mConnections.Count();
-    ULONG i;
-
-    for ( i = 0; i < nConCount; i++ )
-    {
-        pCon = mConnections.GetObject( i );
-        if ( pCon && pCon->IsStart( this) )
-        {
-            pWin = pCon->GetOtherWin( this );
-            if ( pWin )
-            {
-                if ( bReset )
-                    pWin->UnsetMarkMode( MARKMODE_DEPENDING );
-                else
-                    pWin->SetMarkMode( MARKMODE_DEPENDING );
-                pWin->MarkDepending( bReset );                  // recursive call
-            }
-        }
-    }
-}
-
-/*****************************************************************************/
-void ObjectWin::Paint( const Rectangle& rRect )
-/*****************************************************************************/
-{
-    Size  aWinSize  = PixelToLogic( GetOutputSizePixel() );
-    Size  aTextSize;
-    ByteString sbt = msBodyText;                         //debug
-    //sbt += " ";                                         //debug
-    //sbt += ByteString::CreateFromInt32(mnMarkMode);     //debug
-    aTextSize.Width() = GetTextWidth( String( msBodyText, RTL_TEXTENCODING_UTF8 ));
-    aTextSize.Height() = GetTextHeight();
-    Point aPos( aWinSize.Width() / 2  - aTextSize.Width() / 2,
-                aWinSize.Height() / 2 - aTextSize.Height() / 2 );
-
-    //DrawText( aPos , String( sBodyText, RTL_TEXTENCODING_UTF8 ));
-    if (msBodyText =="null") //don't paint this "window"
-    {
-        Hide();
-        Invalidate();
-    } else
-        DrawText( aPos , String( sbt, RTL_TEXTENCODING_UTF8 )); //debug
-}
-
+    SetFont( aFont );

+

+    EnableClipSiblings();

+    SetZOrder( NULL, WINDOW_ZORDER_FIRST );

+    mpPopup = new PopupMenu();

+    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" ));

+//  mpPopup->InsertSeparator();

+    mpPopup->SetSelectHdl( LINK( this, ObjectWin, PopupSelected ));

+    mpPopup->SetDeactivateHdl( LINK( this, ObjectWin, PopupDeactivated ));

+    mnPopupStaticItems = mpPopup->GetItemCount();

+

+    if ( ! pDefaultWallpaper )

+    {

+        pDefaultWallpaper = new Wallpaper( GetBackground() );

+        aDefaultColor = GetTextColor();

+    }

+    Hide();

+}

+

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

+ObjectWin::~ObjectWin()

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

+{

+    while ( mConnections.Count() > 0 )

+    {

+        delete mConnections.GetObject( 0 );

+    }

+}

+

+void ObjectWin::SetHideMode(BOOL bHide)

+{

+    msbHideMode = bHide;

+    mConnections.GetObject(0)->SetHideMode(msbHideMode);

+}

+

+BOOL ObjectWin::ToggleHideMode()

+{

+    msbHideMode = !msbHideMode;

+    mConnections.GetObject(0)->SetHideMode(msbHideMode);

+    return msbHideMode;

+}

+

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

+void ObjectWin::SetViewMask( ULONG nMask )

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

+{

+    mnViewMask = nMask;

+    // Compares

+    if ( mnViewMask & msnGlobalViewMask) {

+        mbVisible = TRUE;

+        Show();

+    }

+    else {

+        Hide();

+        mbVisible = FALSE;

+    }

+    for ( ULONG i = 0; i < mConnections.Count(); i++ )

+        mConnections.GetObject( i )->UpdateVisibility();

+}

+

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

+void ObjectWin::SetBodyText( const ByteString& rNewString )

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

+{

+    msBodyText = rNewString;

+}

+

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

+ByteString& ObjectWin::GetBodyText()

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

+{

+    return msBodyText;

+}

+

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

+void ObjectWin::SetTipText( const ByteString& rNewString )

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

+{

+    msTipText = rNewString;

+}

+

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

+ByteString& ObjectWin::GetTipText()

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

+{

+    return msTipText;

+}

+

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

+Point ObjectWin::GetFixPoint( const Point& rRefPoint, BOOL bUseRealPos )

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

+{

+    Point aLocalPoint;

+    if ( bUseRealPos )

+        aLocalPoint = GetPosPixel();

+    else

+        aLocalPoint = GetCalcPosPixel();

+

+    Size aLocalSize = GetSizePixel();

+    Point aRetPoint;

+

+    USHORT nRefX = aLocalPoint.X() + aLocalSize.Width() / 2 ;

+    USHORT nRefY = aLocalPoint.Y() + aLocalSize.Height() / 2 ;

+

+    // always false...

+    //if ( nRefX < 0 ) nRefX = 0;

+    //if ( nRefY < 0 ) nRefY = 0;

+

+    if ( rRefPoint.X() > nRefX )

+    {

+        if ( rRefPoint.Y() > nRefY )

+        {

+            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))

+            {

+                aRetPoint.X() = aLocalPoint.X() + aLocalSize.Width();

+                aRetPoint.Y() = nRefY;

+            }

+            else

+            {

+                aRetPoint.X() = nRefX;

+                aRetPoint.Y() = aLocalPoint.Y() + aLocalSize.Height();

+            }

+        }

+        else

+        {

+            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))

+            {

+                aRetPoint.X() = aLocalPoint.X() + aLocalSize.Width();

+                aRetPoint.Y() = nRefY;

+            }

+            else

+            {

+                aRetPoint.X() = nRefX;

+                aRetPoint.Y() = aLocalPoint.Y();

+            }

+        }

+    }

+    else

+    {

+        if ( rRefPoint.Y() > nRefY )

+        {

+            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))

+            {

+                aRetPoint.X() = aLocalPoint.X();

+                aRetPoint.Y() = nRefY;

+            }

+            else

+            {

+                aRetPoint.X() = nRefX;

+                aRetPoint.Y() = aLocalPoint.Y() + aLocalSize.Height();

+            }

+        }

+        else

+        {

+            if  ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))

+            {

+                aRetPoint.X() = aLocalPoint.X();

+                aRetPoint.Y() = nRefY;

+            }

+            else

+            {

+                aRetPoint.X() = nRefX;

+                aRetPoint.Y() = aLocalPoint.Y();

+            }

+        }

+    }

+

+    return PixelToLogic(aRetPoint);

+

+}

+

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

+void ObjectWin::AddConnector( Connector* pNewCon )

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

+{

+    mConnections.Insert( pNewCon );

+}

+

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

+BOOL ObjectWin::ConnectionExistsInAnyDirection( ObjectWin *pWin )

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

+{

+    for ( ULONG i = 0; i < mConnections.Count(); i++ )

+        if ( mConnections.GetObject( i )->GetOtherWin( this ) == pWin )

+            return TRUE;

+

+    return FALSE;

+}

+

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

+void ObjectWin::RemoveConnector( Connector* pOldCon )

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

+{

+    mConnections.Remove( pOldCon );

+}

+

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

+Connector* ObjectWin::GetConnector( ULONG nIndex )

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

+{

+    ULONG nConCount = mConnections.Count();

+

+    if ( nIndex < nConCount )

+        return mConnections.GetObject( nIndex );

+    return NULL;

+}

+

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

+Connector* ObjectWin::GetConnector( ULONG nStartId, ULONG nEndId )

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

+{

+    if ( mnObjectId != nStartId )

+        return NULL;

+

+    USHORT i;

+    Connector* pCon;

+    ULONG nConCount = mConnections.Count();

+

+    for ( i = 0; i < nConCount; i++ )

+    {

+        pCon = mConnections.GetObject( i );

+        if ( pCon->GetOtherWin( this )->GetId() == nEndId )

+            return pCon;

+    }

+    return NULL;

+}

+

+void ObjectWin::SetAllConnectorsUnvisible()

+{

+    Connector* pCon;

+    ULONG nConCount = mConnections.Count();

+    for ( ULONG i = 0; i < nConCount; i++ )

+    {

+        pCon = mConnections.GetObject( i );

+        if (pCon) pCon->SetVisibility( FALSE );

+    }

+}

+

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

+void ObjectWin::SetMarkMode( ULONG nMarkMode )

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

+{

+    //Wallpaper aWallpaper;

+

+    if ( nMarkMode == MARKMODE_DEFAULT )

+    {

+        if ( pDefaultWallpaper )

+        {

+            maObjWallpaper = GetBackground();

+            maObjWallpaper.SetColor( pDefaultWallpaper->GetColor() );

+            SetBackground( maObjWallpaper );

+            SetTextColor( aDefaultColor );

+        }

+    }

+    else

+    {

+        mnMarkMode |= nMarkMode;

+        maObjWallpaper = GetBackground();

+        maObjWallpaper.SetColor( aColorMap[ mnMarkMode ] );

+        SetBackground( maObjWallpaper );

+        SetTextColor( COL_WHITE );

+    }

+

+    Invalidate();

+}

+

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

+void ObjectWin::UnsetMarkMode( ULONG nMarkMode )

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

+{

+    //Wallpaper aWallpaper;

+

+    ULONG nOldMode = mnMarkMode;

+    mnMarkMode &= ( !nMarkMode );

+

+    if ( nOldMode != mnMarkMode ) {

+        if ( mnMarkMode == MARKMODE_DEFAULT )

+        {

+            if ( pDefaultWallpaper )

+            {

+                maObjWallpaper = GetBackground();

+                maObjWallpaper.SetColor( pDefaultWallpaper->GetColor() );

+                SetBackground( maObjWallpaper );

+                SetTextColor( aDefaultColor );

+            }

+        }

+        else

+        {

+            maObjWallpaper = GetBackground();

+            maObjWallpaper.SetColor( aColorMap[ mnMarkMode ] ); //mnMarkMode

+            SetBackground( maObjWallpaper );

+            SetTextColor( COL_WHITE );

+        }

+        Invalidate();

+    }

+}

+

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

+void ObjectWin::MarkNeeded( BOOL bReset )

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

+{

+    Connector* pCon;

+    ObjectWin* pWin;

+

+    ULONG nConCount = mConnections.Count();

+    ULONG i;

+

+    for ( i = 0; i < nConCount; i++ )

+    {

+        pCon = mConnections.GetObject( i );

+        if ( pCon && !pCon->IsStart( this))

+        {

+            pWin = pCon->GetOtherWin( this );

+            if ( pWin )

+            {

+                if ( bReset )

+                    pWin->UnsetMarkMode( MARKMODE_NEEDED );

+                else

+                    pWin->SetMarkMode( MARKMODE_NEEDED );

+                pWin->MarkNeeded( bReset );                    // recursive call

+            }

+        }

+    }

+}

+

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

+void ObjectWin::MarkDepending( BOOL bReset )

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

+{

+    //if ( !bReset )

+    //  return;

+

+    Connector* pCon;

+    ObjectWin* pWin;

+

+    ULONG nConCount = mConnections.Count();

+    ULONG i;

+

+    for ( i = 0; i < nConCount; i++ )

+    {

+        pCon = mConnections.GetObject( i );

+        if ( pCon && pCon->IsStart( this) )

+        {

+            pWin = pCon->GetOtherWin( this );

+            if ( pWin )

+            {

+                if ( bReset )

+                    pWin->UnsetMarkMode( MARKMODE_DEPENDING );

+                else

+                    pWin->SetMarkMode( MARKMODE_DEPENDING );

+                pWin->MarkDepending( bReset );                  // recursive call

+            }

+        }

+    }

+}

+

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

+void ObjectWin::Paint( const Rectangle& rRect )

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

+{

+    Size  aWinSize  = PixelToLogic( GetOutputSizePixel() );

+    Size  aTextSize;

+    ByteString sbt = msBodyText;                         //debug

+    //sbt += " ";                                         //debug

+    //sbt += ByteString::CreateFromInt32(mnMarkMode);     //debug

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

+    aTextSize.Height() = GetTextHeight();

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

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

+

+    //DrawText( aPos , String( sBodyText, RTL_TEXTENCODING_UTF8 ));

+    if (msBodyText =="null") //don't paint this "window"

+    {

+        Hide();

+        Invalidate();

+    } else

+        DrawText( aPos , String( sbt, RTL_TEXTENCODING_UTF8 )); //debug

+}

+

 void ObjectWin::DrawOutput( OutputDevice* pDevice, const Point& rOffset )

 /*****************************************************************************/

 {

@@ -508,291 +508,317 @@ void ObjectWin::DrawOutput( OutputDevice* pDevice, const Point& rOffset )
         pDevice->SetTextColor( GetTextColor() );

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

     }

-}
-
-/*****************************************************************************/
-void ObjectWin::MouseButtonDown( const MouseEvent& rMEvt )
-/*****************************************************************************/
-{
-    //Notify Soldep to clear ObjectList
-    SetZOrder( NULL, WINDOW_ZORDER_FIRST );
-    GrabFocus();
-
-    // workaround fuer vcl-bug
-//  GetWindow( WINDOW_REALPARENT)->Invalidate();
-//    MyApp *pApp = (MyApp*)GetpApp();
-//    SolDep *pSoldep = pApp->GetSolDep();
-
-    maMouseOffset = rMEvt.GetPosPixel();
-    if ( rMEvt.IsLeft() )
-    {
-
-        if ( rMEvt.IsMod2() )               // alt + mouse click left
-        {
-            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN_ALT, this );
-        }
-        else {
-            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN, this );
-        }
-        if( rMEvt.GetClicks() == 2 )
-            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN_DBLCLICK, this );
-        else if ( !rMEvt.IsShift() && !((DepWin*)GetParent())->IsStartNewCon())
-        {
-            //((DepWin*)GetParent())->SaveSelectedObjWin(&this);
-            CaptureMouse();
-        }
-    }
-}
-
-/*****************************************************************************/
-void ObjectWin::MouseButtonUp( const MouseEvent& rMEvt )
-/*****************************************************************************/
-{
-    fprintf(stdout,"ObjectWin::MouseButtonUp\n");
-    if ( rMEvt.IsLeft() )
-    {
-        if ( rMEvt.IsShift() || ((DepWin*)GetParent())->IsStartNewCon())
-            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_UP_SHFT, this );
-//          ((DepWin*)GetParent())->NewConnector( this );
-        else
-        {
-            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_UP, this );
-            if ( IsMouseCaptured() ) ReleaseMouse();
-        }
-    }
-    else if ( rMEvt.IsRight() )
-    {
-        USHORT i;
-
-        while ( mnPopupStaticItems < mpPopup->GetItemCount() )
-        {
-            mpPopup->RemoveItem( mnPopupStaticItems );
-        }
-
-        if ( mConnections.Count()) {
-            mpPopup->InsertSeparator();
-
-            for( i = 0; i < mConnections.Count() ; i++ )
-            {
-                mpPopup->InsertItem( mnPopupStaticItems + i + 1, String( ((mConnections.GetObject( i ))->GetOtherWin( this ))->GetBodyText(), RTL_TEXTENCODING_UTF8 ));
-            }
-        }
-        mbMenuExecute = TRUE;
-        mpPopup->Execute( GetParent(), rMEvt.GetPosPixel() + GetPosPixel());
-    }
-}
-
-/*****************************************************************************/
-void ObjectWin::MouseMove( const MouseEvent& rMEvt )
-/*****************************************************************************/
-{
-    if ( IsMouseCaptured() )
-    {
-        USHORT i;
-
-        Point aNewWinPos( GetPosPixel() + rMEvt.GetPosPixel() - maMouseOffset );
-
-        aNewWinPos.X() = Max( 0L, aNewWinPos.X());
-        aNewWinPos.Y() = Max( 0L, aNewWinPos.Y());
-        SetPosPixel( aNewWinPos );
-        //int t = mConnections.Count();
-
-        for ( i=0; i < mConnections.Count();i++)
-        {
-            mConnections.GetObject( i )->UpdatePosition( this );
-        }
-    }
-    else // !IsMouseCaptured()
-    {
-        if ( rMEvt.IsLeaveWindow() )
-            aTipTimer.Stop();
-        else
-            aTipTimer.Start();
-
-        MouseEvent aNewMEvt( rMEvt.GetPosPixel() + GetPosPixel());
-
-        GetParent()->MouseMove( aNewMEvt ); //call to DepWin::MouseMove
-    }
-}
-
-/*****************************************************************************/
-USHORT ObjectWin::Save( SvFileStream& rOutFile )
-/*****************************************************************************/
-{
-    return 0;
-}
-
-/*****************************************************************************/
-USHORT ObjectWin::Load( SvFileStream& rInFile )
-/*****************************************************************************/
-{
-    return 0;
-}
-
-/*****************************************************************************/
-void ObjectWin::SetId( ULONG nId )
-/*****************************************************************************/
-{
-    mnObjectId = nId;
-}
-
-/*****************************************************************************/
-ULONG ObjectWin::GetId()
-/*****************************************************************************/
-{
-    return mnObjectId;
-}
-
-/*****************************************************************************/
-void ObjectWin::UpdateConnectors()
-/*****************************************************************************/
-{
-    USHORT i;
-
-    for ( i = 0; i < mConnections.Count(); i++ )
-    {
-        mConnections.GetObject( i )->UpdatePosition( this );
-    }
-}
-
-IMPL_LINK( ObjectWin, PopupSelected, PopupMenu*, mpPopup_l )
-{
-    USHORT nItemId = mpPopup_l->GetCurItemId();
-
-    switch( nItemId )
-    {
-        case OBJWIN_EDIT_TEXT :
-            DBG_ASSERT( FALSE,"edit");
-                break;
-        case OBJWIN_REMOVE_WIN :
-//          DBG_ASSERT( FALSE,"remove");
-//          DBG_ASSERT( mpDepperDontuseme,"remove");
-            //mpDepperDontuseme->RemoveObject(mpDepperDontuseme->mpObjectList, ( USHORT ) GetId());
-                break;
-        case OBJWIN_ADD_CONNECTOR :
-//          DBG_ASSERT( FALSE,"add con");
-            ((DepWin*)GetParent())->NewConnector( this );
-                break;
-        case OBJWIN_VIEW_CONTENT :
-//          DBG_ASSERT( FALSE,"view cnt");
-//          mpDepperDontuseme->ViewContent( msBodyText );
-//          TBD: CallEventListener
-                break;
-        default :
-//          DBG_ASSERT( FALSE, String (nItemId) );
-            Connector* pCon = mConnections.GetObject( nItemId - mnPopupStaticItems - 1);
-            pCon = 0;
-//          delete pCon;
-//          mpDepperDontuseme->RemoveConnector( pCon->GetStartId(), pCon->GetEndId());
-//          TBD: CallEventListener
-
-                break;
-    }
-    return 0;
-}
-
-/*****************************************************************************/
-IMPL_LINK( ObjectWin, TipHdl, void *, EMTY_ARG )
-/*****************************************************************************/
-{
-    aTipTimer.Stop();
-
-    if ( msTipText.Len()) {
-        Point aPos( GetpApp()->GetAppWindow()->GetPointerPosPixel());
-        Help::ShowBalloon( GetpApp()->GetAppWindow(),
-            Point( aPos.X(), aPos.Y()),
-            String( msTipText, RTL_TEXTENCODING_UTF8 ));
-    }
-    return 0;
-}
-
-/*****************************************************************************/
-//void ObjectWin::GetFocus()
-/*****************************************************************************/
-//{
-    //SetMarkMode( MARKMODE_SELECTED );
-//}
-
-/*****************************************************************************/
-void ObjectWin::LoseFocus()
-/*****************************************************************************/
-{
-    if ( !mbMenuExecute && !msbHideMode ) {
-        UnsetMarkMode( MARKMODE_SELECTED );
-        UnsetMarkMode( MARKMODE_ACTIVATED );
-        MarkNeeded( TRUE );
-        MarkDepending( TRUE );
-    }
-    else
-        mbMenuExecute = FALSE;
-}
-
-/*****************************************************************************/
-IMPL_LINK( ObjectWin, PopupDeactivated, PopupMenu*, mpPopup_l )
-/*****************************************************************************/
-{
-    mbMenuExecute = FALSE;
-
-    if ( !HasFocus()) {
-        UnsetMarkMode( MARKMODE_SELECTED );
-        UnsetMarkMode( MARKMODE_ACTIVATED );
-           MarkNeeded( TRUE );
-        MarkDepending( TRUE );
-    }
-
-    return 0;
-}
-
-/*****************************************************************************/
-void ObjectWin::Command( const CommandEvent& rEvent)
-/*****************************************************************************/
-{
-    fprintf(stdout, "ObjectWin::Command");
-//  mpDepperDontuseme->GetGraphWin()->Command( rEvent );
-//          TBD: CallEventListener
-
-}
-
-/*****************************************************************************/
-/*****************************************************************************/
-
-ObjectList::ObjectList() : ObjWinList()
-{
-}
-
-/*****************************************************************************/
-void ObjectList::ResetSelectedObject()
-/*****************************************************************************/
-{
-//    return;
-
-    ULONG nCount_l = Count();
-    ObjectWin* pObjectWin = NULL;
-    for (ULONG i=0; i < nCount_l; i++ )
-    {
-        pObjectWin = GetObject( i );
-        pObjectWin->UnsetMarkMode( MARKMODE_SELECTED );
-        pObjectWin->UnsetMarkMode( MARKMODE_NEEDED );
-        pObjectWin->UnsetMarkMode( MARKMODE_DEPENDING );
-        pObjectWin->SetActualWallpaper(*pDefaultWallpaper);
-        pObjectWin->SetAllConnectorsUnvisible();
-    }
-    return;
-}
-
-/*****************************************************************************/
-ObjectWin* ObjectList::GetPtrByName( const ByteString& rText )
-/*****************************************************************************/
-{
-    ULONG i = 0;
-    ULONG nCount_l = Count();
-    ObjectWin* pObjectWin = NULL;
-    while ( i < nCount_l )
-    {
-       pObjectWin = GetObject( i );
-       ByteString sPrj = pObjectWin->GetBodyText();
-       if (sPrj == rText) return pObjectWin;
-       i++;
-    }
-    return 0;
+}

+

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

+void ObjectWin::MouseButtonDown( const MouseEvent& rMEvt )

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

+{

+    //Notify Soldep to clear ObjectList

+    SetZOrder( NULL, WINDOW_ZORDER_FIRST );

+    GrabFocus();

+

+    // workaround fuer vcl-bug

+//  GetWindow( WINDOW_REALPARENT)->Invalidate();

+//    MyApp *pApp = (MyApp*)GetpApp();

+//    SolDep *pSoldep = pApp->GetSolDep();

+

+    maMouseOffset = rMEvt.GetPosPixel();

+    if ( rMEvt.IsLeft() )

+    {

+

+        if ( rMEvt.IsMod2() )               // alt + mouse click left

+        {

+            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN_ALT, this );

+        }

+        else {

+            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN, this );

+        }

+        if( rMEvt.GetClicks() == 2 )

+            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN_DBLCLICK, this );

+        else if ( !rMEvt.IsShift() && !((DepWin*)GetParent())->IsStartNewCon())

+        {

+            //((DepWin*)GetParent())->SaveSelectedObjWin(&this);

+            CaptureMouse();

+        }

+    }

+}

+

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

+void ObjectWin::MouseButtonUp( const MouseEvent& rMEvt )

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

+{

+    fprintf(stdout,"ObjectWin::MouseButtonUp\n");

+    if ( rMEvt.IsLeft() )

+    {

+        if ( rMEvt.IsShift() || ((DepWin*)GetParent())->IsStartNewCon())

+            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_UP_SHFT, this );

+//          ((DepWin*)GetParent())->NewConnector( this );

+        else

+        {

+            CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_UP, this );

+            if ( IsMouseCaptured() ) ReleaseMouse();

+        }

+    }

+    else if ( rMEvt.IsRight() )

+    {

+        USHORT i;

+

+        while ( mnPopupStaticItems < mpPopup->GetItemCount() )

+        {

+            mpPopup->RemoveItem( mnPopupStaticItems );

+        }

+

+        if ( mConnections.Count()) {

+            mpPopup->InsertSeparator();

+

+            for( i = 0; i < mConnections.Count() ; i++ )

+            {

+                mpPopup->InsertItem( mnPopupStaticItems + i + 1, String( ((mConnections.GetObject( i ))->GetOtherWin( this ))->GetBodyText(), RTL_TEXTENCODING_UTF8 ));

+            }

+        }

+        mbMenuExecute = TRUE;

+        mpPopup->Execute( GetParent(), rMEvt.GetPosPixel() + GetPosPixel());

+    }

+}

+

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

+void ObjectWin::MouseMove( const MouseEvent& rMEvt )

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

+{

+    if ( IsMouseCaptured() )

+    {

+        USHORT i;

+

+        Point aNewWinPos( GetPosPixel() + rMEvt.GetPosPixel() - maMouseOffset );

+

+        aNewWinPos.X() = Max( 0L, aNewWinPos.X());

+        aNewWinPos.Y() = Max( 0L, aNewWinPos.Y());

+        SetPosPixel( aNewWinPos );

+        //int t = mConnections.Count();

+

+        for ( i=0; i < mConnections.Count();i++)

+        {

+            mConnections.GetObject( i )->UpdatePosition( this );

+        }

+    }

+    else // !IsMouseCaptured()

+    {

+        if ( rMEvt.IsLeaveWindow() )

+            aTipTimer.Stop();

+        else

+            aTipTimer.Start();

+

+        MouseEvent aNewMEvt( rMEvt.GetPosPixel() + GetPosPixel());

+

+        GetParent()->MouseMove( aNewMEvt ); //call to DepWin::MouseMove

+    }

+}

+

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

+USHORT ObjectWin::Save( SvFileStream& rOutFile )

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

+{

+    return 0;

+}

+

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

+USHORT ObjectWin::Load( SvFileStream& rInFile )

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

+{

+    return 0;

+}

+

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

+void ObjectWin::SetId( ULONG nId )

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

+{

+    mnObjectId = nId;

+}

+

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

+ULONG ObjectWin::GetId()

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

+{

+    return mnObjectId;

+}

+

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

+void ObjectWin::UpdateConnectors()

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

+{

+    USHORT i;

+

+    for ( i = 0; i < mConnections.Count(); i++ )

+    {

+        mConnections.GetObject( i )->UpdatePosition( this );

+    }

+}

+

+IMPL_LINK( ObjectWin, PopupSelected, PopupMenu*, mpPopup_l )

+{

+    USHORT nItemId = mpPopup_l->GetCurItemId();

+

+    switch( nItemId )

+    {

+        case OBJWIN_EDIT_TEXT :

+            DBG_ASSERT( FALSE,"edit");

+                break;

+        case OBJWIN_REMOVE_WIN :

+//          DBG_ASSERT( FALSE,"remove");

+//          DBG_ASSERT( mpDepperDontuseme,"remove");

+            //mpDepperDontuseme->RemoveObject(mpDepperDontuseme->mpObjectList, ( USHORT ) GetId());

+                break;

+        case OBJWIN_ADD_CONNECTOR :

+//          DBG_ASSERT( FALSE,"add con");

+            ((DepWin*)GetParent())->NewConnector( this );

+                break;

+        case OBJWIN_VIEW_CONTENT :

+//          DBG_ASSERT( FALSE,"view cnt");

+//          mpDepperDontuseme->ViewContent( msBodyText );

+//          TBD: CallEventListener

+                break;

+        default :

+//          DBG_ASSERT( FALSE, String (nItemId) );

+            Connector* pCon = mConnections.GetObject( nItemId - mnPopupStaticItems - 1);

+            pCon = 0;

+//          delete pCon;

+//          mpDepperDontuseme->RemoveConnector( pCon->GetStartId(), pCon->GetEndId());

+//          TBD: CallEventListener

+

+                break;

+    }

+    return 0;

+}

+

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

+IMPL_LINK( ObjectWin, TipHdl, void *, EMTY_ARG )

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

+{

+    aTipTimer.Stop();

+

+    if ( msTipText.Len()) {

+        Point aPos( GetpApp()->GetAppWindow()->GetPointerPosPixel());

+        Help::ShowBalloon( GetpApp()->GetAppWindow(),

+            Point( aPos.X(), aPos.Y()),

+            String( msTipText, RTL_TEXTENCODING_UTF8 ));

+    }

+    return 0;

+}

+

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

+//void ObjectWin::GetFocus()

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

+//{

+    //SetMarkMode( MARKMODE_SELECTED );

+//}

+

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

+void ObjectWin::LoseFocus()

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

+{

+    if ( !mbMenuExecute && !msbHideMode ) {

+        UnsetMarkMode( MARKMODE_SELECTED );

+        UnsetMarkMode( MARKMODE_ACTIVATED );

+        MarkNeeded( TRUE );

+        MarkDepending( TRUE );

+    }

+    else

+        mbMenuExecute = FALSE;

+}

+

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

+IMPL_LINK( ObjectWin, PopupDeactivated, PopupMenu*, mpPopup_l )

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

+{

+    mbMenuExecute = FALSE;

+

+    if ( !HasFocus()) {

+        UnsetMarkMode( MARKMODE_SELECTED );

+        UnsetMarkMode( MARKMODE_ACTIVATED );

+           MarkNeeded( TRUE );

+        MarkDepending( TRUE );

+    }

+

+    return 0;

+}

+

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

+void ObjectWin::Command( const CommandEvent& rEvent)

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

+{

+    fprintf(stdout, "ObjectWin::Command");

+//  mpDepperDontuseme->GetGraphWin()->Command( rEvent );

+//          TBD: CallEventListener

+

+}

+

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

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

+

+ObjectList::ObjectList() : ObjWinList()

+{

+}

+

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

+void ObjectList::ResetSelectedObject()

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

+{

+//    return;

+

+    ULONG nCount_l = Count();

+    ObjectWin* pObjectWin = NULL;

+    for (ULONG i=0; i < nCount_l; i++ )

+    {

+        pObjectWin = GetObject( i );

+        pObjectWin->UnsetMarkMode( MARKMODE_SELECTED );

+        pObjectWin->UnsetMarkMode( MARKMODE_NEEDED );

+        pObjectWin->UnsetMarkMode( MARKMODE_DEPENDING );

+        pObjectWin->SetActualWallpaper(*pDefaultWallpaper);

+        pObjectWin->SetAllConnectorsUnvisible();

+    }

+    return;

+}

+

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

+ObjectWin* ObjectList::GetPtrByName( const ByteString& rText )

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

+{

+    ULONG i = 0;

+    ULONG nCount_l = Count();

+    ObjectWin* pObjectWin = NULL;

+    while ( i < nCount_l )

+    {

+       pObjectWin = GetObject( i );

+       ByteString sPrj = pObjectWin->GetBodyText();

+       if (sPrj == rText) return pObjectWin;

+       i++;

+    }

+    return 0;

+}

+

+ObjectList* ObjectList::FindTopLevelModules()

+{

+    ObjectList* pList = new ObjectList;

+    for ( USHORT i=0; i<Count(); i++ )

+    {

+       ObjectWin* pObjectWin = GetObject( i );

+       if ( pObjectWin->IsTop() )

+           pList->Insert( pObjectWin );

+    }

+

+    return pList;

+}

+

+BOOL ObjectWin::IsTop()

+{

+    ULONG nConCount = mConnections.Count();

+    for ( ULONG i = 0; i < nConCount; i++ )

+    {

+        Connector* pCon = mConnections.GetObject( i );

+        if ( pCon && pCon->IsStart( this) )

+            return FALSE;

+    }

+

+    return TRUE;

 }
\ No newline at end of file
diff --git a/soldep/source/soldep.cxx b/soldep/source/soldep.cxx
index 6c6abf80c33b..bc4d096f764e 100644
--- a/soldep/source/soldep.cxx
+++ b/soldep/source/soldep.cxx
@@ -1,243 +1,243 @@
-/*************************************************************************
- *
- * 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: soldep.cxx,v $
- * $Revision: 1.9 $
- *
- * 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.
- *
- ************************************************************************/
-//TBD: ToolBox handling prjview/back
-
-#include <osl/file.hxx>
-#include <rtl/ustring.hxx>
-#include <tools/debug.hxx>
-#include <bootstrp/sstring.hxx>
-#include <svtools/filedlg.hxx>
-#include <tools/iparser.hxx>
-#include <tools/geninfo.hxx>
+/*************************************************************************

+ *

+ * 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: soldep.cxx,v $

+ * $Revision: 1.9 $

+ *

+ * 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.

+ *

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

+//TBD: ToolBox handling prjview/back

+

+#include <osl/file.hxx>

+#include <rtl/ustring.hxx>

+#include <tools/debug.hxx>

+#include <bootstrp/sstring.hxx>

+#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>
-#include <soldep/soldep.hxx>
-#include <soldep/soldlg.hxx>
-#include "dtsodcmp.hrc"
-
-IMPLEMENT_HASHTABLE_OWNER( SolIdMapper, ByteString, ULONG* );
-//IMPLEMENT_HASHTABLE_OWNER( PrjIdMapper, ByteString, ULONG* );
-#define EVENT_RESIZE                0x00000001
-#define MIN(a,b) (a)<(b)?(a):(b)
-#define MAX(a,b) (a)>(b)?(a):(b)
-
-
-//ByteString sDelimiterLine("#==========================================================================");
-
-
-//
-// class SolDep
-//
-
-/*****************************************************************************/
-SolDep::SolDep( Window* pBaseWindow )
-/*****************************************************************************/
-                : Depper( pBaseWindow ),
-                mbBServer(FALSE),
-                mpTravellerList( NULL ),
-                mbIsHide( FALSE )
-{
-    mnSolWinCount = 0;
-    mnSolLastId = 0;
-//    mpPrjIdMapper = new SolIdMapper( 63997 );
-    maTaskBarFrame.EnableAlwaysOnTop();
-    maTaskBarFrame.Show();
-    maToolBox.SetPosSizePixel( Point( 0,0 ), Size( 1100,35 ));
-    maToolBox.SetSelectHdl( LINK ( this, SolDep, ToolSelect ));
-    maToolBox.Show();
-
-    mpBaseWin->AddChildEventListener( LINK( this, SolDep, ChildWindowEventListener ));
-
-    // Kontext-Menue (geh�rt zu soldep.cxx)
-    InitContextMenueMainWnd();
-    InitContextMenuePrjViewWnd( mpBasePrjWin );
-}
-
-/*****************************************************************************/
-SolDep::~SolDep()
-/*****************************************************************************/
-{
-    mpBaseWin->RemoveChildEventListener( LINK( this, SolDep, ChildWindowEventListener ) );
-    delete mpSolIdMapper;
-    delete mpStarWriter;
-    delete mpStandLst;
-}
-
-/*****************************************************************************/
-void SolDep::Init()
-/*****************************************************************************/
-{
-    InformationParser aParser;
-    String sStandLst( GetDefStandList(), RTL_TEXTENCODING_ASCII_US );
-    mpStandLst = aParser.Execute( sStandLst );
-    ByteString aUpdater( getenv("UPDATER") );
-    if ( mpStandLst && (aUpdater == "YES") ) {
-        if ( GetVersion() )
-            ReadSource( TRUE );
-    } else
-    {
-        ReadSource();   // if stand.lst isn't available
-    }
-}
-
-/*****************************************************************************/
-void SolDep::Init( ByteString &rVersion, GenericInformationList *pVersionList )
-/*****************************************************************************/
-{
-    // Interface for bs
-    mbBServer=TRUE;
-    if ( pVersionList )
-        mpStandLst = new GenericInformationList( *pVersionList );
-    else {
-        InformationParser aParser;
-        String sStandLst( GetDefStandList(), RTL_TEXTENCODING_ASCII_US );
-        mpStandLst = aParser.Execute( sStandLst );
-    }
-    if ( mpStandLst ) {
-        msVersionMajor = ByteString( rVersion );
-        ReadSource(TRUE); //call from build server set UPDATER to TRUE
-    }
-}
-
-/*****************************************************************************/
-IMPL_LINK( SolDep, ChildWindowEventListener, VclSimpleEvent*, pEvent )
-/*****************************************************************************/
-{
-    if ( pEvent && pEvent->ISA( VclWindowEvent ) )
-    {
-        ProcessChildWindowEvent( *static_cast< VclWindowEvent* >( pEvent ) );
-    }
-    return 0;
-}
-
-
-/*****************************************************************************/
-void SolDep::ProcessChildWindowEvent( const VclWindowEvent& _rVclWindowEvent )
-/*****************************************************************************/
-{
-    Window* pChildWin = _rVclWindowEvent.GetWindow();
-//    Window* pParentWin = pChildWin->GetParent();
-//Resize();
-    if ( isAlive() )
-        {
-            ULONG id = _rVclWindowEvent.GetId();
-            switch ( id )
-            {
-                case VCLEVENT_USER_MOUSEBUTTON_DOWN:
-                    {
-                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
-                        if( pObjWin )
-                        {
-                            // handle mouse click on ObjectWin object
-                            ObjectWin* pWin = (ObjectWin*) pChildWin;
-                            //GetObjectList()->ResetSelectedObject();
-                            if (IsHideMode())      // simple mouse click left
-                            {
-                                pWin->CaptureMouse();
-                                pWin->SetMarkMode( MARKMODE_SELECTED );
-                                pWin->MarkNeeded();
-                                pWin->MarkDepending();
-                                pWin->Invalidate();
-                            } else
-                            {
-                                pWin->LoseFocus();
-                                pWin->SetMarkMode( MARKMODE_SELECTED );
-                                pWin->UnsetMarkMode( MARKMODE_ACTIVATED );
-                                pWin->MarkNeeded( TRUE );
-                                pWin->MarkDepending( TRUE );
-                            }
-
-                        }
-                    }
-                    break;
-                case VCLEVENT_USER_MOUSEBUTTON_DOWN_ALT:
-                    {
-                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
-                        if( pObjWin )
-                        {
-                            ObjectWin* pWin = (ObjectWin*) pChildWin;
-                            MarkObjects( pWin );
-                        }
-                    }
-                    break;
-                case VCLEVENT_USER_MOUSEBUTTON_DOWN_DBLCLICK:
-                    {
-                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
-                        if( pObjWin )
-                        {
-                            if (IsHideMode()) ToggleHideDependency();
-                            ByteString text = ((ObjectWin*) pChildWin)->GetBodyText();
-                            ViewContent(text);
-                        }
-                    }
-                    break;
-                case VCLEVENT_USER_MOUSEBUTTON_UP_SHFT:
-                    {
-                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
-                        if( pObjWin )
-                        {
-                            ObjectWin* pWin = (ObjectWin*) pChildWin;
-                            GetDepWin()->NewConnector( pWin );
-                        }
-                    }
-                    break;
-                case VCLEVENT_USER_MOUSEBUTTON_UP:
-                     {
-                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
-                        if( pObjWin )
-                        {
-                            ObjectWin* pWin = (ObjectWin*) pChildWin;
-                            pWin->ReleaseMouse();
-                            pWin->SetMarkMode(MARKMODE_SELECTED);
-                            GetDepWin()->Invalidate();
-                        }
-                     }
-                     break;
-            }    // switch
-        }  // if isAlive
-        //fprintf(stdout,"BLA::Resize: %d\n",pChildWin);
-}
-
-/*****************************************************************************/
-IMPL_LINK( SolDep, ToolSelect, SoldepToolBox* , pBox)
-/*****************************************************************************/
-{
-    USHORT nItemId = pBox->GetCurItemId();
-    switch ( nItemId )
-    {
-        case TID_SOLDEP_FIND:
-            FindProject();
-            break;
+#include <appdef.hxx>

+#include "time.h"

+#include <soldep/depper.hxx>

+#include <soldep/soldep.hxx>

+#include <soldep/soldlg.hxx>

+#include "dtsodcmp.hrc"

+

+IMPLEMENT_HASHTABLE_OWNER( SolIdMapper, ByteString, ULONG* );

+//IMPLEMENT_HASHTABLE_OWNER( PrjIdMapper, ByteString, ULONG* );

+#define EVENT_RESIZE                0x00000001

+#define MIN(a,b) (a)<(b)?(a):(b)

+#define MAX(a,b) (a)>(b)?(a):(b)

+

+

+//ByteString sDelimiterLine("#==========================================================================");

+

+

+//

+// class SolDep

+//

+

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

+SolDep::SolDep( Window* pBaseWindow )

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

+                : Depper( pBaseWindow ),

+                mbBServer(FALSE),

+                mpTravellerList( NULL ),

+                mbIsHide( FALSE )

+{

+    mnSolWinCount = 0;

+    mnSolLastId = 0;

+//    mpPrjIdMapper = new SolIdMapper( 63997 );

+    maTaskBarFrame.EnableAlwaysOnTop();

+    maTaskBarFrame.Show();

+    maToolBox.SetPosSizePixel( Point( 0,0 ), Size( 1100,35 ));

+    maToolBox.SetSelectHdl( LINK ( this, SolDep, ToolSelect ));

+    maToolBox.Show();

+

+    mpBaseWin->AddChildEventListener( LINK( this, SolDep, ChildWindowEventListener ));

+

+    // Kontext-Menue (geh�rt zu soldep.cxx)

+    InitContextMenueMainWnd();

+    InitContextMenuePrjViewWnd( mpBasePrjWin );

+}

+

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

+SolDep::~SolDep()

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

+{

+    mpBaseWin->RemoveChildEventListener( LINK( this, SolDep, ChildWindowEventListener ) );

+    delete mpSolIdMapper;

+    delete mpStarWriter;

+    delete mpStandLst;

+}

+

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

+void SolDep::Init()

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

+{

+    InformationParser aParser;

+    String sStandLst( GetDefStandList(), RTL_TEXTENCODING_ASCII_US );

+    mpStandLst = aParser.Execute( sStandLst );

+    ByteString aUpdater( getenv("UPDATER") );

+    if ( mpStandLst && (aUpdater == "YES") ) {

+        if ( GetVersion() )

+            ReadSource( TRUE );

+    } else

+    {

+        ReadSource();   // if stand.lst isn't available

+    }

+}

+

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

+void SolDep::Init( ByteString &rVersion, GenericInformationList *pVersionList )

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

+{

+    // Interface for bs

+    mbBServer=TRUE;

+    if ( pVersionList )

+        mpStandLst = new GenericInformationList( *pVersionList );

+    else {

+        InformationParser aParser;

+        String sStandLst( GetDefStandList(), RTL_TEXTENCODING_ASCII_US );

+        mpStandLst = aParser.Execute( sStandLst );

+    }

+    if ( mpStandLst ) {

+        msVersionMajor = ByteString( rVersion );

+        ReadSource(TRUE); //call from build server set UPDATER to TRUE

+    }

+}

+

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

+IMPL_LINK( SolDep, ChildWindowEventListener, VclSimpleEvent*, pEvent )

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

+{

+    if ( pEvent && pEvent->ISA( VclWindowEvent ) )

+    {

+        ProcessChildWindowEvent( *static_cast< VclWindowEvent* >( pEvent ) );

+    }

+    return 0;

+}

+

+

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

+void SolDep::ProcessChildWindowEvent( const VclWindowEvent& _rVclWindowEvent )

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

+{

+    Window* pChildWin = _rVclWindowEvent.GetWindow();

+//    Window* pParentWin = pChildWin->GetParent();

+//Resize();

+    if ( isAlive() )

+        {

+            ULONG id = _rVclWindowEvent.GetId();

+            switch ( id )

+            {

+                case VCLEVENT_USER_MOUSEBUTTON_DOWN:

+                    {

+                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);

+                        if( pObjWin )

+                        {

+                            // handle mouse click on ObjectWin object

+                            ObjectWin* pWin = (ObjectWin*) pChildWin;

+                            //GetObjectList()->ResetSelectedObject();

+                            if (IsHideMode())      // simple mouse click left

+                            {

+                                pWin->CaptureMouse();

+                                pWin->SetMarkMode( MARKMODE_SELECTED );

+                                pWin->MarkNeeded();

+                                pWin->MarkDepending();

+                                pWin->Invalidate();

+                            } else

+                            {

+                                pWin->LoseFocus();

+                                pWin->SetMarkMode( MARKMODE_SELECTED );

+                                pWin->UnsetMarkMode( MARKMODE_ACTIVATED );

+                                pWin->MarkNeeded( TRUE );

+                                pWin->MarkDepending( TRUE );

+                            }

+

+                        }

+                    }

+                    break;

+                case VCLEVENT_USER_MOUSEBUTTON_DOWN_ALT:

+                    {

+                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);

+                        if( pObjWin )

+                        {

+                            ObjectWin* pWin = (ObjectWin*) pChildWin;

+                            MarkObjects( pWin );

+                        }

+                    }

+                    break;

+                case VCLEVENT_USER_MOUSEBUTTON_DOWN_DBLCLICK:

+                    {

+                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);

+                        if( pObjWin )

+                        {

+                            if (IsHideMode()) ToggleHideDependency();

+                            ByteString text = ((ObjectWin*) pChildWin)->GetBodyText();

+                            ViewContent(text);

+                        }

+                    }

+                    break;

+                case VCLEVENT_USER_MOUSEBUTTON_UP_SHFT:

+                    {

+                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);

+                        if( pObjWin )

+                        {

+                            ObjectWin* pWin = (ObjectWin*) pChildWin;

+                            GetDepWin()->NewConnector( pWin );

+                        }

+                    }

+                    break;

+                case VCLEVENT_USER_MOUSEBUTTON_UP:

+                     {

+                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);

+                        if( pObjWin )

+                        {

+                            ObjectWin* pWin = (ObjectWin*) pChildWin;

+                            pWin->ReleaseMouse();

+                            pWin->SetMarkMode(MARKMODE_SELECTED);

+                            GetDepWin()->Invalidate();

+                        }

+                     }

+                     break;

+            }    // switch

+        }  // if isAlive

+        //fprintf(stdout,"BLA::Resize: %d\n",pChildWin);

+}

+

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

+IMPL_LINK( SolDep, ToolSelect, SoldepToolBox* , pBox)

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

+{

+    USHORT nItemId = pBox->GetCurItemId();

+    switch ( nItemId )

+    {

+        case TID_SOLDEP_FIND:

+            FindProject();

+            break;

         case TID_SOLDEP_CREATEMETA :

         {

             VirtualDevice   aVDev;

@@ -282,1515 +282,1529 @@ IMPL_LINK( SolDep, ToolSelect, SoldepToolBox* , pBox)
             SvFileStream aStream( String::CreateFromAscii("d:\\out.svm"), STREAM_STD_READWRITE );

             aMtf.Write( aStream );

             break;

-        }
-        case TID_SOLDEP_HIDE_INDEPENDEND:
-            {
-                ToggleHideDependency();
+        }

+        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
-            }
-            break;
-        case TID_SOLDEP_SELECT_WORKSPACE:
-            if (mpStandLst)
-            {
-                if (GetVersion()) // Version dialog box
-                {
-                    delete mpSolIdMapper;
-                    delete mpStarWriter;
-                    mpObjectList->ClearAndDelete();
-                    ReadSource(TRUE);
-                }
-            }
-            break;
-        case TID_SOLDEP_BACK:
-            maToolBox.HideItem(TID_SOLDEP_BACK);
-            maToolBox.ShowItem(TID_SOLDEP_SELECT_WORKSPACE);  //disabled for prj view (doubleclick ObjWin)
-            maToolBox.ShowItem(TID_SOLDEP_HIDE_INDEPENDEND);  //disabled for prj view (doubleclick ObjWin)
-            maToolBox.ShowItem(TID_SOLDEP_FIND);              //disabled for prj view (doubleclick ObjWin)
-            maToolBox.Resize();
-            TogglePrjViewStatus();
-            break;
-    }
-    return 0;
-}
-
-/*****************************************************************************/
-void SolDep::ToggleHideDependency()
-/*****************************************************************************/
-{
-    mbIsHide = !mbIsHide;
-    maToolBox.CheckItem(TID_SOLDEP_HIDE_INDEPENDEND, IsHideMode());
-    ObjectWin* pWin = GetObjectList()->GetObject( 0 );
-    pWin->ToggleHideMode();
-};
-
-/*****************************************************************************/
-BOOL SolDep::GetVersion()
-/*****************************************************************************/
-{
-    SolSelectVersionDlg aVersionDlg( GetDepWin(), mpStandLst );
-    if ( aVersionDlg.Execute() == RET_OK ) {
-        msVersionMajor = aVersionDlg.GetVersionMajor();
-        msVersionMinor = aVersionDlg.GetVersionMinor();
-        return TRUE;
-    }
-    return FALSE;
-}
-
-void SolDep::InitContextMenueMainWnd()
-{
-    InitContextMenuePrjViewWnd( mpBaseWin );
-    return; // Disable not actually supported items
-
-    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_AUTOARRANGE, String::CreateFromAscii("Autoarrange")) ;
-    mpBaseWin->mpPopup->InsertSeparator();
-    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_READ_SOURCE, String::CreateFromAscii("Revert all changes") );
-    mpBaseWin->mpPopup->InsertSeparator();
-    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_OPEN_SOURCE, String::CreateFromAscii("Open") );
-    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_WRITE_SOURCE, String::CreateFromAscii("Save") );
-}
-
-void SolDep::InitContextMenuePrjViewWnd(DepWin* pBaseWin )
-{
-    // temp. disabled pBaseWin->mpPopup->InsertItem( DEPPOPUP_NEW, String::CreateFromAscii("New object") );
-    pBaseWin->mpPopup->InsertItem( DEPPOPUP_ZOOMIN, String::CreateFromAscii("Zoom in") );
-    pBaseWin->mpPopup->InsertItem( DEPPOPUP_ZOOMOUT, String::CreateFromAscii("Zoom out") );
-    pBaseWin->mpPopup->InsertSeparator();
-    // temp disabled pBaseWin->mpPopup->InsertItem( DEPPOPUP_CLEAR, String::CreateFromAscii("Clear") );
-    pBaseWin->mpPopup->InsertItem( DEPPOPUP_SHOW_TOOLBOX, String::CreateFromAscii("Show Toolbox") );
-}
-
-/*****************************************************************************/
-ObjectWin *SolDep::RemoveObject( USHORT nId, BOOL bDelete )
-/*****************************************************************************/
-{
-    Prj* pPrj;
-
-//hshtable auf stand halten
-    ObjectWin* pWin = RemoveObjectFromList( mpObjectList, mnSolWinCount, nId, FALSE );
-    if ( pWin )
-    {
-        ByteString aBodyText( pWin->GetBodyText() );
-        if( (pPrj = mpStarWriter->GetPrj( aBodyText )) )
-        {
-            mpStarWriter->Remove( pPrj );
-//cleanup ist teuer...
-            mpStarWriter->CleanUp();
-            delete pPrj;
-        }
-        else
-            DBG_ASSERT( FALSE, "project not found - write" );
-
-        mpSolIdMapper->Delete( aBodyText );
-        if ( bDelete )
-            delete pWin;
-        return pWin;
-    }
-    else
-        return NULL;
-}
-
-/*****************************************************************************/
-ULONG SolDep::AddObject( ByteString& rBodyText, BOOL bInteract )
-/*****************************************************************************/
-{
-    ULONG nObjectId;
-    if ( bInteract )
-    {
-        nObjectId = HandleNewPrjDialog( rBodyText );
-    }
-    else
-    {
-//hashtable auf stand halten
-        MyHashObject* pHObject;
-        nObjectId = AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, rBodyText, FALSE );
-        pHObject = new MyHashObject( nObjectId, ObjIdToPtr(mpObjectList, nObjectId ));
-        mpSolIdMapper->Insert( rBodyText, pHObject );
-    }
-    return nObjectId;
-}
-
-/*****************************************************************************/
-ULONG SolDep::AddPrjObject( ByteString& rBodyText, BOOL bInteract )
-/*****************************************************************************/
-{
-    ULONG nObjectId;
-    if ( bInteract )
-    {
-        nObjectId = HandleNewDirectoryDialog( rBodyText );
-    }
-    else
-    {
-//hshtable auf stand halten
-        MyHashObject* pHObject;
-        nObjectId = AddObjectToList( mpBasePrjWin, mpObjectPrjList, mnPrjLastId, mnPrjWinCount, rBodyText );
-        pHObject = new MyHashObject( nObjectId, ObjIdToPtr( mpObjectPrjList, nObjectId ));
-        mpPrjIdMapper->Insert( rBodyText, pHObject ); // mpPrjIdMapper
-    }
-    return nObjectId;
-}
-
-/*****************************************************************************/
-USHORT SolDep::AddConnector( ObjectWin* pStartWin, ObjectWin* pEndWin )
-/*****************************************************************************/
-{
-//  DBG_ASSERT( FALSE , "not yet" );
-    ByteString sEndName = pEndWin->GetBodyText();
-    ByteString sStartName = pStartWin->GetBodyText();
-
-    Prj* pPrj = mpStarWriter->GetPrj( sEndName );
-    if ( pPrj )
-    {
-        pPrj->AddDependencies( sStartName );
-        return AddConnectorToObjects( pStartWin, pEndWin );
-    }
-    else
-    {
-        DBG_ASSERT( FALSE , "non existing Project" );
-        return 1;
-    }
-}
-
-/*****************************************************************************/
-USHORT SolDep::RemoveConnector( ObjectWin* pStartWin, ObjectWin* pEndWin )
-/*****************************************************************************/
-{
-    SByteStringList* pPrjDeps = NULL;
-    ByteString sEndName = pEndWin->GetBodyText();
-    ByteString sStartName = pStartWin->GetBodyText();
-
-    Prj* pPrj = mpStarWriter->GetPrj( sEndName );
-    pPrjDeps = pPrj->GetDependencies( FALSE );
-    if ( pPrjDeps )
-    {
-        ByteString* pString;
-        ULONG nPrjDepsCount = pPrjDeps->Count();
-        for ( ULONG j = nPrjDepsCount; j > 0; j-- )
-        {
-            pString = pPrjDeps->GetObject( j - 1 );
-            if ( pString->GetToken( 0, '.') == sStartName )
-                pPrjDeps->Remove( pString );
-        }
-    }
-
-    return RemoveConnectorFromObjects( pStartWin, pEndWin );
-}
-
-/*****************************************************************************/
-void SolDep::RemoveAllObjects( ObjectList* pObjLst )
-/*****************************************************************************/
-{
-
-    Depper::RemoveAllObjects( pObjLst );
-
-    if ( mpSolIdMapper )
-    {
-        delete mpSolIdMapper;
-        mpSolIdMapper = NULL;
-    }
-    if ( mpStarWriter )
-    {
-        delete mpStarWriter;
-        mpStarWriter = NULL;
-    }
-}
-
-/*****************************************************************************/
-ULONG SolDep::GetStart(SolIdMapper* pIdMapper, ObjectList* pObjList)
-/*****************************************************************************/
-{
-//  DBG_ASSERT( FALSE , "soldep" );
-    MyHashObject* pHObject = pIdMapper->Find( "null" );//null_project
-
-    if ( !pHObject ) {
-        ByteString sNullPrj = "null";//null_project
-        ULONG nObjectId = AddObject( sNullPrj, FALSE );
-        ObjIdToPtr( pObjList, nObjectId )->SetViewMask( 1 );
-        return nObjectId;
-    }
-
-    return pHObject->GetId();
-}
-
-/*****************************************************************************/
-ULONG SolDep::GetStartPrj(SolIdMapper* pIdMapper, ObjectList* pObjList)
-/*****************************************************************************/
-{
-//  DBG_ASSERT( FALSE , "prjdep" );
-    MyHashObject* pHObject = mpPrjIdMapper->Find( ByteString( "null" ) ); //null_dir
-    if ( !pHObject )
-    {
-        ByteString bsNull("null");
-        ULONG nObjectId = AddPrjObject( bsNull, FALSE); //null_dir
-        return nObjectId;
-    }
-    else
-        return pHObject->GetId();
-}
-
-/*****************************************************************************/
-USHORT SolDep::OpenSource()
-/*****************************************************************************/
-{
-    if ( mpStandLst ) {
-        if ( GetVersion())
-            return ReadSource();
-    }
-    return 0;
-}
-
-/*****************************************************************************/
-USHORT SolDep::ReadSource(BOOL bUpdater)
-/*****************************************************************************/
-{
-    mpBaseWin->EnablePaint( FALSE );
-    mpBaseWin->Hide();
-    ULONG nObjectId, nHashedId;
-    ULONG i;
-    MyHashObject* pHObject;
-    ByteString* pStr;
-    ObjectWin *pStartWin, *pEndWin;
-
-    mpSolIdMapper = new SolIdMapper( 63997 );
-    if (mpStandLst && bUpdater)
-    {
-        mpStarWriter = new StarWriter( mpStandLst, msVersionMajor, msVersionMinor, TRUE );
-    } else
-    {
-        SolarFileList* pSolarFileList;
-        pSolarFileList = GetPrjListFromDir();
-        mpStarWriter = new StarWriter( pSolarFileList, TRUE );
-    }
-    ByteString sTitle( SOLDEPL_NAME );
-    if ( mpStarWriter->GetMode() == STAR_MODE_SINGLE_PARSE ) {
-        sTitle += ByteString( " - mode: single file [" );
-           sTitle += (ByteString) mpStarWriter->GetName();
-        sTitle += ByteString( "]" );
-    }
-    else if ( mpStarWriter->GetMode() == STAR_MODE_MULTIPLE_PARSE ) {
-        sTitle += ByteString( " - mode: multiple files [" );
-        sTitle += ByteString( "]" );
-    }
-    SetTitle( String( sTitle, RTL_TEXTENCODING_UTF8) );
-
-    ULONG nCount = mpStarWriter->Count();
-    for ( i=0; i<nCount; i++ )
-    {
-        Prj *pPrj = mpStarWriter->GetObject(i);
-        ByteString sPrjName = pPrj->GetProjectName();
-        nObjectId = AddObject( sPrjName, FALSE );
-        ObjIdToPtr( mpObjectList, nObjectId )->SetViewMask( 1 );
-    }
-    for ( i=0; i<nCount; i++ )
-    {
-        Prj *pPrj = mpStarWriter->GetObject(i);
-        SByteStringList *pLst = pPrj->GetDependencies( FALSE );
-        if ( pLst )
-        {
-            ULONG nDepCount = pLst->Count();
-            for ( ULONG m=0; m<nDepCount; m++)
-            {
-                pStr = pLst->GetObject(m);
-                pHObject = mpSolIdMapper->Find( *pStr );
-                /*if ( !pHObject )
-                {
-    // create new prj
-                    Prj *pNewPrj = new Prj( *pStr );
-                    ByteString sPrjName = pNewPrj->GetProjectName();
-                    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;
-                pHObject = mpSolIdMapper->Find( *pStr );
-                nObjectId = pHObject->GetId();
-                pStartWin = ObjIdToPtr( mpObjectList, nHashedId );
-                pEndWin = ObjIdToPtr( mpObjectList, nObjectId );
-                AddConnectorToObjects( pStartWin, pEndWin );
-            }
-        }
-    }
-    }
-    if (!IsPrjView())
-    {
-        AutoArrange( mpSolIdMapper, mpObjectList, GetStart(mpSolIdMapper,mpObjectList), 0, GetStart(mpSolIdMapper,mpObjectList) );
-        GetDepWin()->EnablePaint( TRUE );
-    }
-    return 0;
-}
-
-SolarFileList* SolDep::GetPrjListFromDir()
-{
-    SolarFileList* pSolarFileList = new SolarFileList();
-    String sPrjDir( String::CreateFromAscii( "prj" ));
-    String sBuildLst( String::CreateFromAscii( "build.lst" ));
-    DirEntry aCurrent( getenv( SOURCEROOT ) );
-
-    aCurrent.ToAbs();
-    Dir aDir( aCurrent, FSYS_KIND_DIR );
-
-    USHORT nEntries = aDir.Count();
-    if( nEntries )
-    {
-        UniStringList aSortDirList;
-        for ( USHORT n = 0; n < nEntries; n++ )
-        {
-            DirEntry& rEntry = aDir[n];
-            UniString aName( rEntry.GetName() );
-            if( aName.Len() && ( aName.GetChar(0) != '.' ) && rEntry.Exists() )
-            {
-                rEntry += DirEntry( sPrjDir );
-                rEntry += DirEntry( sBuildLst );
-                if (rEntry.Exists())
-                {
-                    pSolarFileList->Insert( new String( rEntry.GetFull() ), LIST_APPEND );
-                    ByteString aName_dbg(rEntry.GetFull(),RTL_TEXTENCODING_UTF8);
-                    fprintf(stdout, "bla:%s\n", aName_dbg.GetBuffer());
-                }
-            }
-        }
-    }
-    if ( !pSolarFileList->Count() )
-    {
-         //is empty!! TBD
-         delete pSolarFileList;
-         return NULL;
-    }
-    return pSolarFileList;
-}
-
-/*****************************************************************************/
-USHORT SolDep::WriteSource()
-/*****************************************************************************/
-{
-/* zur Sicherheit deaktiviert
-    USHORT nMode = mpStarWriter->GetMode();
-    if ( nMode == STAR_MODE_SINGLE_PARSE ) {
-        ByteString sFileName = mpStarWriter->GetName();
-        if ( sFileName.Len()) {
-            mpStarWriter->Write( String( sFileName, RTL_TEXTENCODING_UTF8) );
-            mpStarWriter->RemoveProject( ByteString( "null"));  //null_project
-        }
-    }
-    else if ( nMode == STAR_MODE_MULTIPLE_PARSE ) {
-    // *OBO*
-    //String sRoot = mpStarWriter->GetSourceRoot();
-    //nicht mehr unterst�tzt mpStarWriter->GetSourceRoot()
-        ByteString sFileName = mpStarWriter->GetName();
-        DirEntry aEntry( sFileName );
-        aEntry.ToAbs();
-        aEntry = aEntry.GetPath().GetPath().GetPath();
-        String sRoot = aEntry.GetFull();
-
-        if ( sRoot.Len()) {
-            mpStarWriter->RemoveProject( ByteString( "null")); //null_project
-            mpStarWriter->WriteMultiple( sRoot );
-        }
-    }
-*/
-    return 1;
-}
-
-USHORT SolDep::Load( const ByteString& rFileName )
-{
-// moved from depper class
-    DBG_ASSERT( FALSE , "you are dead!" );
-    SvFileStream aInFile( String( rFileName, RTL_TEXTENCODING_UTF8 ), STREAM_READ );
-    depper_head dh;
-    ULONG i;
-    ULONG nLoadOffs = mnSolLastId;     //or Prj??
-    ObjectWin* pNewWin;
-    aInFile.Read( &dh, sizeof( dh ));
-
-    ULONG nObjCount = dh.nObjectCount;
-    ULONG nCnctrCount = dh.nCnctrCount;
-
-    for ( i=0; i < nObjCount ; i++ )
-    {
-        ObjectWin* pWin = new ObjectWin( mpBaseWin, WB_BORDER );
-        pWin->Load( aInFile );
-        pNewWin = ObjIdToPtr( mpObjectList, AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, pWin->GetBodyText(), FALSE ));
-        pNewWin->SetId( nLoadOffs + pWin->GetId());
-        pNewWin->SetPosPixel( pWin->GetPosPixel());
-        pNewWin->SetSizePixel( pWin->GetSizePixel());
-    }
-
-    ULONG nStartId;
-    ULONG nEndId;
-//  ueber addconnector fuehren!
-    for ( i=0; i < nCnctrCount ; i++ )
-    {
-        Connector* pCon = new Connector( mpBaseWin, WB_NOBORDER );
-        pCon->Load( aInFile );
-
-        nStartId = nLoadOffs + pCon->GetStartId();
-        nEndId = nLoadOffs + pCon->GetEndId();
-
-        ObjectWin* pStartWin = ObjIdToPtr( mpObjectList, nStartId );
-        ObjectWin* pEndWin = ObjIdToPtr( mpObjectList, nEndId );
-
-        pCon->Initialize( pStartWin, pEndWin );
-    }
-
-
-    return 0;
-}
-
-/*****************************************************************************/
-BOOL SolDep::ViewContent( ByteString& rObjectName )
-/*****************************************************************************/
-{
-    mpFocusWin = NULL;
-    SetPrjViewStatus(TRUE);
-
-    for ( ULONG i = 0; i < mpObjectList->Count() && !mpFocusWin; i++ )
-        if ( mpObjectList->GetObject( i )->HasFocus())
-            mpFocusWin = mpObjectList->GetObject( i );
-    //HideObjectsAndConnections( mpObjectList );
-    mpProcessWin->Resize();
-    GetDepWin()->Show();
-    return InitPrj( rObjectName );
-}
-
-/*****************************************************************************/
-BOOL SolDep::InitPrj( ByteString& rListName )
-/*****************************************************************************/
-{
-    ULONG nObjectId, nHashedId;
-    ULONG i, j;
-    MyHashObject* pHObject;
-    ByteString *pDepName;
-    ByteString *pFlagName;
-    Prj* pPrj;
-    ObjectWin *pStartWin, *pEndWin;
-    maToolBox.HideItem(TID_SOLDEP_SELECT_WORKSPACE);
-    maToolBox.HideItem(TID_SOLDEP_HIDE_INDEPENDEND);
-    maToolBox.HideItem(TID_SOLDEP_FIND);
-    maToolBox.ShowItem(TID_SOLDEP_BACK);
-    maToolBox.Invalidate();
-
-    //clean up
-    mpObjectPrjList->ClearAndDelete();
-    GetDepWin()->ClearConnectorList();
-    if (mpPrjIdMapper) delete mpPrjIdMapper;
-    mpPrjIdMapper = new SolIdMapper( 63997 ); //generate clean mapper
-    mnPrjWinCount = 0;
-    mnPrjLastId = 0;
-
-    ULONG nCount = mpStarWriter->Count();
-    GetDepWin()->EnablePaint( FALSE );
-    Point aPnt = GetGraphWin()->GetPosPixel();
-    Size aSize = GetGraphWin()->GetSizePixel();
-
-    GetGraphWin()->SetPosSizePixel( aPnt, aSize );         // Hier wird das Window gesetzt
-
-    BOOL bReturn = FALSE;
-
-    for ( i=0; i<nCount; i++ )
-    {
-// pPrj->GetProjectName() returns the name of
-// the project e.g. svtools
-        pPrj = mpStarWriter->GetObject(i);
-        ByteString sPrjName = pPrj->GetProjectName();
-        if ( sPrjName == rListName )
-        {
-            bReturn = TRUE;
-
-            mpPrj = mpStarWriter->GetObject(i);
-            ULONG nDirCount = mpPrj->Count();
-            for ( j=0; j<nDirCount; j++ )
-            {
-                CommandData *pData = mpPrj->GetObject(j);
-                fprintf( stdout, "\tProjectDir : %s\n",
-                        pData->GetLogFile().GetBuffer());
-// pData->GetLogFile() contains internal project IDs
-// e.g. st_mkout etc.
-                if ( pData->GetLogFile() != "" )
-                {
-                    ByteString sItem = pData->GetLogFile();
-                    nObjectId = AddPrjObject( sItem, FALSE);
-// there may be faster ways......
-                    ObjectWin *pWin = ObjIdToPtr( mpObjectPrjList, nObjectId );
-                    pWin->SetViewMask( 0x0001 );
-// pData->GetPath() contains internal project directories
-// e.g. svtools/inc etc.
-                    ByteString sPath = pData->GetPath();
-                    pWin->SetTipText( sPath );
-                }
-            }
-
-// set connectors for dependencies here
-            for ( j=0; j<nDirCount; j++ )
-            {
-                CommandData *pData = mpPrj->GetObject(j);
-                SByteStringList *pDeps = pData->GetDependencies();
-                if ( pDeps )
-                {
-                    ByteString sFlagName = pData->GetLogFile();
-                    pFlagName = &sFlagName;
-                    //pHObject = mpPrjIdMapper->Find( (*pFlagName).GetToken( 0, '.'));//mpSolIdMapper see ReadSource()
-                    pHObject = mpPrjIdMapper->Find( sFlagName.GetToken( 0, '.'));
-                    if (pHObject)
-                    {
-
-                        nObjectId = pHObject->GetId();
-
-                        ULONG nDepCount = pDeps->Count();
-                        for ( ULONG k=0; k<nDepCount; k++ )
-                        {
-                            pDepName = pDeps->GetObject(k);
-                            pHObject = mpPrjIdMapper->Find( (*pDepName).GetToken( 0, '.'));
-                            if (pHObject )
-                            {
-                                nHashedId = pHObject->GetId();
-                                pStartWin = ObjIdToPtr( mpObjectPrjList, nHashedId );
-                                pEndWin = ObjIdToPtr( mpObjectPrjList, nObjectId );
-
-                                AddConnectorToObjects( pStartWin, pEndWin );
-                            }
-                            else
-                            {
-                                String sMessage;
-                                sMessage += String::CreateFromAscii("can't find ");
-                                sMessage += String( *pDepName, RTL_TEXTENCODING_UTF8 );
-                                sMessage += String::CreateFromAscii(".\ndependency ignored");
-                                WarningBox aBox( GetDepWin(), WB_OK, sMessage);
-                                aBox.Execute();
-                            }
-                        }
-                    }
-                }
-
-            }
-
-            break;
-        }
-    }
-    ByteString sNullDir = "null";
-    nObjectId = AddPrjObject( sNullDir, FALSE);
-    ObjectWin *pWin = ObjIdToPtr( mpObjectPrjList, nObjectId );
-    pWin->SetViewMask( 0x0001 );
-    mpGraphPrjWin->EnablePaint( TRUE );
-    //debug
-//    int test_l = GetStartPrj(mpPrjIdMapper, mpObjectPrjList);
-//    ObjectWin *pTestWin = ObjIdToPtr( mpObjectPrjList, test_l );
-    AutoArrange( mpPrjIdMapper, mpObjectPrjList, GetStartPrj(mpPrjIdMapper, mpObjectPrjList), 0, GetStartPrj(mpPrjIdMapper, mpObjectPrjList) );
-    mpGraphWin->Hide();
-    mpGraphPrjWin->Show();
-    mpGraphPrjWin->Invalidate();
-
-    return bReturn;
-}
-
-/*****************************************************************************/
-USHORT SolDep::CloseWindow()
-/*****************************************************************************/
-{
-
-    ((SystemWindow*)mpProcessWin)->Close();
-    return 0;
-}
-
-/*****************************************************************************/
-void SolDep::ShowHelp()
-/*****************************************************************************/
-{
-    SvFileStream aHelpFile( String::CreateFromAscii( "g:\\soldep.hlp" ), STREAM_READ );
-    String aHelpText;
-    ByteString aGetStr;
-
-    if ( aHelpFile.IsOpen() )
-    {
-        while ( aHelpFile.ReadLine( aGetStr ) )
-        {
-            aHelpText += String (aGetStr, RTL_TEXTENCODING_UTF8);
-            aHelpText += String::CreateFromAscii("\n");
-        }
-    }
-    else
-        aHelpText = String::CreateFromAscii("No Helpfile found.");
-
-    SolHelpDlg aHelpDlg( mpBaseWin, DtSodResId( RID_SD_DIALOG_HELP ));
-    aHelpDlg.maMLEHelp.SetText( aHelpText );
-    aHelpDlg.maMLEHelp.SetReadOnly();
-    aHelpDlg.maMLEHelp.EnableFocusSelectionHide( TRUE );
-    aHelpDlg.Execute();
-}
-
-/*****************************************************************************/
-BOOL SolDep::FindProject()
-/*****************************************************************************/
-{
-    SolFindProjectDlg aFindProjectDlg( GetDepWin(), GetObjectList() );
-    ObjectWin* pObjectWin = NULL;
-    mpObjectList->ResetSelectedObject();
-    if (IsHideMode())
-    {
-        GetDepWin()->Invalidate();
-    }
-
-    mpFocusWin=NULL;
-
-    if ( aFindProjectDlg.Execute() == RET_OK ) {
-        msProject = aFindProjectDlg.GetProject();
-        //now we have a project string
-        pObjectWin = mpObjectList->GetPtrByName( msProject );
-        mpObjectList->ResetSelectedObject();
-        MarkObjects( pObjectWin );
-    }
-    return FALSE;
-}
-
-BOOL SolDep::MarkObjects( ObjectWin* pObjectWin )
-{
-    if (pObjectWin)
-    {
-        if (!(pObjectWin->IsNullObject()))
-        {
-            pObjectWin->SetMarkMode( MARKMODE_SELECTED );
-              pObjectWin->MarkNeeded();
-            pObjectWin->MarkDepending();
-            if (IsHideMode())
-            {
-                GetDepWin()->Invalidate();
-            }
-        } else
-        {
-            fprintf(stdout,"null\n");
-        }
-    }
-    return TRUE;
-}
-
-void SolDep::Resize()
-{
-//funzt! mu� aber von der applikation aufgerufen werden.
-    Point aOutPos = Point( 0, 0 );
-    Size aOutSize = mpProcessWin->GetOutputSizePixel();
-        // calculate output size
-    ULONG nTaskHeight = maToolBox.CalcWindowSizePixel().Height();
-    ULONG nTaskWidth  = maToolBox.CalcWindowSizePixel().Width();
-    Size aSize( aOutSize.Width(), nTaskHeight );
-
-//  ULONG nMenuHeight = 0;
-    Point aGraphWinPos = Point(0,0);
-    Size  aGraphWinSize = Size(0,0);
-
-//wei� nicht wie:    nMenuHeight = aMenuBar.GetWindow()->GetSizePixel().Height(); //H�he des Menues
-
-    //aInRect = pTBManager->Resize( Rectangle( aOutPos, aOutSize );
-    // Set Docking-Rectangle for ToolBar
-    Rectangle aInRect;
-
-    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_TOP ))
-    {
-        // waagerechte Toolbar oben
-        maToolBox.SetPosSizePixel( aOutPos, Size( aOutSize.Width(), maToolBox.CalcWindowSizePixel().Height()));
-        if( maToolBox.IsVisible())
-        {
-            Point aOutPosTmp;
-            Size aOutSizeTmp;
-            aOutPosTmp = Point( aOutPos.X(), aOutPos.Y() + maToolBox.CalcWindowSizePixel().Height());
-            aOutSizeTmp = Size( aOutSize.Width(), aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height());
-            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );
-            aGraphWinPos = Point( 0, nTaskHeight );
-            aGraphWinSize = Size( aOutSize.Width(), aOutSize.Height() - nTaskHeight);
-        }
-    }
-    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_BOTTOM ))
-    {
-        // waagerechte Toolbar unten
-        Point aTbPos  = Point( aOutPos.X(), aOutPos.Y() + aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height());
-        Size  aTbSize = Size( aOutSize.Width(), maToolBox.CalcWindowSizePixel().Height());
-        maToolBox.SetPosSizePixel( aTbPos, aTbSize );
-        if( maToolBox.IsVisible())
-        {
-            Point aOutPosTmp;
-            Size aOutSizeTmp;
-            aOutPosTmp = Point( aOutPos.X(), aOutPos.Y() + maToolBox.CalcWindowSizePixel().Height());
-            aOutSizeTmp = Size( aOutSize.Width(), aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height());
-            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );
-            aGraphWinPos = Point( 0, 0 );
-            aGraphWinSize = Size( aOutSize.Width(), aOutSize.Height() - nTaskHeight);
-        }
-    }
-    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_LEFT ))
-    {
-        // senkrechte ToolBar links
-        maToolBox.SetPosSizePixel( aOutPos, Size( maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height()));
-        if( maToolBox.IsVisible())
-        {
-            Point aOutPosTmp;
-            Size aOutSizeTmp;
-            aOutPosTmp = Point( aOutPos.X() + maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y());
-            aOutSizeTmp = Size( aOutSize.Width()- maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height());
-            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );
-            aGraphWinPos = Point( nTaskWidth, 0 );
-            aGraphWinSize = Size( aOutSize.Width() - nTaskWidth, aOutSize.Height());
-        }
-    }
-    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_RIGHT ))
-    {
-        // senkrechte ToolBar rechts
-        Point aTbPos = Point( aOutPos.X() + aOutSize.Width() - maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y());
-        Size  aTbSize= Size( maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height());
-        maToolBox.SetPosSizePixel( aTbPos, aTbSize);
-        if( maToolBox.IsVisible())
-        {
-            Point aOutPosTmp;
-            Size aOutSizeTmp;
-            aOutPosTmp = Point( aOutPos.X() + maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y());
-            aOutSizeTmp = Size( aOutSize.Width()- maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height());
-            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );
-            aGraphWinPos = Point( 0, 0 );
-            aGraphWinSize = Size( aOutSize.Width() - nTaskWidth, aOutSize.Height());
-        }
-    }
-
-    Rectangle rout = Rectangle( Point( 0,0 ), aOutSize ); //OutputToScreenPixel( aOutPos )
-    Rectangle rin  = Rectangle( Point( 0,0 ),//OutputToScreenPixel( Point( aOutPos.X() - 20, aInRect.Top())
-                Size( aOutSize.Width(), aOutSize.Height()));
-/*
-    Rectangle rout = mpProcessWin->OutputToScreenPixel( aOutPos );
-    Rectangle rin  = Rectangle( Point( 0,0 ),//OutputToScreenPixel( Point( aOutPos.X() - 20, aInRect.Top())
-                Size( aOutSize.Width(), aOutSize.Height()));
-*/
-    maToolBox.SetDockingRects( rout, rin );
-
-    BOOL bFloating = maToolBox.IsFloatingMode();
-
-    if ( bFloating )
-    {
-        GetGraphWin()->SetPosSizePixel(Point(0,0),aOutSize);
-        //if (IsPrjView() && (mpPrjDep)) mpPrjDep->Resize();
-        if (maToolBox.IsVisible()) maToolBox.Show();
-    } else
-    {
-        GetGraphWin()->SetPosSizePixel( aGraphWinPos, aGraphWinSize );
-    }
-    if (maToolBox.IsVisible()) maToolBox.Show();
-}
-
-USHORT SolDep::AddConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin )
-{
-//  DBG_ASSERT( FALSE , "not yet" );
-    ByteString sEndName = pEndWin->GetBodyText();
-    ByteString sStartName = pStartWin->GetBodyText();
-    if ( sStartName != ByteString("null"))
-    {
-        CommandData* pEndData = mpPrj->GetDirectoryData( sEndName );
-        SByteStringList* pDeps = pEndData->GetDependencies();
-        if ( pDeps )
-            pDeps->PutString( &sStartName );
-        else
-        {
-            pDeps = new SByteStringList();
-            pEndData->SetDependencies( pDeps );
-            pDeps->PutString( &sStartName );
-            pEndData->GetDependencies();
-        }
-    }
-    return AddConnectorToObjects( pStartWin, pEndWin );
-}
-
-USHORT SolDep::RemoveConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin )
-{
-    ByteString sEndName = pEndWin->GetBodyText();
-    ByteString sStartName = pStartWin->GetBodyText();
-    CommandData* pEndData = mpPrj->GetDirectoryData( sEndName );
-    SByteStringList* pDeps = pEndData->GetDependencies();
-    if ( pDeps )
-    {
-        ByteString* pString;
-        ULONG nDepsCount = pDeps->Count();
-        for ( ULONG j = nDepsCount; j > 0; j-- )
-        {
-            pString = pDeps->GetObject( j - 1 );
-            if ( pString->GetToken( 0, '.') == sStartName )
-                pDeps->Remove( pString );
-        }
-    }
-    return RemoveConnectorFromObjects( pStartWin, pEndWin );
-}
-
-USHORT SolDep::AutoArrange( SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nTopId, ULONG nBottmId, ULONG aObjID )
-{
-    AutoArrangeDlgStart();
-    OptimizePos(pIdMapper, pObjLst, nTopId, nBottmId, aObjID );
-    AutoArrangeDlgStop();
-    return 0;
-}
-
-Point SolDep::CalcPos( USHORT nSet, USHORT nIndex )
-{
-    int nRowIndex = nIndex / DEPPER_MAX_WIDTH;
-    ULONG nPosX = mnXOffset + nRowIndex % 3 * GetDefSize().Width() / 3 + ( nIndex - ( DEPPER_MAX_WIDTH * nRowIndex )) * (GetDefSize().Width() + OBJWIN_X_SPACING );
-
-    ULONG nPosY = ( nSet + mnLevelOffset + nRowIndex ) * ( GetDefSize().Height() + OBJWIN_Y_SPACING ) + OBJWIN_Y_SPACING;
-    Point aPos( nPosX, nPosY );
-    return aPos;
-}
-
-ULONG SolDep::CalcXOffset( ULONG nObjectsToFit )
-{
-    long nDynXOffs;
-    long nXMiddle;
-    ULONG nTrigger;
-
-    nXMiddle = GetDepWin()->PixelToLogic( GetDepWin()->GetSizePixel()).Width() / 2;
-    if ( nObjectsToFit > DEPPER_MAX_WIDTH )
-        nObjectsToFit = DEPPER_MAX_WIDTH - 1 + DEPPER_MAX_WIDTH % 2;
-    nTrigger = ( nObjectsToFit - 1 ) / 2;
-    nDynXOffs = ( GetDefSize().Width() + OBJWIN_X_SPACING ) * nTrigger;
-    ULONG nXOffs = nXMiddle - nDynXOffs;
-
-    if ( ULONG(nXMiddle - nDynXOffs) < mnMinDynXOffs )
-        mnMinDynXOffs = nXMiddle - nDynXOffs;
-
-    return nXOffs;
-
-}
-
-double SolDep::CalcDistSum( ObjWinList* pObjList, DistType eDistType )
-{
-    ObjectWin* pWin;
-    Connector* pCon;
-    ULONG nObjCount = pObjList->Count();
-    double dRetVal = 0;
-    double dWinVal;
-    USHORT i, j;
-    BOOL bIsStart;
-
-    for ( i = 0; i < nObjCount; i++ )
-    {
-        pWin = pObjList->GetObject( i );
-
-        if ( pWin && pWin->IsVisible())
-        {
-            j = 0;
-            dWinVal = 0;
-            while ( (pCon = pWin->GetConnector( j )) )
-            {
-                if ( pCon->IsVisible()) {
-                    bIsStart = pCon->IsStart( pWin );
-                    if ( eDistType != BOTH )
-                        if ( eDistType == TOPDOWN )
-                        {
-                            if ( bIsStart )
-                            {
-                                pCon->UpdatePosition( pWin, FALSE );
-                                dWinVal += pCon->GetLen() * pWin->mnHeadDist;
-                            }
-                        }
-                        else
-                        {
-                            if ( !bIsStart )
-                            {
-                                pCon->UpdatePosition( pWin, FALSE );
-                                dWinVal += pCon->GetLen() * pWin->mnRootDist;
-                            }
-
-                        }
-                    else
-                    {
-                        pCon->UpdatePosition( pWin, FALSE );
-                        if ( !bIsStart )
-                            dWinVal += pCon->GetLen() * ( pWin->mnHeadDist + 1 );
-                        else
-                            dWinVal += pCon->GetLen() * pWin->mnRootDist;
-                    }
-                }
-                j++;
-            }
-//          if ( j != 0 )
-//              dWinVal /= j;
-            dRetVal += dWinVal;
-        }
-    }
-
-    return dRetVal;
-}
-
-USHORT SolDep::Impl_Traveller( ObjectWin* pWin, USHORT nDepth )
-{
-    USHORT i = 0;
-    ObjectWin* pNewWin;
-    Connector* pCon;
-
-    nDepth++;
-
-    USHORT nMaxDepth = nDepth;
-
-    pWin->mbVisited = TRUE;
-    pWin->mnRootDist = Max ( nDepth, pWin-> mnRootDist );
-    if ( nDepth > DEPPER_MAX_DEPTH )
-    {
-        DBG_ASSERT( nDepth != DEPPER_MAX_DEPTH + 1, "Ringabh�ngigkeit!" );
-        nDepth++;
-        return DEP_ENDLES_RECURSION_FOUND;
-    }
-
-    while ( (pCon = pWin->GetConnector( i )) )
-    {
-        if ( pCon->IsStart( pWin )&& pCon->IsVisible() ) //removed: don't show null_project
-        {
-            pNewWin = pCon->GetOtherWin( pWin );
-            nMaxDepth = Max( Impl_Traveller( pNewWin, nDepth ), nMaxDepth );
-            if( nMaxDepth == DEP_ENDLES_RECURSION_FOUND )
-            {
-                mpTravellerList->Insert( pWin, LIST_APPEND );
-                return DEP_ENDLES_RECURSION_FOUND;
-            }
-        }
-        i++;
-    }
-    pWin->mnHeadDist = MAX( pWin->mnHeadDist, nMaxDepth - nDepth );
-    return nMaxDepth;
-}
-
-
-double SolDep::Impl_PermuteMin( ObjWinList& rObjList, Point* pPosArray, ObjWinList& rResultList, double dMinDist, ULONG nStart, ULONG nSize, DistType eDistType )
-{
-
-    ULONG i, j, l;
-    ULONG nEnd = nStart + nSize;
-    ObjectWin* pSwapWin;
-    ULONG nLevelObjCount = rObjList.Count();
-
-//dont use full recusion for more than 6 objects
-    if ( nLevelObjCount > 6 )
-    {
-        srand(( unsigned ) time( NULL ));
-
-        ULONG nIdx1, nIdx2;
-        for ( i = 0; i < 101; i++ )
-        {
-            UpdateSubProgrssBar(i);
-            for ( j = 0; j < 100; j++ )
-            {
-                nIdx1 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );
-                while ( rObjList.GetObject( nIdx1 ) == NULL )
-                    nIdx1 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );
-                nIdx2 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );
-                while ( nIdx1 == nIdx2 || nIdx2 == nLevelObjCount )
-                    nIdx2 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );
-
-                pSwapWin = rObjList.GetObject( nIdx1 );
-                if ( pSwapWin )
-                    pSwapWin->SetCalcPosPixel( pPosArray[ nIdx2 ] );
-                pSwapWin = rObjList.Replace( pSwapWin, nIdx2 );
-                if ( pSwapWin )
-                    pSwapWin->SetCalcPosPixel( pPosArray[ nIdx1 ] );
-                rObjList.Replace( pSwapWin, nIdx1 );
-
-                double dCurDist = CalcDistSum( &rObjList, eDistType );
-
-                if ( dCurDist < dMinDist )
-                {
-                    dMinDist = dCurDist;
-                    rResultList.Clear();
-                    for ( l = 0; l < nLevelObjCount; l++ )
-                    {
-                        pSwapWin = rObjList.GetObject( l );
-                        rResultList.Insert( pSwapWin, LIST_APPEND);
-                    }
-                }
-//              if ( dCurDist > dMinDist * 1.5 )
-                if ( dCurDist > dMinDist * 15 )
-                {
-                    pSwapWin = rObjList.GetObject( nIdx1 );
-                    if ( pSwapWin )
-                        pSwapWin->SetCalcPosPixel( pPosArray[ nIdx2 ] );
-                    pSwapWin = rObjList.Replace( pSwapWin, nIdx2 );
-                    if ( pSwapWin )
-                        pSwapWin->SetCalcPosPixel( pPosArray[ nIdx1 ] );
-                    rObjList.Replace( pSwapWin, nIdx1 );
-                }
-            }
-        }
-    }
-    else
-    {
-        for ( i = nStart ; i < nEnd; i++)
-        {
-            if ( nSize > 1 )
-            {
-                pSwapWin = rObjList.GetObject( i );
-                pSwapWin = rObjList.Replace( pSwapWin, nStart );
-                rObjList.Replace( pSwapWin, i );
-                double dPermuteDist = Impl_PermuteMin( rObjList, pPosArray, rResultList, dMinDist, nStart + 1, nSize - 1, eDistType );
-                dMinDist = MIN( dMinDist, dPermuteDist);
-                pSwapWin = rObjList.GetObject( i );
-                pSwapWin = rObjList.Replace( pSwapWin, nStart );
-                rObjList.Replace( pSwapWin, i );
-
-            }
-            else
-            {
-                for ( l = 0; l < nLevelObjCount; l++ )
-                {
-                    pSwapWin = rObjList.GetObject( l );
-                    if ( pSwapWin )
-                        pSwapWin->SetCalcPosPixel( pPosArray[ l ] );
-                }
-
-                double dCurDist = CalcDistSum( &rObjList, eDistType );
-
-                if ( dCurDist < dMinDist )
-                {
-                    dMinDist = dCurDist;
-                    rResultList.Clear();
-                    for ( l = 0; l < nLevelObjCount; l++ )
-                    {
-                        pSwapWin = rObjList.GetObject( l );
-                        rResultList.Insert( pSwapWin, LIST_APPEND);
-                    }
-                }
-
-            }
-        }
-    }
-
-    return dMinDist;
-}
-
-
-USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nTopId, ULONG nBottmId, ULONG aObjID )
-{
-    ObjWinList aWorkList;
-    ObjectWin* pWin;
-    Connector* pCon;
-    USHORT nRootDist = (USHORT) -1;
-    USHORT i, j, k, l, nRetVal;
-    USHORT LevelUse[ DEPPER_MAX_DEPTH ];
-    USHORT LevelSecUse[ DEPPER_MAX_DEPTH ];
-    ObjWinList* LevelList[ DEPPER_MAX_DEPTH ];
-    ObjWinList* LevelSecList[ DEPPER_MAX_DEPTH ];
-    Point aPosArray[ DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH ];
-
-    mnMinDynXOffs = 0xffff;
-
-    for ( i = 0; i < DEPPER_MAX_DEPTH; i++ )
-    {
-        LevelUse[ i ] = 0;
-        LevelList[ i ] = NULL;
-        LevelSecUse[ i ] = 0;
-        LevelSecList[ i ] = NULL;
-    }
-
-    GetDepWin()->EnablePaint( FALSE );
-
-    ULONG nObjCount = pObjLst->Count();
-    for ( i = 0; i < nObjCount; i++ )
-    {
-        pWin = pObjLst->GetObject( i );
-        if ( pWin->IsVisible()) {
-            pWin->mbVisited = FALSE;
-            pWin->mnHeadDist = 0;
-            pWin->mnRootDist = 0;
-
-            // find initial objects which need to be connected with
-            // root object
-            j = 0;
-            USHORT nStartCount = 0;
-            USHORT nEndCount = 0;
-            while ( (pCon = pWin->GetConnector( j )) )
-            {
-                if ( pCon->IsVisible()) {                   //null_project
-                    if( pCon->IsStart( pWin ))
-                        nStartCount++;
-                    else
-                    {
-                        nEndCount = 1;
-                        break;
-                    }
-                }
-                j++;
-            }
-
-            if ( nStartCount > 0 && nEndCount == 0 )
-                if ( nTopId != pWin->GetId())
-                    AddConnectorToObjects( pObjLst, nTopId, pWin->GetId());
-
-        }
-    }
-
-    pWin = ObjIdToPtr( pObjLst, nTopId );
-
-    if ( mpTravellerList )
-    {
-        mpTravellerList->Clear();
-        delete mpTravellerList;
-    }
-    mpTravellerList = new ObjWinList();
-    // set root and top distance
-    nRetVal = Impl_Traveller( pWin, nRootDist );
-
-    DBG_ASSERT( nRetVal < DEPPER_MAX_DEPTH , "zu tief" );
-    if ( nRetVal == DEP_ENDLES_RECURSION_FOUND )
-    {
-        WriteToErrorFile();
-        return nRetVal;
-    }
-
-    ULONG nUnvisited = 0;
-    ULONG nUnvisYOffs = 0;
-
-    // seperate mainstream, secondary and unconnected
-    for ( i = 0; i < nObjCount; i++ )
-    {
-        pWin = pObjLst->GetObject( i );
-        if ( pWin->IsVisible()) {
-            if (( pWin->mnHeadDist + pWin->mnRootDist ) == nRetVal )
-            {
-                if ( !LevelList[ pWin->mnHeadDist ] )
-                        LevelList[ pWin->mnHeadDist ] = new ObjWinList;
-                LevelList[ pWin->mnHeadDist ]->Insert( pWin );
-                LevelUse[ pWin->mnHeadDist ]++;
-            }
-            else
-                if ( pWin->mbVisited )
-                {
-                    if ( !LevelSecList[ nRetVal - pWin->mnRootDist ] )
-                        LevelSecList[ nRetVal - pWin->mnRootDist ] = new ObjWinList;
-                    LevelSecList[ nRetVal - pWin->mnRootDist ]->Insert( pWin );
-                    LevelSecUse[ nRetVal - pWin->mnRootDist ]++;
-                }
-                else
-                {
-    //              need to be arranged more intelligent...
-                    Point aPos( 5, nUnvisYOffs );
-                    pWin->SetCalcPosPixel( aPos );
-
-                    Point aTmpPos = pWin->GetCalcPosPixel();
-                    pWin->SetPosPixel( mpBaseWin->LogicToPixel( aTmpPos ));
-
-                    nUnvisYOffs += pWin->PixelToLogic( pWin->GetSizePixel()).Height();
-                    nUnvisited++;
-                }
-        }
-    }
-
-    mnLevelOffset = 0;
-
-    USHORT nScaleVal;
-
-    if ( nRetVal == 0 )
-        nScaleVal = 1;
-    else
-        nScaleVal = nRetVal;
-
-    i = 0;
-
-    USHORT nStep = 0;
-
-    while ( LevelList[ i ] )
-    {
-        UpdateMainProgressBar(i, nScaleVal, nStep);
-        DBG_ASSERT( LevelUse[ i ] == LevelList[ i ]->Count() , "level index im a..." );
-        ObjectWin* pSwapWin;
-        ULONG nLevelObjCount = LevelList[ i ]->Count();
-
-        if ( nLevelObjCount % 2 == 0 )
-        {
-            LevelList[ i ]->Insert( NULL, LIST_APPEND );
-            nLevelObjCount++;
-//          LevelUse bleibt orginal...
-//          LevelUse[ i ]++;
-        }
-
-// catch too big lists
-        DBG_ASSERT( nLevelObjCount < DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH , "graph zu breit! dat geiht nich gut. breaking" );
-        if ( nLevelObjCount >= DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH )
-        {
-            WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph zu breit! dat geiht nich gut. breaking"));
-            aWBox.Execute();
-            break;
-        }
-        mnXOffset = CalcXOffset( nLevelObjCount );
-        aWorkList.Clear();
-
-        // initial positioning for mainstream
-        for ( j = 0; j < nLevelObjCount; j++ )
-        {
-            pSwapWin = LevelList[ i ]->GetObject( j );
-            aWorkList.Insert( pSwapWin, LIST_APPEND);
-            Point aPos = CalcPos( i, j );
-            aPosArray[ j ] = aPos;
-            if ( pSwapWin )
-                pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
-        }
-
-        double dMinDist = CalcDistSum( LevelList[ i ] );
-
-        // optimize mainstream order and return best matching list in "aWorkList"
-        dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelObjCount ));
-
-        // set optimized positions - may still be wrong from later tries
-        for ( j = 0; j < nLevelObjCount; j++ )
-        {
-            pSwapWin = aWorkList.GetObject( j );
-            if ( pSwapWin )
-                pSwapWin->SetCalcPosPixel(  aPosArray[ j ] );
-        }
-
-        if ( LevelSecList[ i ] != NULL )
-        {
-            ULONG nLevelSecObjCount = LevelSecList[ i ]->Count();
-            // expand list for better positioning
-            while ( nLevelSecObjCount + LevelUse[ i ] < DEPPER_MAX_WIDTH - 1 )
-            {
-                LevelSecList[ i ]->Insert( NULL, LIST_APPEND );
-                nLevelSecObjCount++;
-            }
-            if ( ( nLevelSecObjCount + LevelUse[ i ])% 2 == 0 )
-            {
-                LevelSecList[ i ]->Insert( NULL, LIST_APPEND );
-                nLevelSecObjCount++;
-            }
-
-            DBG_ASSERT( nLevelSecObjCount < DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH , "graph zu breit! dat geiht nich gut. breaking" );
-            if ( nLevelObjCount >= DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH )
-            {
-                WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph zu breit! dat geiht nich gut. breaking"));
-                aWBox.Execute();
-                break;
-            }
-            mnXOffset = CalcXOffset( LevelUse[ i ] + nLevelSecObjCount );
-            aWorkList.Clear();
-
-            l = 0;
-            BOOL bUsedPos;
-
-            // find free positions for secondary objects
-            for ( j = 0; j < ( LevelUse[ i ] + nLevelSecObjCount ) ; j++ )
-            {
-                Point aPos = CalcPos( i, j );
-                bUsedPos = FALSE;
-                // is already occupied?
-                for ( k = 0; k < nLevelObjCount; k++ )
-                {
-                    if ( LevelList[ i ]->GetObject( k ) )
-                        if ( aPos == LevelList[ i ]->GetObject( k )->GetCalcPosPixel() )
-                            bUsedPos = TRUE;
-                }
-                // if its free, add to pool
-                if ( !bUsedPos )
-                {
-                    aPosArray[ l ] = aPos;
-                    l++;
-                }
-            }
-
-            // initial positioning for secodaries
-            for ( j = 0 ; j < nLevelSecObjCount ; j++ )
-            {
-                pSwapWin = LevelSecList[ i ]->GetObject( j );
-                aWorkList.Insert( pSwapWin, LIST_APPEND);
-                if ( pSwapWin )
-                    pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
-            }
-            dMinDist = CalcDistSum( LevelSecList[ i ] );
-
-            dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelSecList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelSecObjCount ));
-
-            // set optimized positions - may still be wrong from later tries
-            for ( j = 0; j < nLevelSecObjCount; j++ )
-            {
-                pSwapWin = aWorkList.GetObject( j );
-                if ( pSwapWin )
-                    pSwapWin->SetCalcPosPixel(  aPosArray[ j ] );
-            }
-            if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH )
-                mnLevelOffset++;
-        }
-        if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH )
-            mnLevelOffset+= ( LevelUse[ i ] + LevelSecUse[ i ] ) / DEPPER_MAX_WIDTH ;
-        i++;
-    }
-
-    mnMinDynXOffs = 0xffff;
-
-// and back again...
-    // get better results form already preoptimized upper and lower rows
-
-    do
-    {
-        i--;
-        UpdateMainProgressBar(i, nScaleVal, nStep, TRUE); // TRUE ~ counting down
-        if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH )
-            mnLevelOffset-= ( LevelUse[ i ] + LevelSecUse[ i ] ) / DEPPER_MAX_WIDTH ;
-        ObjectWin* pSwapWin;
-        ULONG nLevelObjCount = LevelList[ i ]->Count();
-        mnXOffset = CalcXOffset( nLevelObjCount );
-        aWorkList.Clear();
-
-        for ( j = 0; j < nLevelObjCount; j++ )
-        {
-            pSwapWin = LevelList[ i ]->GetObject( j );
-            aWorkList.Insert( pSwapWin, LIST_APPEND);
-            Point aPos = CalcPos( i, j );
-            aPosArray[ j ] = aPos;
-//no need to do this stuff.......   ?????
-            if ( pSwapWin )
-                pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
-        }
-
-        double dMinDist = CalcDistSum( LevelList[ i ], BOTH );
-
-        dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelObjCount, BOTH ));
-// wrong position for remaping - keep old positions for comparing
-        for ( j = 0; j < nLevelObjCount; j++ )
-        {
-            pSwapWin = aWorkList.GetObject( j );
-            if ( pSwapWin )
-//              pSwapWin->SetCalcPosPixel( mpBaseWin->LogicToPixel( aPosArray[ j ] ));
-                pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
-        }
-
-        if ( LevelSecList[ i ] != NULL )
-        {
-            ULONG nLevelSecObjCount = LevelSecList[ i ]->Count();
-            mnXOffset = CalcXOffset( LevelUse[ i ] + nLevelSecObjCount );
-            aWorkList.Clear();
-
-            l = 0;
-            BOOL bUsedPos;
-
-            for ( j = 0; j < ( LevelUse[ i ] + nLevelSecObjCount ) ; j++ )
-            {
-                Point aPos = CalcPos( i, j );
-                bUsedPos = FALSE;
-// could be faster
-                for ( k = 0; k < nLevelObjCount; k++ )
-                {
-                    if ( LevelList[ i ]->GetObject( k ) )
-                        if ( aPos == LevelList[ i ]->GetObject( k )->GetCalcPosPixel() )
-                            bUsedPos = TRUE;
-                }
-                if ( !bUsedPos )
-                {
-                    aPosArray[ l ] = aPos;
-                    l++;
-                }
-            }
-
-            for ( j = 0 ; j < nLevelSecObjCount ; j++ )
-            {
-                pSwapWin = LevelSecList[ i ]->GetObject( j );
-                aWorkList.Insert( pSwapWin, LIST_APPEND);
-                if ( pSwapWin )
-                    pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
-            }
-            dMinDist = CalcDistSum( LevelSecList[ i ], BOTH );
-
-            dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelSecList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelSecObjCount, BOTH ));
-// wrong position for remaping - keep old positions for comparing
-            for ( j = 0; j < nLevelSecObjCount; j++ )
-            {
-                pSwapWin = aWorkList.GetObject( j );
-                if ( pSwapWin )
-                    pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
-            }
-        }
-//      i--;
-    } while ( i != 0 );
-    SetMainProgressBar( 100 );
-
-    ULONG nNewXSize = ( DEPPER_MAX_WIDTH + 1 )  * ( OBJWIN_X_SPACING + GetDefSize().Width() );
-
-    //    ULONG aObjID = GetStart(pIdMapper, pObjLst) //hier mu� man switchen GetStart/GetPrjStart oder so
-
-    ObjectWin* pObjWin = ObjIdToPtr( pObjLst, aObjID);
-
-    ULONG nNewYSize = pObjWin->GetCalcPosPixel().Y() + GetDefSize().Height() + 2 * OBJWIN_Y_SPACING;
-    if (( nUnvisYOffs + GetDefSize().Height()) > nNewYSize )
-        nNewYSize = nUnvisYOffs + GetDefSize().Height();
-
-    MapMode aMapMode = GetDepWin()->GetMapMode();
-    Size aTmpSize( (ULONG) (double(nNewXSize) * double( aMapMode.GetScaleX())), (ULONG) (double( nNewYSize) * double( aMapMode.GetScaleY())));
-
-    Size aNowSize( GetGraphWin()->GetSizePixel());
-
-    if ( GetDepWin()->LogicToPixel( aNowSize ).Width() > aTmpSize.Width() )
-        aTmpSize.Width() = GetDepWin()->LogicToPixel( aNowSize ).Width() ;
-
-    if ( GetDepWin()->LogicToPixel( aNowSize ).Height()  > aTmpSize.Height() )
-        aTmpSize.Height() = GetDepWin()->LogicToPixel( aNowSize ).Height() ;
-
-//  if ( nZoomed <= 0 )
-//  {
-//      mpBaseWin->SetSizePixel( aTmpSize );
-//      mpGraphWin->SetTotalSize( aTmpSize );
-//      mpGraphWin->EndScroll( 0, 0 );
-//  }
-
-// now remap all objects
-    ULONG nAllObjCount = pObjLst->Count();
-    Point aTmpPos;
-    for ( j = 0; j < nAllObjCount; j++ )
-    {
-        pWin = pObjLst->GetObject( j );
-        if ( pWin->IsVisible()) {
-            aTmpPos = pWin->GetCalcPosPixel();
-            if ( pWin->mbVisited )
-            {
-// reserve space for unconnected
-                aTmpPos.X() -= mnMinDynXOffs;
-                aTmpPos.X() += GetDefSize().Width() + OBJWIN_X_SPACING;
-// center window
-                aTmpPos.X() += GetDefSize().Width() / 2;
-                aTmpPos.X() -= pWin->PixelToLogic( pWin->GetSizePixel()).Width() / 2 ;
-            }
-            pWin->SetPosPixel( GetDepWin()->LogicToPixel( aTmpPos ));
-        }
-    }
-    aWorkList.Clear();
-    GetDepWin()->EnablePaint( TRUE );
-    GetDepWin()->Invalidate();
-//LevelListen loeschen                  H�? Welche Levellisten?
-
-//Update all Connectors
-// --> To be done: Don't call twice Object1-Connector-Object2
-    ObjectWin* pObject1;
-    for ( i = 0 ; i < nObjCount ; i++)
-    {
-        pObject1 = pObjLst->GetObject( i );
-        if ( pObject1->IsVisible())
-            pObject1->UpdateConnectors();
-    };
-    return 0;
-}
-
-void SolDep::WriteToErrorFile()
-{
-//Needs some improvement
-    ObjectWin* pWin;
-    WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph too deep! dat geiht nich gut.\nlook at depper.err in your Tmp-directory\nfor list of objects"));
-    aWBox.Execute();
-    char *tmpdir = getenv("TMP");
-    char *errfilebasename = "depper.err";
-    char *ErrFileName = (char*) malloc( strlen( tmpdir ) + strlen( errfilebasename) + 3 );
-    *ErrFileName = '\0';
-    strcat( ErrFileName, tmpdir );
-    strcat( ErrFileName, "\\" );
-    strcat( ErrFileName, errfilebasename );
-    FILE* pErrFile = fopen( "depper.err", "w+" );
-    if ( pErrFile )
-    {
-        for ( USHORT i = 0; i < mpTravellerList->Count(); i++ )
-        {
-            pWin = mpTravellerList->GetObject( i );
-            fprintf( pErrFile, " %s -> \n", (pWin->GetBodyText()).GetBuffer());
-        }
-        fclose( pErrFile );
-    }
-}
+

+                   maToolBox.CheckItem(TID_SOLDEP_HIDE_INDEPENDEND, IsHideMode());

+                   GetDepWin()->Invalidate(); //repaint Main-View

+            }

+            break;

+        case TID_SOLDEP_SELECT_WORKSPACE:

+            if (mpStandLst)

+            {

+                if (GetVersion()) // Version dialog box

+                {

+                    delete mpSolIdMapper;

+                    delete mpStarWriter;

+                    mpObjectList->ClearAndDelete();

+                    ReadSource(TRUE);

+                }

+            }

+            break;

+        case TID_SOLDEP_BACK:

+            maToolBox.HideItem(TID_SOLDEP_BACK);

+            maToolBox.ShowItem(TID_SOLDEP_SELECT_WORKSPACE);  //disabled for prj view (doubleclick ObjWin)

+            maToolBox.ShowItem(TID_SOLDEP_HIDE_INDEPENDEND);  //disabled for prj view (doubleclick ObjWin)

+            maToolBox.ShowItem(TID_SOLDEP_FIND);              //disabled for prj view (doubleclick ObjWin)

+            maToolBox.Resize();

+            TogglePrjViewStatus();

+            break;

+    }

+    return 0;

+}

+

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

+void SolDep::ToggleHideDependency()

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

+{

+    mbIsHide = !mbIsHide;

+    maToolBox.CheckItem(TID_SOLDEP_HIDE_INDEPENDEND, IsHideMode());

+    ObjectWin* pWin = GetObjectList()->GetObject( 0 );

+    pWin->ToggleHideMode();

+};

+

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

+BOOL SolDep::GetVersion()

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

+{

+    SolSelectVersionDlg aVersionDlg( GetDepWin(), mpStandLst );

+    if ( aVersionDlg.Execute() == RET_OK ) {

+        msVersionMajor = aVersionDlg.GetVersionMajor();

+        msVersionMinor = aVersionDlg.GetVersionMinor();

+        return TRUE;

+    }

+    return FALSE;

+}

+

+void SolDep::InitContextMenueMainWnd()

+{

+    InitContextMenuePrjViewWnd( mpBaseWin );

+    return; // Disable not actually supported items

+

+    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_AUTOARRANGE, String::CreateFromAscii("Autoarrange")) ;

+    mpBaseWin->mpPopup->InsertSeparator();

+    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_READ_SOURCE, String::CreateFromAscii("Revert all changes") );

+    mpBaseWin->mpPopup->InsertSeparator();

+    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_OPEN_SOURCE, String::CreateFromAscii("Open") );

+    mpBaseWin->mpPopup->InsertItem( DEPPOPUP_WRITE_SOURCE, String::CreateFromAscii("Save") );

+}

+

+void SolDep::InitContextMenuePrjViewWnd(DepWin* pBaseWin )

+{

+    // temp. disabled pBaseWin->mpPopup->InsertItem( DEPPOPUP_NEW, String::CreateFromAscii("New object") );

+    pBaseWin->mpPopup->InsertItem( DEPPOPUP_ZOOMIN, String::CreateFromAscii("Zoom in") );

+    pBaseWin->mpPopup->InsertItem( DEPPOPUP_ZOOMOUT, String::CreateFromAscii("Zoom out") );

+    pBaseWin->mpPopup->InsertSeparator();

+    // temp disabled pBaseWin->mpPopup->InsertItem( DEPPOPUP_CLEAR, String::CreateFromAscii("Clear") );

+    pBaseWin->mpPopup->InsertItem( DEPPOPUP_SHOW_TOOLBOX, String::CreateFromAscii("Show Toolbox") );

+}

+

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

+ObjectWin *SolDep::RemoveObject( USHORT nId, BOOL bDelete )

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

+{

+    Prj* pPrj;

+

+//hshtable auf stand halten

+    ObjectWin* pWin = RemoveObjectFromList( mpObjectList, mnSolWinCount, nId, FALSE );

+    if ( pWin )

+    {

+        ByteString aBodyText( pWin->GetBodyText() );

+        if( (pPrj = mpStarWriter->GetPrj( aBodyText )) )

+        {

+            mpStarWriter->Remove( pPrj );

+//cleanup ist teuer...

+            mpStarWriter->CleanUp();

+            delete pPrj;

+        }

+        else

+            DBG_ASSERT( FALSE, "project not found - write" );

+

+        mpSolIdMapper->Delete( aBodyText );

+        if ( bDelete )

+            delete pWin;

+        return pWin;

+    }

+    else

+        return NULL;

+}

+

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

+ULONG SolDep::AddObject( ByteString& rBodyText, BOOL bInteract )

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

+{

+    ULONG nObjectId;

+    if ( bInteract )

+    {

+        nObjectId = HandleNewPrjDialog( rBodyText );

+    }

+    else

+    {

+//hashtable auf stand halten

+        MyHashObject* pHObject;

+        nObjectId = AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, rBodyText, FALSE );

+        pHObject = new MyHashObject( nObjectId, ObjIdToPtr(mpObjectList, nObjectId ));

+        mpSolIdMapper->Insert( rBodyText, pHObject );

+    }

+    return nObjectId;

+}

+

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

+ULONG SolDep::AddPrjObject( ByteString& rBodyText, BOOL bInteract )

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

+{

+    ULONG nObjectId;

+    if ( bInteract )

+    {

+        nObjectId = HandleNewDirectoryDialog( rBodyText );

+    }

+    else

+    {

+//hshtable auf stand halten

+        MyHashObject* pHObject;

+        nObjectId = AddObjectToList( mpBasePrjWin, mpObjectPrjList, mnPrjLastId, mnPrjWinCount, rBodyText );

+        pHObject = new MyHashObject( nObjectId, ObjIdToPtr( mpObjectPrjList, nObjectId ));

+        mpPrjIdMapper->Insert( rBodyText, pHObject ); // mpPrjIdMapper

+    }

+    return nObjectId;

+}

+

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

+USHORT SolDep::AddConnector( ObjectWin* pStartWin, ObjectWin* pEndWin )

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

+{

+//  DBG_ASSERT( FALSE , "not yet" );

+    ByteString sEndName = pEndWin->GetBodyText();

+    ByteString sStartName = pStartWin->GetBodyText();

+

+    Prj* pPrj = mpStarWriter->GetPrj( sEndName );

+    if ( pPrj )

+    {

+        pPrj->AddDependencies( sStartName );

+        return AddConnectorToObjects( pStartWin, pEndWin );

+    }

+    else

+    {

+        DBG_ASSERT( FALSE , "non existing Project" );

+        return 1;

+    }

+}

+

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

+USHORT SolDep::RemoveConnector( ObjectWin* pStartWin, ObjectWin* pEndWin )

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

+{

+    SByteStringList* pPrjDeps = NULL;

+    ByteString sEndName = pEndWin->GetBodyText();

+    ByteString sStartName = pStartWin->GetBodyText();

+

+    Prj* pPrj = mpStarWriter->GetPrj( sEndName );

+    pPrjDeps = pPrj->GetDependencies( FALSE );

+    if ( pPrjDeps )

+    {

+        ByteString* pString;

+        ULONG nPrjDepsCount = pPrjDeps->Count();

+        for ( ULONG j = nPrjDepsCount; j > 0; j-- )

+        {

+            pString = pPrjDeps->GetObject( j - 1 );

+            if ( pString->GetToken( 0, '.') == sStartName )

+                pPrjDeps->Remove( pString );

+        }

+    }

+

+    return RemoveConnectorFromObjects( pStartWin, pEndWin );

+}

+

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

+void SolDep::RemoveAllObjects( ObjectList* pObjLst )

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

+{

+

+    Depper::RemoveAllObjects( pObjLst );

+

+    if ( mpSolIdMapper )

+    {

+        delete mpSolIdMapper;

+        mpSolIdMapper = NULL;

+    }

+    if ( mpStarWriter )

+    {

+        delete mpStarWriter;

+        mpStarWriter = NULL;

+    }

+}

+

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

+ULONG SolDep::GetStart(SolIdMapper* pIdMapper, ObjectList* pObjList)

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

+{

+//  DBG_ASSERT( FALSE , "soldep" );

+    MyHashObject* pHObject = pIdMapper->Find( "null" );//null_project

+

+    if ( !pHObject ) {

+        ByteString sNullPrj = "null";//null_project

+        ULONG nObjectId = AddObject( sNullPrj, FALSE );

+        ObjIdToPtr( pObjList, nObjectId )->SetViewMask( 1 );

+        return nObjectId;

+    }

+

+    return pHObject->GetId();

+}

+

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

+ULONG SolDep::GetStartPrj(SolIdMapper* , ObjectList* )

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

+{

+//  DBG_ASSERT( FALSE , "prjdep" );

+    MyHashObject* pHObject = mpPrjIdMapper->Find( ByteString( "null" ) ); //null_dir

+    if ( !pHObject )

+    {

+        ByteString bsNull("null");

+        ULONG nObjectId = AddPrjObject( bsNull, FALSE); //null_dir

+        return nObjectId;

+    }

+    else

+        return pHObject->GetId();

+}

+

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

+USHORT SolDep::OpenSource()

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

+{

+    if ( mpStandLst ) {

+        if ( GetVersion())

+            return ReadSource();

+    }

+    return 0;

+}

+

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

+USHORT SolDep::ReadSource(BOOL bUpdater)

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

+{

+    mpBaseWin->EnablePaint( FALSE );

+    mpBaseWin->Hide();

+    ULONG nObjectId, nHashedId;

+    ULONG i;

+    MyHashObject* pHObject;

+    ByteString* pStr;

+    ObjectWin *pStartWin, *pEndWin;

+

+    mpSolIdMapper = new SolIdMapper( 63997 );

+    if (mpStandLst && bUpdater)

+    {

+        mpStarWriter = new StarWriter( mpStandLst, msVersionMajor, msVersionMinor, TRUE );

+    } else

+    {

+        SolarFileList* pSolarFileList;

+        pSolarFileList = GetPrjListFromDir();

+        mpStarWriter = new StarWriter( pSolarFileList, TRUE );

+    }

+    ByteString sTitle( SOLDEPL_NAME );

+    if ( mpStarWriter->GetMode() == STAR_MODE_SINGLE_PARSE ) {

+        sTitle += ByteString( " - mode: single file [" );

+           sTitle += (ByteString) mpStarWriter->GetName();

+        sTitle += ByteString( "]" );

+    }

+    else if ( mpStarWriter->GetMode() == STAR_MODE_MULTIPLE_PARSE ) {

+        sTitle += ByteString( " - mode: multiple files [" );

+        sTitle += ByteString( "]" );

+    }

+    SetTitle( String( sTitle, RTL_TEXTENCODING_UTF8) );

+

+    ULONG nCount = mpStarWriter->Count();

+    for ( i=0; i<nCount; i++ )

+    {

+        Prj *pPrj = mpStarWriter->GetObject(i);

+        ByteString sPrjName = pPrj->GetProjectName();

+        nObjectId = AddObject( sPrjName, FALSE );

+        ObjIdToPtr( mpObjectList, nObjectId )->SetViewMask( 1 );

+    }

+    for ( i=0; i<nCount; i++ )

+    {

+        Prj *pPrj = mpStarWriter->GetObject(i);

+        SByteStringList *pLst = pPrj->GetDependencies( FALSE );

+        if ( pLst )

+        {

+            ULONG nDepCount = pLst->Count();

+            for ( ULONG m=0; m<nDepCount; m++)

+            {

+                pStr = pLst->GetObject(m);

+                pHObject = mpSolIdMapper->Find( *pStr );

+                /*if ( !pHObject )

+                {

+    // create new prj

+                    Prj *pNewPrj = new Prj( *pStr );

+                    ByteString sPrjName = pNewPrj->GetProjectName();

+                    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;

+                pHObject = mpSolIdMapper->Find( *pStr );

+                nObjectId = pHObject->GetId();

+                pStartWin = ObjIdToPtr( mpObjectList, nHashedId );

+                pEndWin = ObjIdToPtr( mpObjectList, nObjectId );

+                AddConnectorToObjects( pStartWin, pEndWin );

+            }

+        }

+    }

+    }

+    if (!IsPrjView())

+    {

+        AutoArrange( mpSolIdMapper, mpObjectList, GetStart(mpSolIdMapper,mpObjectList), 0, GetStart(mpSolIdMapper,mpObjectList) );

+        GetDepWin()->EnablePaint( TRUE );

+    }

+    return 0;

+}

+

+SolarFileList* SolDep::GetPrjListFromDir()

+{

+    SolarFileList* pSolarFileList = new SolarFileList();

+    String sPrjDir( String::CreateFromAscii( "prj" ));

+    String sBuildLst( String::CreateFromAscii( "build.lst" ));

+    DirEntry aCurrent( getenv( SOURCEROOT ) );

+

+    aCurrent.ToAbs();

+    Dir aDir( aCurrent, FSYS_KIND_DIR );

+

+    USHORT nEntries = aDir.Count();

+    if( nEntries )

+    {

+        UniStringList aSortDirList;

+        for ( USHORT n = 0; n < nEntries; n++ )

+        {

+            DirEntry& rEntry = aDir[n];

+            UniString aName( rEntry.GetName() );

+            if( aName.Len() && ( aName.GetChar(0) != '.' ) && rEntry.Exists() )

+            {

+                rEntry += DirEntry( sPrjDir );

+                rEntry += DirEntry( sBuildLst );

+                if (rEntry.Exists())

+                {

+                    pSolarFileList->Insert( new String( rEntry.GetFull() ), LIST_APPEND );

+                    ByteString aName_dbg(rEntry.GetFull(),RTL_TEXTENCODING_UTF8);

+                    fprintf(stdout, "bla:%s\n", aName_dbg.GetBuffer());

+                }

+            }

+        }

+    }

+    if ( !pSolarFileList->Count() )

+    {

+         //is empty!! TBD

+         delete pSolarFileList;

+         return NULL;

+    }

+    return pSolarFileList;

+}

+

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

+USHORT SolDep::WriteSource()

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

+{

+/* zur Sicherheit deaktiviert

+    USHORT nMode = mpStarWriter->GetMode();

+    if ( nMode == STAR_MODE_SINGLE_PARSE ) {

+        ByteString sFileName = mpStarWriter->GetName();

+        if ( sFileName.Len()) {

+            mpStarWriter->Write( String( sFileName, RTL_TEXTENCODING_UTF8) );

+            mpStarWriter->RemoveProject( ByteString( "null"));  //null_project

+        }

+    }

+    else if ( nMode == STAR_MODE_MULTIPLE_PARSE ) {

+    // *OBO*

+    //String sRoot = mpStarWriter->GetSourceRoot();

+    //nicht mehr unterst�tzt mpStarWriter->GetSourceRoot()

+        ByteString sFileName = mpStarWriter->GetName();

+        DirEntry aEntry( sFileName );

+        aEntry.ToAbs();

+        aEntry = aEntry.GetPath().GetPath().GetPath();

+        String sRoot = aEntry.GetFull();

+

+        if ( sRoot.Len()) {

+            mpStarWriter->RemoveProject( ByteString( "null")); //null_project

+            mpStarWriter->WriteMultiple( sRoot );

+        }

+    }

+*/

+    return 1;

+}

+

+USHORT SolDep::Load( const ByteString& rFileName )

+{

+// moved from depper class

+    DBG_ASSERT( FALSE , "you are dead!" );

+    SvFileStream aInFile( String( rFileName, RTL_TEXTENCODING_UTF8 ), STREAM_READ );

+    depper_head dh;

+    ULONG i;

+    ULONG nLoadOffs = mnSolLastId;     //or Prj??

+    ObjectWin* pNewWin;

+    aInFile.Read( &dh, sizeof( dh ));

+

+    ULONG nObjCount = dh.nObjectCount;

+    ULONG nCnctrCount = dh.nCnctrCount;

+

+    for ( i=0; i < nObjCount ; i++ )

+    {

+        ObjectWin* pWin = new ObjectWin( mpBaseWin, WB_BORDER );

+        pWin->Load( aInFile );

+        pNewWin = ObjIdToPtr( mpObjectList, AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, pWin->GetBodyText(), FALSE ));

+        pNewWin->SetId( nLoadOffs + pWin->GetId());

+        pNewWin->SetPosPixel( pWin->GetPosPixel());

+        pNewWin->SetSizePixel( pWin->GetSizePixel());

+    }

+

+    ULONG nStartId;

+    ULONG nEndId;

+//  ueber addconnector fuehren!

+    for ( i=0; i < nCnctrCount ; i++ )

+    {

+        Connector* pCon = new Connector( mpBaseWin, WB_NOBORDER );

+        pCon->Load( aInFile );

+

+        nStartId = nLoadOffs + pCon->GetStartId();

+        nEndId = nLoadOffs + pCon->GetEndId();

+

+        ObjectWin* pStartWin = ObjIdToPtr( mpObjectList, nStartId );

+        ObjectWin* pEndWin = ObjIdToPtr( mpObjectList, nEndId );

+

+        pCon->Initialize( pStartWin, pEndWin );

+    }

+

+

+    return 0;

+}

+

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

+BOOL SolDep::ViewContent( ByteString& rObjectName )

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

+{

+    mpFocusWin = NULL;

+    SetPrjViewStatus(TRUE);

+

+    for ( ULONG i = 0; i < mpObjectList->Count() && !mpFocusWin; i++ )

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

+            mpFocusWin = mpObjectList->GetObject( i );

+    //HideObjectsAndConnections( mpObjectList );

+    mpProcessWin->Resize();

+    GetDepWin()->Show();

+    return InitPrj( rObjectName );

+}

+

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

+BOOL SolDep::InitPrj( ByteString& rListName )

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

+{

+    ULONG nObjectId, nHashedId;

+    ULONG i, j;

+    MyHashObject* pHObject;

+    ByteString *pDepName;

+    ByteString *pFlagName;

+    Prj* pPrj;

+    ObjectWin *pStartWin, *pEndWin;

+    maToolBox.HideItem(TID_SOLDEP_SELECT_WORKSPACE);

+    maToolBox.HideItem(TID_SOLDEP_HIDE_INDEPENDEND);

+    maToolBox.HideItem(TID_SOLDEP_FIND);

+    maToolBox.ShowItem(TID_SOLDEP_BACK);

+    maToolBox.Invalidate();

+

+    //clean up

+    mpObjectPrjList->ClearAndDelete();

+    GetDepWin()->ClearConnectorList();

+    if (mpPrjIdMapper) delete mpPrjIdMapper;

+    mpPrjIdMapper = new SolIdMapper( 63997 ); //generate clean mapper

+    mnPrjWinCount = 0;

+    mnPrjLastId = 0;

+

+    ULONG nCount = mpStarWriter->Count();

+    GetDepWin()->EnablePaint( FALSE );

+    Point aPnt = GetGraphWin()->GetPosPixel();

+    Size aSize = GetGraphWin()->GetSizePixel();

+

+    GetGraphWin()->SetPosSizePixel( aPnt, aSize );         // Hier wird das Window gesetzt

+

+    BOOL bReturn = FALSE;

+

+    for ( i=0; i<nCount; i++ )

+    {

+// pPrj->GetProjectName() returns the name of

+// the project e.g. svtools

+        pPrj = mpStarWriter->GetObject(i);

+        ByteString sPrjName = pPrj->GetProjectName();

+        if ( sPrjName == rListName )

+        {

+            bReturn = TRUE;

+

+            mpPrj = mpStarWriter->GetObject(i);

+            ULONG nDirCount = mpPrj->Count();

+            for ( j=0; j<nDirCount; j++ )

+            {

+                CommandData *pData = mpPrj->GetObject(j);

+                fprintf( stdout, "\tProjectDir : %s\n",

+                        pData->GetLogFile().GetBuffer());

+// pData->GetLogFile() contains internal project IDs

+// e.g. st_mkout etc.

+                if ( pData->GetLogFile() != "" )

+                {

+                    ByteString sItem = pData->GetLogFile();

+                    nObjectId = AddPrjObject( sItem, FALSE);

+// there may be faster ways......

+                    ObjectWin *pWin = ObjIdToPtr( mpObjectPrjList, nObjectId );

+                    pWin->SetViewMask( 0x0001 );

+// pData->GetPath() contains internal project directories

+// e.g. svtools/inc etc.

+                    ByteString sPath = pData->GetPath();

+                    pWin->SetTipText( sPath );

+                }

+            }

+

+// set connectors for dependencies here

+            for ( j=0; j<nDirCount; j++ )

+            {

+                CommandData *pData = mpPrj->GetObject(j);

+                SByteStringList *pDeps = pData->GetDependencies();

+                if ( pDeps )

+                {

+                    ByteString sFlagName = pData->GetLogFile();

+                    pFlagName = &sFlagName;

+                    //pHObject = mpPrjIdMapper->Find( (*pFlagName).GetToken( 0, '.'));//mpSolIdMapper see ReadSource()

+                    pHObject = mpPrjIdMapper->Find( sFlagName.GetToken( 0, '.'));

+                    if (pHObject)

+                    {

+

+                        nObjectId = pHObject->GetId();

+

+                        ULONG nDepCount = pDeps->Count();

+                        for ( ULONG k=0; k<nDepCount; k++ )

+                        {

+                            pDepName = pDeps->GetObject(k);

+                            pHObject = mpPrjIdMapper->Find( (*pDepName).GetToken( 0, '.'));

+                            if (pHObject )

+                            {

+                                nHashedId = pHObject->GetId();

+                                pStartWin = ObjIdToPtr( mpObjectPrjList, nHashedId );

+                                pEndWin = ObjIdToPtr( mpObjectPrjList, nObjectId );

+

+                                AddConnectorToObjects( pStartWin, pEndWin );

+                            }

+                            else

+                            {

+                                String sMessage;

+                                sMessage += String::CreateFromAscii("can't find ");

+                                sMessage += String( *pDepName, RTL_TEXTENCODING_UTF8 );

+                                sMessage += String::CreateFromAscii(".\ndependency ignored");

+                                WarningBox aBox( GetDepWin(), WB_OK, sMessage);

+                                aBox.Execute();

+                            }

+                        }

+                    }

+                }

+

+            }

+

+            break;

+        }

+    }

+    ByteString sNullDir = "null";

+    nObjectId = AddPrjObject( sNullDir, FALSE);

+    ObjectWin *pWin = ObjIdToPtr( mpObjectPrjList, nObjectId );

+    pWin->SetViewMask( 0x0001 );

+    mpGraphPrjWin->EnablePaint( TRUE );

+    //debug

+//    int test_l = GetStartPrj(mpPrjIdMapper, mpObjectPrjList);

+//    ObjectWin *pTestWin = ObjIdToPtr( mpObjectPrjList, test_l );

+    AutoArrange( mpPrjIdMapper, mpObjectPrjList, GetStartPrj(mpPrjIdMapper, mpObjectPrjList), 0, GetStartPrj(mpPrjIdMapper, mpObjectPrjList) );

+    mpGraphWin->Hide();

+    mpGraphPrjWin->Show();

+    mpGraphPrjWin->Invalidate();

+

+    return bReturn;

+}

+

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

+USHORT SolDep::CloseWindow()

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

+{

+

+    ((SystemWindow*)mpProcessWin)->Close();

+    return 0;

+}

+

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

+void SolDep::ShowHelp()

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

+{

+    SvFileStream aHelpFile( String::CreateFromAscii( "g:\\soldep.hlp" ), STREAM_READ );

+    String aHelpText;

+    ByteString aGetStr;

+

+    if ( aHelpFile.IsOpen() )

+    {

+        while ( aHelpFile.ReadLine( aGetStr ) )

+        {

+            aHelpText += String (aGetStr, RTL_TEXTENCODING_UTF8);

+            aHelpText += String::CreateFromAscii("\n");

+        }

+    }

+    else

+        aHelpText = String::CreateFromAscii("No Helpfile found.");

+

+    SolHelpDlg aHelpDlg( mpBaseWin, DtSodResId( RID_SD_DIALOG_HELP ));

+    aHelpDlg.maMLEHelp.SetText( aHelpText );

+    aHelpDlg.maMLEHelp.SetReadOnly();

+    aHelpDlg.maMLEHelp.EnableFocusSelectionHide( TRUE );

+    aHelpDlg.Execute();

+}

+

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

+BOOL SolDep::FindProject()

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

+{

+    SolFindProjectDlg aFindProjectDlg( GetDepWin(), GetObjectList() );

+    ObjectWin* pObjectWin = NULL;

+    mpObjectList->ResetSelectedObject();

+    if (IsHideMode())

+    {

+        GetDepWin()->Invalidate();

+    }

+

+    mpFocusWin=NULL;

+

+    if ( aFindProjectDlg.Execute() == RET_OK ) {

+        msProject = aFindProjectDlg.GetProject();

+        //now we have a project string

+

+        pObjectWin = mpObjectList->GetPtrByName( msProject );

+        if (pObjectWin)

+        {

+            mpObjectList->ResetSelectedObject();

+            MarkObjects( pObjectWin );

+        }

+        else

+        {

+            mpObjectList->ResetSelectedObject();

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

+            {

+               ObjectWin* pObjectWin = mpObjectList->GetObject( i );

+               if ( !pObjectWin->IsTop() )

+                    pObjectWin->SetViewMask(FALSE);

+            }

+        }

+    }

+    return FALSE;

+}

+

+BOOL SolDep::MarkObjects( ObjectWin* pObjectWin )

+{

+    if (pObjectWin)

+    {

+        if (!(pObjectWin->IsNullObject()))

+        {

+            pObjectWin->SetMarkMode( MARKMODE_SELECTED );

+              pObjectWin->MarkNeeded();

+            pObjectWin->MarkDepending();

+            if (IsHideMode())

+            {

+                GetDepWin()->Invalidate();

+            }

+        } else

+        {

+            fprintf(stdout,"null\n");

+        }

+    }

+    return TRUE;

+}

+

+void SolDep::Resize()

+{

+//funzt! mu� aber von der applikation aufgerufen werden.

+    Point aOutPos = Point( 0, 0 );

+    Size aOutSize = mpProcessWin->GetOutputSizePixel();

+        // calculate output size

+    ULONG nTaskHeight = maToolBox.CalcWindowSizePixel().Height();

+    ULONG nTaskWidth  = maToolBox.CalcWindowSizePixel().Width();

+    Size aSize( aOutSize.Width(), nTaskHeight );

+

+//  ULONG nMenuHeight = 0;

+    Point aGraphWinPos = Point(0,0);

+    Size  aGraphWinSize = Size(0,0);

+

+//wei� nicht wie:    nMenuHeight = aMenuBar.GetWindow()->GetSizePixel().Height(); //H�he des Menues

+

+    //aInRect = pTBManager->Resize( Rectangle( aOutPos, aOutSize );

+    // Set Docking-Rectangle for ToolBar

+    Rectangle aInRect;

+

+    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_TOP ))

+    {

+        // waagerechte Toolbar oben

+        maToolBox.SetPosSizePixel( aOutPos, Size( aOutSize.Width(), maToolBox.CalcWindowSizePixel().Height()));

+        if( maToolBox.IsVisible())

+        {

+            Point aOutPosTmp;

+            Size aOutSizeTmp;

+            aOutPosTmp = Point( aOutPos.X(), aOutPos.Y() + maToolBox.CalcWindowSizePixel().Height());

+            aOutSizeTmp = Size( aOutSize.Width(), aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height());

+            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );

+            aGraphWinPos = Point( 0, nTaskHeight );

+            aGraphWinSize = Size( aOutSize.Width(), aOutSize.Height() - nTaskHeight);

+        }

+    }

+    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_BOTTOM ))

+    {

+        // waagerechte Toolbar unten

+        Point aTbPos  = Point( aOutPos.X(), aOutPos.Y() + aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height());

+        Size  aTbSize = Size( aOutSize.Width(), maToolBox.CalcWindowSizePixel().Height());

+        maToolBox.SetPosSizePixel( aTbPos, aTbSize );

+        if( maToolBox.IsVisible())

+        {

+            Point aOutPosTmp;

+            Size aOutSizeTmp;

+            aOutPosTmp = Point( aOutPos.X(), aOutPos.Y() + maToolBox.CalcWindowSizePixel().Height());

+            aOutSizeTmp = Size( aOutSize.Width(), aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height());

+            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );

+            aGraphWinPos = Point( 0, 0 );

+            aGraphWinSize = Size( aOutSize.Width(), aOutSize.Height() - nTaskHeight);

+        }

+    }

+    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_LEFT ))

+    {

+        // senkrechte ToolBar links

+        maToolBox.SetPosSizePixel( aOutPos, Size( maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height()));

+        if( maToolBox.IsVisible())

+        {

+            Point aOutPosTmp;

+            Size aOutSizeTmp;

+            aOutPosTmp = Point( aOutPos.X() + maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y());

+            aOutSizeTmp = Size( aOutSize.Width()- maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height());

+            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );

+            aGraphWinPos = Point( nTaskWidth, 0 );

+            aGraphWinSize = Size( aOutSize.Width() - nTaskWidth, aOutSize.Height());

+        }

+    }

+    if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_RIGHT ))

+    {

+        // senkrechte ToolBar rechts

+        Point aTbPos = Point( aOutPos.X() + aOutSize.Width() - maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y());

+        Size  aTbSize= Size( maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height());

+        maToolBox.SetPosSizePixel( aTbPos, aTbSize);

+        if( maToolBox.IsVisible())

+        {

+            Point aOutPosTmp;

+            Size aOutSizeTmp;

+            aOutPosTmp = Point( aOutPos.X() + maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y());

+            aOutSizeTmp = Size( aOutSize.Width()- maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height());

+            aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );

+            aGraphWinPos = Point( 0, 0 );

+            aGraphWinSize = Size( aOutSize.Width() - nTaskWidth, aOutSize.Height());

+        }

+    }

+

+    Rectangle rout = Rectangle( Point( 0,0 ), aOutSize ); //OutputToScreenPixel( aOutPos )

+    Rectangle rin  = Rectangle( Point( 0,0 ),//OutputToScreenPixel( Point( aOutPos.X() - 20, aInRect.Top())

+                Size( aOutSize.Width(), aOutSize.Height()));

+/*

+    Rectangle rout = mpProcessWin->OutputToScreenPixel( aOutPos );

+    Rectangle rin  = Rectangle( Point( 0,0 ),//OutputToScreenPixel( Point( aOutPos.X() - 20, aInRect.Top())

+                Size( aOutSize.Width(), aOutSize.Height()));

+*/

+    maToolBox.SetDockingRects( rout, rin );

+

+    BOOL bFloating = maToolBox.IsFloatingMode();

+

+    if ( bFloating )

+    {

+        GetGraphWin()->SetPosSizePixel(Point(0,0),aOutSize);

+        //if (IsPrjView() && (mpPrjDep)) mpPrjDep->Resize();

+        if (maToolBox.IsVisible()) maToolBox.Show();

+    } else

+    {

+        GetGraphWin()->SetPosSizePixel( aGraphWinPos, aGraphWinSize );

+    }

+    if (maToolBox.IsVisible()) maToolBox.Show();

+}

+

+USHORT SolDep::AddConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin )

+{

+//  DBG_ASSERT( FALSE , "not yet" );

+    ByteString sEndName = pEndWin->GetBodyText();

+    ByteString sStartName = pStartWin->GetBodyText();

+    if ( sStartName != ByteString("null"))

+    {

+        CommandData* pEndData = mpPrj->GetDirectoryData( sEndName );

+        SByteStringList* pDeps = pEndData->GetDependencies();

+        if ( pDeps )

+            pDeps->PutString( &sStartName );

+        else

+        {

+            pDeps = new SByteStringList();

+            pEndData->SetDependencies( pDeps );

+            pDeps->PutString( &sStartName );

+            pEndData->GetDependencies();

+        }

+    }

+    return AddConnectorToObjects( pStartWin, pEndWin );

+}

+

+USHORT SolDep::RemoveConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin )

+{

+    ByteString sEndName = pEndWin->GetBodyText();

+    ByteString sStartName = pStartWin->GetBodyText();

+    CommandData* pEndData = mpPrj->GetDirectoryData( sEndName );

+    SByteStringList* pDeps = pEndData->GetDependencies();

+    if ( pDeps )

+    {

+        ByteString* pString;

+        ULONG nDepsCount = pDeps->Count();

+        for ( ULONG j = nDepsCount; j > 0; j-- )

+        {

+            pString = pDeps->GetObject( j - 1 );

+            if ( pString->GetToken( 0, '.') == sStartName )

+                pDeps->Remove( pString );

+        }

+    }

+    return RemoveConnectorFromObjects( pStartWin, pEndWin );

+}

+

+USHORT SolDep::AutoArrange( SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nTopId, ULONG nBottmId, ULONG aObjID )

+{

+    AutoArrangeDlgStart();

+    OptimizePos(pIdMapper, pObjLst, nTopId, nBottmId, aObjID );

+    AutoArrangeDlgStop();

+    return 0;

+}

+

+Point SolDep::CalcPos( USHORT nSet, USHORT nIndex )

+{

+    int nRowIndex = nIndex / DEPPER_MAX_WIDTH;

+    ULONG nPosX = mnXOffset + nRowIndex % 3 * GetDefSize().Width() / 3 + ( nIndex - ( DEPPER_MAX_WIDTH * nRowIndex )) * (GetDefSize().Width() + OBJWIN_X_SPACING );

+

+    ULONG nPosY = ( nSet + mnLevelOffset + nRowIndex ) * ( GetDefSize().Height() + OBJWIN_Y_SPACING ) + OBJWIN_Y_SPACING;

+    Point aPos( nPosX, nPosY );

+    return aPos;

+}

+

+ULONG SolDep::CalcXOffset( ULONG nObjectsToFit )

+{

+    long nDynXOffs;

+    long nXMiddle;

+    ULONG nTrigger;

+

+    nXMiddle = GetDepWin()->PixelToLogic( GetDepWin()->GetSizePixel()).Width() / 2;

+    if ( nObjectsToFit > DEPPER_MAX_WIDTH )

+        nObjectsToFit = DEPPER_MAX_WIDTH - 1 + DEPPER_MAX_WIDTH % 2;

+    nTrigger = ( nObjectsToFit - 1 ) / 2;

+    nDynXOffs = ( GetDefSize().Width() + OBJWIN_X_SPACING ) * nTrigger;

+    ULONG nXOffs = nXMiddle - nDynXOffs;

+

+    if ( ULONG(nXMiddle - nDynXOffs) < mnMinDynXOffs )

+        mnMinDynXOffs = nXMiddle - nDynXOffs;

+

+    return nXOffs;

+

+}

+

+double SolDep::CalcDistSum( ObjWinList* pObjList, DistType eDistType )

+{

+    ObjectWin* pWin;

+    Connector* pCon;

+    ULONG nObjCount = pObjList->Count();

+    double dRetVal = 0;

+    double dWinVal;

+    USHORT i, j;

+    BOOL bIsStart;

+

+    for ( i = 0; i < nObjCount; i++ )

+    {

+        pWin = pObjList->GetObject( i );

+

+        if ( pWin && pWin->IsVisible())

+        {

+            j = 0;

+            dWinVal = 0;

+            while ( (pCon = pWin->GetConnector( j )) )

+            {

+                if ( pCon->IsVisible()) {

+                    bIsStart = pCon->IsStart( pWin );

+                    if ( eDistType != BOTH )

+                        if ( eDistType == TOPDOWN )

+                        {

+                            if ( bIsStart )

+                            {

+                                pCon->UpdatePosition( pWin, FALSE );

+                                dWinVal += pCon->GetLen() * pWin->mnHeadDist;

+                            }

+                        }

+                        else

+                        {

+                            if ( !bIsStart )

+                            {

+                                pCon->UpdatePosition( pWin, FALSE );

+                                dWinVal += pCon->GetLen() * pWin->mnRootDist;

+                            }

+

+                        }

+                    else

+                    {

+                        pCon->UpdatePosition( pWin, FALSE );

+                        if ( !bIsStart )

+                            dWinVal += pCon->GetLen() * ( pWin->mnHeadDist + 1 );

+                        else

+                            dWinVal += pCon->GetLen() * pWin->mnRootDist;

+                    }

+                }

+                j++;

+            }

+//          if ( j != 0 )

+//              dWinVal /= j;

+            dRetVal += dWinVal;

+        }

+    }

+

+    return dRetVal;

+}

+

+USHORT SolDep::Impl_Traveller( ObjectWin* pWin, USHORT nDepth )

+{

+    USHORT i = 0;

+    ObjectWin* pNewWin;

+    Connector* pCon;

+

+    nDepth++;

+

+    USHORT nMaxDepth = nDepth;

+

+    pWin->mbVisited = TRUE;

+    pWin->mnRootDist = Max ( nDepth, pWin-> mnRootDist );

+    if ( nDepth > DEPPER_MAX_DEPTH )

+    {

+        DBG_ASSERT( nDepth != DEPPER_MAX_DEPTH + 1, "Ringabh�ngigkeit!" );

+        nDepth++;

+        return DEP_ENDLES_RECURSION_FOUND;

+    }

+

+    while ( (pCon = pWin->GetConnector( i )) )

+    {

+        if ( pCon->IsStart( pWin )&& pCon->IsVisible() ) //removed: don't show null_project

+        {

+            pNewWin = pCon->GetOtherWin( pWin );

+            nMaxDepth = Max( Impl_Traveller( pNewWin, nDepth ), nMaxDepth );

+            if( nMaxDepth == DEP_ENDLES_RECURSION_FOUND )

+            {

+                mpTravellerList->Insert( pWin, LIST_APPEND );

+                return DEP_ENDLES_RECURSION_FOUND;

+            }

+        }

+        i++;

+    }

+    pWin->mnHeadDist = MAX( pWin->mnHeadDist, nMaxDepth - nDepth );

+    return nMaxDepth;

+}

+

+

+double SolDep::Impl_PermuteMin( ObjWinList& rObjList, Point* pPosArray, ObjWinList& rResultList, double dMinDist, ULONG nStart, ULONG nSize, DistType eDistType )

+{

+

+    ULONG i, j, l;

+    ULONG nEnd = nStart + nSize;

+    ObjectWin* pSwapWin;

+    ULONG nLevelObjCount = rObjList.Count();

+

+//dont use full recusion for more than 6 objects

+    if ( nLevelObjCount > 6 )

+    {

+        srand(( unsigned ) time( NULL ));

+

+        ULONG nIdx1, nIdx2;

+        for ( i = 0; i < 101; i++ )

+        {

+            UpdateSubProgrssBar(i);

+            for ( j = 0; j < 100; j++ )

+            {

+                nIdx1 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );

+                while ( rObjList.GetObject( nIdx1 ) == NULL )

+                    nIdx1 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );

+                nIdx2 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );

+                while ( nIdx1 == nIdx2 || nIdx2 == nLevelObjCount )

+                    nIdx2 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );

+

+                pSwapWin = rObjList.GetObject( nIdx1 );

+                if ( pSwapWin )

+                    pSwapWin->SetCalcPosPixel( pPosArray[ nIdx2 ] );

+                pSwapWin = rObjList.Replace( pSwapWin, nIdx2 );

+                if ( pSwapWin )

+                    pSwapWin->SetCalcPosPixel( pPosArray[ nIdx1 ] );

+                rObjList.Replace( pSwapWin, nIdx1 );

+

+                double dCurDist = CalcDistSum( &rObjList, eDistType );

+

+                if ( dCurDist < dMinDist )

+                {

+                    dMinDist = dCurDist;

+                    rResultList.Clear();

+                    for ( l = 0; l < nLevelObjCount; l++ )

+                    {

+                        pSwapWin = rObjList.GetObject( l );

+                        rResultList.Insert( pSwapWin, LIST_APPEND);

+                    }

+                }

+//              if ( dCurDist > dMinDist * 1.5 )

+                if ( dCurDist > dMinDist * 15 )

+                {

+                    pSwapWin = rObjList.GetObject( nIdx1 );

+                    if ( pSwapWin )

+                        pSwapWin->SetCalcPosPixel( pPosArray[ nIdx2 ] );

+                    pSwapWin = rObjList.Replace( pSwapWin, nIdx2 );

+                    if ( pSwapWin )

+                        pSwapWin->SetCalcPosPixel( pPosArray[ nIdx1 ] );

+                    rObjList.Replace( pSwapWin, nIdx1 );

+                }

+            }

+        }

+    }

+    else

+    {

+        for ( i = nStart ; i < nEnd; i++)

+        {

+            if ( nSize > 1 )

+            {

+                pSwapWin = rObjList.GetObject( i );

+                pSwapWin = rObjList.Replace( pSwapWin, nStart );

+                rObjList.Replace( pSwapWin, i );

+                double dPermuteDist = Impl_PermuteMin( rObjList, pPosArray, rResultList, dMinDist, nStart + 1, nSize - 1, eDistType );

+                dMinDist = MIN( dMinDist, dPermuteDist);

+                pSwapWin = rObjList.GetObject( i );

+                pSwapWin = rObjList.Replace( pSwapWin, nStart );

+                rObjList.Replace( pSwapWin, i );

+

+            }

+            else

+            {

+                for ( l = 0; l < nLevelObjCount; l++ )

+                {

+                    pSwapWin = rObjList.GetObject( l );

+                    if ( pSwapWin )

+                        pSwapWin->SetCalcPosPixel( pPosArray[ l ] );

+                }

+

+                double dCurDist = CalcDistSum( &rObjList, eDistType );

+

+                if ( dCurDist < dMinDist )

+                {

+                    dMinDist = dCurDist;

+                    rResultList.Clear();

+                    for ( l = 0; l < nLevelObjCount; l++ )

+                    {

+                        pSwapWin = rObjList.GetObject( l );

+                        rResultList.Insert( pSwapWin, LIST_APPEND);

+                    }

+                }

+

+            }

+        }

+    }

+

+    return dMinDist;

+}

+

+

+USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nTopId, ULONG nBottmId, ULONG aObjID )

+{

+    ObjWinList aWorkList;

+    ObjectWin* pWin;

+    Connector* pCon;

+    USHORT nRootDist = (USHORT) -1;

+    USHORT i, j, k, l, nRetVal;

+    USHORT LevelUse[ DEPPER_MAX_DEPTH ];

+    USHORT LevelSecUse[ DEPPER_MAX_DEPTH ];

+    ObjWinList* LevelList[ DEPPER_MAX_DEPTH ];

+    ObjWinList* LevelSecList[ DEPPER_MAX_DEPTH ];

+    Point aPosArray[ DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH ];

+

+    mnMinDynXOffs = 0xffff;

+

+    for ( i = 0; i < DEPPER_MAX_DEPTH; i++ )

+    {

+        LevelUse[ i ] = 0;

+        LevelList[ i ] = NULL;

+        LevelSecUse[ i ] = 0;

+        LevelSecList[ i ] = NULL;

+    }

+

+    GetDepWin()->EnablePaint( FALSE );

+

+    ULONG nObjCount = pObjLst->Count();

+    for ( i = 0; i < nObjCount; i++ )

+    {

+        pWin = pObjLst->GetObject( i );

+        if ( pWin->IsVisible()) {

+            pWin->mbVisited = FALSE;

+            pWin->mnHeadDist = 0;

+            pWin->mnRootDist = 0;

+

+            // find initial objects which need to be connected with

+            // root object

+            j = 0;

+            USHORT nStartCount = 0;

+            USHORT nEndCount = 0;

+            while ( (pCon = pWin->GetConnector( j )) )

+            {

+                if ( pCon->IsVisible()) {                   //null_project

+                    if( pCon->IsStart( pWin ))

+                        nStartCount++;

+                    else

+                    {

+                        nEndCount = 1;

+                        break;

+                    }

+                }

+                j++;

+            }

+

+            if ( nStartCount > 0 && nEndCount == 0 )

+                if ( nTopId != pWin->GetId())

+                    AddConnectorToObjects( pObjLst, nTopId, pWin->GetId());

+

+        }

+    }

+

+    pWin = ObjIdToPtr( pObjLst, nTopId );

+

+    if ( mpTravellerList )

+    {

+        mpTravellerList->Clear();

+        delete mpTravellerList;

+    }

+    mpTravellerList = new ObjWinList();

+    // set root and top distance

+    nRetVal = Impl_Traveller( pWin, nRootDist );

+

+    DBG_ASSERT( nRetVal < DEPPER_MAX_DEPTH , "zu tief" );

+    if ( nRetVal == DEP_ENDLES_RECURSION_FOUND )

+    {

+        WriteToErrorFile();

+        return nRetVal;

+    }

+

+    ULONG nUnvisited = 0;

+    ULONG nUnvisYOffs = 0;

+

+    // seperate mainstream, secondary and unconnected

+    for ( i = 0; i < nObjCount; i++ )

+    {

+        pWin = pObjLst->GetObject( i );

+        if ( pWin->IsVisible()) {

+            if (( pWin->mnHeadDist + pWin->mnRootDist ) == nRetVal )

+            {

+                if ( !LevelList[ pWin->mnHeadDist ] )

+                        LevelList[ pWin->mnHeadDist ] = new ObjWinList;

+                LevelList[ pWin->mnHeadDist ]->Insert( pWin );

+                LevelUse[ pWin->mnHeadDist ]++;

+            }

+            else

+                if ( pWin->mbVisited )

+                {

+                    if ( !LevelSecList[ nRetVal - pWin->mnRootDist ] )

+                        LevelSecList[ nRetVal - pWin->mnRootDist ] = new ObjWinList;

+                    LevelSecList[ nRetVal - pWin->mnRootDist ]->Insert( pWin );

+                    LevelSecUse[ nRetVal - pWin->mnRootDist ]++;

+                }

+                else

+                {

+    //              need to be arranged more intelligent...

+                    Point aPos( 5, nUnvisYOffs );

+                    pWin->SetCalcPosPixel( aPos );

+

+                    Point aTmpPos = pWin->GetCalcPosPixel();

+                    pWin->SetPosPixel( mpBaseWin->LogicToPixel( aTmpPos ));

+

+                    nUnvisYOffs += pWin->PixelToLogic( pWin->GetSizePixel()).Height();

+                    nUnvisited++;

+                }

+        }

+    }

+

+    mnLevelOffset = 0;

+

+    USHORT nScaleVal;

+

+    if ( nRetVal == 0 )

+        nScaleVal = 1;

+    else

+        nScaleVal = nRetVal;

+

+    i = 0;

+

+    USHORT nStep = 0;

+

+    while ( LevelList[ i ] )

+    {

+        UpdateMainProgressBar(i, nScaleVal, nStep);

+        DBG_ASSERT( LevelUse[ i ] == LevelList[ i ]->Count() , "level index im a..." );

+        ObjectWin* pSwapWin;

+        ULONG nLevelObjCount = LevelList[ i ]->Count();

+

+        if ( nLevelObjCount % 2 == 0 )

+        {

+            LevelList[ i ]->Insert( NULL, LIST_APPEND );

+            nLevelObjCount++;

+//          LevelUse bleibt orginal...

+//          LevelUse[ i ]++;

+        }

+

+// catch too big lists

+        DBG_ASSERT( nLevelObjCount < DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH , "graph zu breit! dat geiht nich gut. breaking" );

+        if ( nLevelObjCount >= DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH )

+        {

+            WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph zu breit! dat geiht nich gut. breaking"));

+            aWBox.Execute();

+            break;

+        }

+        mnXOffset = CalcXOffset( nLevelObjCount );

+        aWorkList.Clear();

+

+        // initial positioning for mainstream

+        for ( j = 0; j < nLevelObjCount; j++ )

+        {

+            pSwapWin = LevelList[ i ]->GetObject( j );

+            aWorkList.Insert( pSwapWin, LIST_APPEND);

+            Point aPos = CalcPos( i, j );

+            aPosArray[ j ] = aPos;

+            if ( pSwapWin )

+                pSwapWin->SetCalcPosPixel( aPosArray[ j ] );

+        }

+

+        double dMinDist = CalcDistSum( LevelList[ i ] );

+

+        // optimize mainstream order and return best matching list in "aWorkList"

+        dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelObjCount ));

+

+        // set optimized positions - may still be wrong from later tries

+        for ( j = 0; j < nLevelObjCount; j++ )

+        {

+            pSwapWin = aWorkList.GetObject( j );

+            if ( pSwapWin )

+                pSwapWin->SetCalcPosPixel(  aPosArray[ j ] );

+        }

+

+        if ( LevelSecList[ i ] != NULL )

+        {

+            ULONG nLevelSecObjCount = LevelSecList[ i ]->Count();

+            // expand list for better positioning

+            while ( nLevelSecObjCount + LevelUse[ i ] < DEPPER_MAX_WIDTH - 1 )

+            {

+                LevelSecList[ i ]->Insert( NULL, LIST_APPEND );

+                nLevelSecObjCount++;

+            }

+            if ( ( nLevelSecObjCount + LevelUse[ i ])% 2 == 0 )

+            {

+                LevelSecList[ i ]->Insert( NULL, LIST_APPEND );

+                nLevelSecObjCount++;

+            }

+

+            DBG_ASSERT( nLevelSecObjCount < DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH , "graph zu breit! dat geiht nich gut. breaking" );

+            if ( nLevelObjCount >= DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH )

+            {

+                WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph zu breit! dat geiht nich gut. breaking"));

+                aWBox.Execute();

+                break;

+            }

+            mnXOffset = CalcXOffset( LevelUse[ i ] + nLevelSecObjCount );

+            aWorkList.Clear();

+

+            l = 0;

+            BOOL bUsedPos;

+

+            // find free positions for secondary objects

+            for ( j = 0; j < ( LevelUse[ i ] + nLevelSecObjCount ) ; j++ )

+            {

+                Point aPos = CalcPos( i, j );

+                bUsedPos = FALSE;

+                // is already occupied?

+                for ( k = 0; k < nLevelObjCount; k++ )

+                {

+                    if ( LevelList[ i ]->GetObject( k ) )

+                        if ( aPos == LevelList[ i ]->GetObject( k )->GetCalcPosPixel() )

+                            bUsedPos = TRUE;

+                }

+                // if its free, add to pool

+                if ( !bUsedPos )

+                {

+                    aPosArray[ l ] = aPos;

+                    l++;

+                }

+            }

+

+            // initial positioning for secodaries

+            for ( j = 0 ; j < nLevelSecObjCount ; j++ )

+            {

+                pSwapWin = LevelSecList[ i ]->GetObject( j );

+                aWorkList.Insert( pSwapWin, LIST_APPEND);

+                if ( pSwapWin )

+                    pSwapWin->SetCalcPosPixel( aPosArray[ j ] );

+            }

+            dMinDist = CalcDistSum( LevelSecList[ i ] );

+

+            dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelSecList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelSecObjCount ));

+

+            // set optimized positions - may still be wrong from later tries

+            for ( j = 0; j < nLevelSecObjCount; j++ )

+            {

+                pSwapWin = aWorkList.GetObject( j );

+                if ( pSwapWin )

+                    pSwapWin->SetCalcPosPixel(  aPosArray[ j ] );

+            }

+            if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH )

+                mnLevelOffset++;

+        }

+        if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH )

+            mnLevelOffset+= ( LevelUse[ i ] + LevelSecUse[ i ] ) / DEPPER_MAX_WIDTH ;

+        i++;

+    }

+

+    mnMinDynXOffs = 0xffff;

+

+// and back again...

+    // get better results form already preoptimized upper and lower rows

+

+    do

+    {

+        i--;

+        UpdateMainProgressBar(i, nScaleVal, nStep, TRUE); // TRUE ~ counting down

+        if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH )

+            mnLevelOffset-= ( LevelUse[ i ] + LevelSecUse[ i ] ) / DEPPER_MAX_WIDTH ;

+        ObjectWin* pSwapWin;

+        ULONG nLevelObjCount = LevelList[ i ]->Count();

+        mnXOffset = CalcXOffset( nLevelObjCount );

+        aWorkList.Clear();

+

+        for ( j = 0; j < nLevelObjCount; j++ )

+        {

+            pSwapWin = LevelList[ i ]->GetObject( j );

+            aWorkList.Insert( pSwapWin, LIST_APPEND);

+            Point aPos = CalcPos( i, j );

+            aPosArray[ j ] = aPos;

+//no need to do this stuff.......   ?????

+            if ( pSwapWin )

+                pSwapWin->SetCalcPosPixel( aPosArray[ j ] );

+        }

+

+        double dMinDist = CalcDistSum( LevelList[ i ], BOTH );

+

+        dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelObjCount, BOTH ));

+// wrong position for remaping - keep old positions for comparing

+        for ( j = 0; j < nLevelObjCount; j++ )

+        {

+            pSwapWin = aWorkList.GetObject( j );

+            if ( pSwapWin )

+//              pSwapWin->SetCalcPosPixel( mpBaseWin->LogicToPixel( aPosArray[ j ] ));

+                pSwapWin->SetCalcPosPixel( aPosArray[ j ] );

+        }

+

+        if ( LevelSecList[ i ] != NULL )

+        {

+            ULONG nLevelSecObjCount = LevelSecList[ i ]->Count();

+            mnXOffset = CalcXOffset( LevelUse[ i ] + nLevelSecObjCount );

+            aWorkList.Clear();

+

+            l = 0;

+            BOOL bUsedPos;

+

+            for ( j = 0; j < ( LevelUse[ i ] + nLevelSecObjCount ) ; j++ )

+            {

+                Point aPos = CalcPos( i, j );

+                bUsedPos = FALSE;

+// could be faster

+                for ( k = 0; k < nLevelObjCount; k++ )

+                {

+                    if ( LevelList[ i ]->GetObject( k ) )

+                        if ( aPos == LevelList[ i ]->GetObject( k )->GetCalcPosPixel() )

+                            bUsedPos = TRUE;

+                }

+                if ( !bUsedPos )

+                {

+                    aPosArray[ l ] = aPos;

+                    l++;

+                }

+            }

+

+            for ( j = 0 ; j < nLevelSecObjCount ; j++ )

+            {

+                pSwapWin = LevelSecList[ i ]->GetObject( j );

+                aWorkList.Insert( pSwapWin, LIST_APPEND);

+                if ( pSwapWin )

+                    pSwapWin->SetCalcPosPixel( aPosArray[ j ] );

+            }

+            dMinDist = CalcDistSum( LevelSecList[ i ], BOTH );

+

+            dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelSecList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelSecObjCount, BOTH ));

+// wrong position for remaping - keep old positions for comparing

+            for ( j = 0; j < nLevelSecObjCount; j++ )

+            {

+                pSwapWin = aWorkList.GetObject( j );

+                if ( pSwapWin )

+                    pSwapWin->SetCalcPosPixel( aPosArray[ j ] );

+            }

+        }

+//      i--;

+    } while ( i != 0 );

+    SetMainProgressBar( 100 );

+

+    ULONG nNewXSize = ( DEPPER_MAX_WIDTH + 1 )  * ( OBJWIN_X_SPACING + GetDefSize().Width() );

+

+    //    ULONG aObjID = GetStart(pIdMapper, pObjLst) //hier mu� man switchen GetStart/GetPrjStart oder so

+

+    ObjectWin* pObjWin = ObjIdToPtr( pObjLst, aObjID);

+

+    ULONG nNewYSize = pObjWin->GetCalcPosPixel().Y() + GetDefSize().Height() + 2 * OBJWIN_Y_SPACING;

+    if (( nUnvisYOffs + GetDefSize().Height()) > nNewYSize )

+        nNewYSize = nUnvisYOffs + GetDefSize().Height();

+

+    MapMode aMapMode = GetDepWin()->GetMapMode();

+    Size aTmpSize( (ULONG) (double(nNewXSize) * double( aMapMode.GetScaleX())), (ULONG) (double( nNewYSize) * double( aMapMode.GetScaleY())));

+

+    Size aNowSize( GetGraphWin()->GetSizePixel());

+

+    if ( GetDepWin()->LogicToPixel( aNowSize ).Width() > aTmpSize.Width() )

+        aTmpSize.Width() = GetDepWin()->LogicToPixel( aNowSize ).Width() ;

+

+    if ( GetDepWin()->LogicToPixel( aNowSize ).Height()  > aTmpSize.Height() )

+        aTmpSize.Height() = GetDepWin()->LogicToPixel( aNowSize ).Height() ;

+

+//  if ( nZoomed <= 0 )

+//  {

+//      mpBaseWin->SetSizePixel( aTmpSize );

+//      mpGraphWin->SetTotalSize( aTmpSize );

+//      mpGraphWin->EndScroll( 0, 0 );

+//  }

+

+// now remap all objects

+    ULONG nAllObjCount = pObjLst->Count();

+    Point aTmpPos;

+    for ( j = 0; j < nAllObjCount; j++ )

+    {

+        pWin = pObjLst->GetObject( j );

+        if ( pWin->IsVisible()) {

+            aTmpPos = pWin->GetCalcPosPixel();

+            if ( pWin->mbVisited )

+            {

+// reserve space for unconnected

+                aTmpPos.X() -= mnMinDynXOffs;

+                aTmpPos.X() += GetDefSize().Width() + OBJWIN_X_SPACING;

+// center window

+                aTmpPos.X() += GetDefSize().Width() / 2;

+                aTmpPos.X() -= pWin->PixelToLogic( pWin->GetSizePixel()).Width() / 2 ;

+            }

+            pWin->SetPosPixel( GetDepWin()->LogicToPixel( aTmpPos ));

+        }

+    }

+    aWorkList.Clear();

+    GetDepWin()->EnablePaint( TRUE );

+    GetDepWin()->Invalidate();

+//LevelListen loeschen                  H�? Welche Levellisten?

+

+//Update all Connectors

+// --> To be done: Don't call twice Object1-Connector-Object2

+    ObjectWin* pObject1;

+    for ( i = 0 ; i < nObjCount ; i++)

+    {

+        pObject1 = pObjLst->GetObject( i );

+        if ( pObject1->IsVisible())

+            pObject1->UpdateConnectors();

+    };

+    return 0;

+}

+

+void SolDep::WriteToErrorFile()

+{

+//Needs some improvement

+    ObjectWin* pWin;

+    WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph too deep! dat geiht nich gut.\nlook at depper.err in your Tmp-directory\nfor list of objects"));

+    aWBox.Execute();

+    char *tmpdir = getenv("TMP");

+    char *errfilebasename = "depper.err";

+    char *ErrFileName = (char*) malloc( strlen( tmpdir ) + strlen( errfilebasename) + 3 );

+    *ErrFileName = '\0';

+    strcat( ErrFileName, tmpdir );

+    strcat( ErrFileName, "\\" );

+    strcat( ErrFileName, errfilebasename );

+    FILE* pErrFile = fopen( "depper.err", "w+" );

+    if ( pErrFile )

+    {

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

+        {

+            pWin = mpTravellerList->GetObject( i );

+            fprintf( pErrFile, " %s -> \n", (pWin->GetBodyText()).GetBuffer());

+        }

+        fclose( pErrFile );

+    }

+}

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 40c310929eaa..cc0677220777 100644..100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -96,18 +96,12 @@
     $modules_number++;
     $perl = "";
     $remove_command = "";
-    if ( $^O eq 'MSWin32' ) {
-        $perl = "$ENV{PERL}";
-        $remove_command = "rmdir /S /Q";
-        $nul = '> NULL';
-    } else {
-        use Cwd 'chdir';
-        $perl = 'perl';
-        $remove_command = 'rm -rf';
-        $nul = '> /dev/null';
-    };
+    use Cwd 'chdir';
+    $perl = 'perl';
+    $remove_command = 'rm -rf';
+    $nul = '> /dev/null';
 
-    $QuantityToBuild = 0;
+    $processes_to_run = 0;
 # delete $pid when not needed
     %projects_deps_hash = ();   # hash of projects with no dependencies,
                                 # that could be built now
@@ -117,7 +111,7 @@
     %running_children = ();
     $dependencies_hash = 0;
     $cmd_file = '';
-    $BuildAllParents = 0;
+    $build_all_parents = 0;
     $show = 0;
     $checkparents = 0;
     $deliver = 0;
@@ -135,7 +129,7 @@
     @broken_modules_names = ();   # array of modules, which cannot be built further
     @dmake_args = ();
     %dead_parents = ();
-    $CurrentPrj = '';
+    $initial_module = '';
     $all_dependent = 1;  # a flag indicating if the hash has independent keys
     $build_from_with_branches = '';
     $build_all_cont = '';
@@ -207,12 +201,15 @@
     my %module_paths = (); # hash with absolute module paths
     my %active_modules = ();
     my $generate_config = 0;
+    my $add_modules_to_config = 0;
     my %add_to_config = ();
     my %remove_from_config = ();
     my $clear_config = 0;
     my $finisched_children = 0;
     my $debug = 0;
     %module_deps_hash_pids = ();
+    my @argv = @ARGV;
+    my $source_config_file;
 ### main ###
 
     get_options();
@@ -234,11 +231,11 @@
         $deliver_env{'L10N_framework'}++;
     };
 
-    if ($generate_config) {
+    if ($generate_config && ($clear_config || (scalar keys %remove_from_config)||(scalar keys %add_to_config))) {
         generate_config_file();
         exit 0;
     }
-    $StandDir = get_stand_dir();   # This also sets $CurrentPrj
+    $StandDir = get_stand_dir();   # This also sets $initial_module
     get_module_and_buildlist_paths();
     provide_consistency() if (defined $ENV{CWS_WORK_STAMP} && defined($ENV{COMMON_ENV_TOOLS}));
 
@@ -278,14 +275,14 @@
     start_interactive() if ($interactive);
 
     if ($checkparents) {
-        GetParentDeps( $CurrentPrj, \%global_deps_hash );
+        get_parent_deps( $initial_module, \%global_deps_hash );
     } else {
-        BuildAll();
+        build_all();
     }
     if (scalar keys %broken_build) {
         cancel_build();
 #    } elsif (!$custom_job && $post_custom_job) {
-#        do_post_custom_job(CorrectPath($StandDir.$CurrentPrj));
+#        do_post_custom_job(CorrectPath($StandDir.$initial_module));
     };
     print_warnings();
     if (scalar keys %active_modules) {
@@ -294,11 +291,10 @@
         };
     };
     if (scalar keys %dead_parents) {
-        my ($DeadPrj);
         print $new_line.$new_line;
         print $echo."WARNING! Project(s):\n";
-        foreach $DeadPrj (keys %dead_parents) {
-            print $echo."$DeadPrj\n";
+        foreach (keys %dead_parents) {
+            print $echo."$_\n";
         };
         print $new_line;
         print $echo."not found and couldn't be built. Dependencies on that module(s) ignored. Maybe you should correct build lists.\n";
@@ -352,7 +348,7 @@ sub rename_file {
 
 sub generate_config_file {
     my $source_config = SourceConfig -> new();
-    my $source_config_file = $source_config->get_config_file_path();
+    $source_config_file = $source_config->get_config_file_path();
     my $temp_config_file = File::Temp::tmpnam($ENV{TMP});
     my @config_content_new = ();
     my $addition_message;
@@ -364,7 +360,6 @@ sub generate_config_file {
         close SOURCE_CONFIG_FILE;
         my ($module_section, $repository_section);
         foreach (@config_content) {
-            $line++;
             if ((!/^\S+/)||(/^\s*#+/)) {
                 push(@config_content_new, $_);
                 next;
@@ -422,8 +417,7 @@ sub generate_config_file {
     };
     print_warnings();
     print $addition_message if ($addition_message);
-    print "Module(s) $removal_message removed from $source_config_file\n" if ($removal_message);
-    exit(0);
+    print "Module(s):\n$removal_message\nremoved from $source_config_file\n" if ($removal_message);
 };
 
 #
@@ -437,50 +431,25 @@ sub add_modules_to_source_config {
         $message .= "$_ ";
     };
     if ($message) {
-        return 'Module(s) ' .$message . 'are added to the ' . $source_config_file . "\n\n";
+        return "Module(s):\n" .$message . "\nare added to the " . $source_config_file . "\n\n";
     } else {
         return '';
     };
 };
 
 sub start_interactive {
-    if ( $^O eq 'MSWin32' ) {
-        my $posix_sys_wait = 'POSIX ":sys_wait_h"';
-        eval "use $posix_sys_wait";
-        die "couldn't use $posix_sys_wait: $!\n" if ($@);
-
-        pipe(FROM_PARENT, TO_CHILD) or die "pipe: $!";
-        pipe(HTML_PIPE, TO_PARENT) or die "pipe: $!";
-
+    $pid = open(HTML_PIPE, "-|");
+    print "Pipe is open\n";
 
-        if (my $pid = fork()) {
-            $html_listener_pid = 1;
-            close FROM_PARENT;
-            close TO_PARENT;
-            ioctl(HTML_PIPE, 0x8004667e, 1);
-            return;
-        } else {
-            close HTML_PIPE;
-            close TO_CHILD;
-            select TO_PARENT;
-            $|++;
-            $parent_process = 0;
-            start_html_listener();
-        }
-    } else {
-        $pid = open(HTML_PIPE, "-|");
-        print "Pipe is open\n";
-
-        if ($pid) {   # parent
-            # make file handle non-bloking
-            my $flags = '';
-            fcntl(HTML_PIPE, F_GETFL, $flags);
-            $flags |= O_NONBLOCK;
-            fcntl(HTML_PIPE, F_SETFL, $flags);
-        } else {      # child
-            $parent_process = 0;
-            start_html_listener();
-        };
+    if ($pid) {   # parent
+        # make file handle non-bloking
+        my $flags = '';
+        fcntl(HTML_PIPE, F_GETFL, $flags);
+        $flags |= O_NONBLOCK;
+        fcntl(HTML_PIPE, F_SETFL, $flags);
+    } else {      # child
+        $parent_process = 0;
+        start_html_listener();
     };
 };
 
@@ -516,7 +485,6 @@ sub start_html_message_trigger {
 
     if ($child_id) {
         # parent
-        $html_message_trigger{$child_id}++;
 #       print "started listener trigger\n";
     } else {
         my $buffer_size = 1024;
@@ -673,20 +641,20 @@ sub get_build_list_path {
 #
 # Get dependencies hash of the current and all parent projects
 #
-sub GetParentDeps {
+sub get_parent_deps {
     my (%parents_deps_hash, $module, $parent);
     my $prj_dir = shift;
     my $deps_hash = shift;
-    my @UnresolvedParents = get_parents_array($prj_dir);
-    $parents_deps_hash{$_}++ foreach (@UnresolvedParents);
+    my @unresolved_parents = get_parents_array($prj_dir);
+    $parents_deps_hash{$_}++ foreach (@unresolved_parents);
     $$deps_hash{$prj_dir} = \%parents_deps_hash;
-    while ($module = pop(@UnresolvedParents)) {
+    while ($module = pop(@unresolved_parents)) {
         my %parents_deps_hash = ();
         $parents_deps_hash{$_}++ foreach (get_parents_array($module));
         $$deps_hash{$module} = \%parents_deps_hash;
         foreach $Parent (keys %parents_deps_hash) {
             if (!defined($$deps_hash{$Parent})) {
-                push (@UnresolvedParents, $Parent);
+                push (@unresolved_parents, $Parent);
             };
         };
     };
@@ -743,19 +711,16 @@ sub reverse_dependensies {
 #
 # Build everything that should be built
 #
-sub BuildAll {
-    if ($BuildAllParents) {
+sub build_all {
+    if ($build_all_parents) {
         my ($Prj, $PrjDir, $orig_prj);
-        GetParentDeps( $CurrentPrj, \%global_deps_hash);
+        get_parent_deps( $initial_module, \%global_deps_hash);
         if (scalar keys %active_modules) {
-            $active_modules{$CurrentPrj}++;
-            $modules_types{$CurrentPrj} = 'mod';
+            $active_modules{$initial_module}++;
+            $modules_types{$initial_module} = 'mod';
         };
         modules_classify(keys %global_deps_hash);
         store_weights(\%global_deps_hash);
-        if (keys %active_modules && ($build_from || $incompatible)) {
-            print_error("There are active module in $source_config_file. Please remove these modules to proceed.\n");
-        };
         prepare_build_from(\%global_deps_hash) if ($build_from);
         prepare_incompatible_build(\%global_deps_hash) if ($incompatible);
         if ($build_all_cont || $build_since) {
@@ -763,12 +728,25 @@ sub BuildAll {
             push (@warnings, "\nThere are active module in $source_config_file. Inactive modules are skipped.\n\n");
             prepare_build_all_cont(\%global_deps_hash);
         };
+        if ($generate_config) {
+            %add_to_config = %global_deps_hash;
+            generate_config_file();
+            exit 0;
+        } elsif (keys %incompatibles) {
+            my @missing_modules = ();
+            foreach (keys %global_deps_hash) {
+                push(@missing_modules, $_) if (!defined $active_modules{$_});
+            };
+            if (scalar @missing_modules) {
+                print_error("There are modules:\n@missing_modules\n\nthat should be built, but they are not activated. Please, verify your $source_config_file.\n");
+            };
+        };
         backup_deps_hash(\%global_deps_hash, \%global_deps_hash_backup);
         expand_dependencies (\%global_deps_hash_backup);
         reverse_dependensies(\%global_deps_hash_backup);
         $modules_number = scalar keys %global_deps_hash;
         initialize_html_info($_) foreach (keys %global_deps_hash);
-        if ($QuantityToBuild) {
+        if ($processes_to_run) {
             build_multiprocessing();
             return;
         };
@@ -789,7 +767,7 @@ sub BuildAll {
                 my $info_hash = $html_info{$Prj};
                 $$info_hash{DIRS} = check_deps_hash(\%LocalDepsHash, $Prj);
                 $module_by_hash{\%LocalDepsHash} = $Prj;
-                BuildDependent(\%LocalDepsHash);
+                build_dependent(\%LocalDepsHash);
                 print $check_error_string;
             };
 
@@ -797,16 +775,16 @@ sub BuildAll {
             $build_is_finished{$Prj}++;
         };
     } else {
-        store_build_list_content($CurrentPrj);
-        get_module_dep_hash($CurrentPrj, \%LocalDepsHash);
-        initialize_html_info($CurrentPrj);
-        my $info_hash = $html_info{$CurrentPrj};
-        $$info_hash{DIRS} = check_deps_hash(\%LocalDepsHash, $CurrentPrj);
-        $module_by_hash{\%LocalDepsHash} = $CurrentPrj;
+        store_build_list_content($initial_module);
+        get_module_dep_hash($initial_module, \%LocalDepsHash);
+        initialize_html_info($initial_module);
+        my $info_hash = $html_info{$initial_module};
+        $$info_hash{DIRS} = check_deps_hash(\%LocalDepsHash, $initial_module);
+        $module_by_hash{\%LocalDepsHash} = $initial_module;
         if ($server_mode) {
             run_server();
         } else {
-            BuildDependent(\%LocalDepsHash);
+            build_dependent(\%LocalDepsHash);
         };
     };
 };
@@ -884,7 +862,8 @@ sub dmake_dir {
         };
         _exit(0);
     } elsif ($error_code && ($error_code != -1)) {
-        print_error("Error $? occurred while making $BuildDir");
+        return $error_code;
+#        print_error("Error $? occurred while making $BuildDir");
     };
 };
 
@@ -1075,7 +1054,7 @@ sub get_deps_hash {
         if (scalar @errors) {
             my $message = "$module_to_build/prj/build.lst has wrongly written string(s):\n";
             $message .= "$_\n" foreach(@errors);
-            if ($QuantityToBuild) {
+            if ($processes_to_run) {
                 $broken_build{$module_to_build} = $message;
                 $dependencies_hash = undef;
                 return;
@@ -1097,7 +1076,7 @@ sub get_deps_hash {
         add_prerequisite_job($dependencies_hash, $module_to_build, $pre_custom_job);
         add_prerequisite_job($dependencies_hash, $module_to_build, $pre_job);
         add_dependent_job($dependencies_hash, $module_to_build, $custom_job);
-        add_dependent_job($dependencies_hash, $module_to_build, $post_job) if ($module_to_build ne $CurrentPrj);
+        add_dependent_job($dependencies_hash, $module_to_build, $post_job) if ($module_to_build ne $initial_module);
         add_dependent_job($dependencies_hash, $module_to_build, $post_custom_job);
     };
     store_weights($dependencies_hash);
@@ -1163,11 +1142,7 @@ sub mark_platform {
 #
 sub CorrectPath {
     $_ = shift;
-    if ( ($^O eq 'MSWin32') && (!defined $ENV{SHELL})) {
-        s/\//\\/g;
-    } else {;
-        s/\\/\//g;
-    };
+    s/\\/\//g;
     return $_;
 };
 
@@ -1232,7 +1207,7 @@ sub get_stand_dir {
     do {
         foreach (@possible_build_lists) {# ('build.lst', 'build.xlist');
             if (-e $StandDir . '/prj/'.$_) {
-                $CurrentPrj = File::Basename::basename($StandDir);
+                $initial_module = File::Basename::basename($StandDir);
                 $StandDir = File::Basename::dirname($StandDir);
                 return $StandDir;
             } elsif ($StandDir eq $previous_dir) {
@@ -1381,9 +1356,9 @@ sub find_indep_prj {
     my ($Dependencies, $i);
     my @candidates = ();
     $all_dependent = 1;
-    handle_dead_children(0) if ($QuantityToBuild);
+    handle_dead_children(0) if ($processes_to_run);
     my $children = children_number();
-    return '' if (!$server_mode && $children && ($children >= $QuantityToBuild));
+    return '' if (!$server_mode && $children && ($children >= $processes_to_run));
     $Dependencies = shift;
     if (scalar keys %$Dependencies) {
         foreach my $job (keys %$Dependencies) {
@@ -1500,7 +1475,7 @@ sub print_error {
 
 sub usage {
     print STDERR "\nbuild\n";
-    print STDERR "Syntax:    build    [--all|-a[:prj_name]]|[--from|-f prj_name1[:prj_name2] [prj_name3 [...]]]|[--since|-c prj_name] [--with_branches|-b]|[--prepare|-p][:platform] [--deliver|-d [--dlv_switch deliver_switch]]] [-P processes|--server [--setenvstring \"string\"] [--client_timeout MIN] [--port port1[:port2:...:portN]]] [--show|-s] [--help|-h] [--file|-F] [--ignore|-i] [--version|-V] [--mode|-m OOo[,SO[,EXT]] [--html [--html_path html_file_path] [--dontgraboutput]] [--pre_job=pre_job_sring] [--job=job_string|-j] [--post_job=post_job_sring] [--stoponerror] [--genconf [--removeall|--clear|--remove|--add module1,module2[,...,moduleN]]] [--interactive]\n";
+    print STDERR "Syntax:    build    [--all|-a[:prj_name]]|[--from|-f prj_name1[:prj_name2] [prj_name3 [...]]]|[--since|-c prj_name] [--with_branches|-b]|[--prepare|-p][:platform] [--deliver|-d [--dlv_switch deliver_switch]]] [-P processes|--server [--setenvstring \"string\"] [--client_timeout MIN] [--port port1[:port2:...:portN]]] [--show|-s] [--help|-h] [--file|-F] [--ignore|-i] [--version|-V] [--mode|-m OOo[,SO[,EXT]] [--html [--html_path html_file_path] [--dontgraboutput]] [--pre_job=pre_job_sring] [--job=job_string|-j] [--post_job=post_job_sring] [--stoponerror] [--genconf [--removeall|--clear|--remove|--add [module1,module2[,...,moduleN]]]] [--interactive]\n";
     print STDERR "Example1:    build --from sfx2\n";
     print STDERR "                     - build all projects dependent from sfx2, starting with sfx2, finishing with the current module\n";
     print STDERR "Example2:    build --all:sfx2\n";
@@ -1555,10 +1530,10 @@ sub usage {
 sub get_options {
     my ($arg, $dont_grab_output);
     while ($arg = shift @ARGV) {
-        $arg =~ /^-P$/            and $QuantityToBuild = shift @ARGV     and next;
-        $arg =~ /^-P(\d+)$/            and $QuantityToBuild = $1 and next;
-        $arg =~ /^--all$/        and $BuildAllParents = 1             and next;
-        $arg =~ /^-a$/        and $BuildAllParents = 1             and next;
+        $arg =~ /^-P$/            and $processes_to_run = shift @ARGV     and next;
+        $arg =~ /^-P(\d+)$/            and $processes_to_run = $1 and next;
+        $arg =~ /^--all$/        and $build_all_parents = 1             and next;
+        $arg =~ /^-a$/        and $build_all_parents = 1             and next;
         $arg =~ /^--show$/        and $show = 1                         and next;
         $arg =~ /^--checkmodules$/       and $checkparents = 1 and $ignore = 1 and next;
         $arg =~ /^-s$/        and $show = 1                         and next;
@@ -1571,17 +1546,17 @@ sub get_options {
         $arg =~ /^--file$/        and $cmd_file = shift @ARGV             and next;
         $arg =~ /^-F$/        and $cmd_file = shift @ARGV             and next;
 
-        $arg =~ /^--with_branches$/        and $BuildAllParents = 1
+        $arg =~ /^--with_branches$/        and $build_all_parents = 1
                                 and $build_from_with_branches = shift @ARGV         and next;
-        $arg =~ /^-b$/        and $BuildAllParents = 1
+        $arg =~ /^-b$/        and $build_all_parents = 1
                                 and $build_from_with_branches = shift @ARGV         and next;
 
-        $arg =~ /^--all:(\S+)$/ and $BuildAllParents = 1
+        $arg =~ /^--all:(\S+)$/ and $build_all_parents = 1
                                 and $build_all_cont = $1            and next;
-        $arg =~ /^-a:(\S+)$/ and $BuildAllParents = 1
+        $arg =~ /^-a:(\S+)$/ and $build_all_parents = 1
                                 and $build_all_cont = $1            and next;
         if ($arg =~ /^--from$/ || $arg =~ /^-f$/) {
-                                    $BuildAllParents = 1;
+                                    $build_all_parents = 1;
                                     get_incomp_projects();
                                     next;
         };
@@ -1589,11 +1564,11 @@ sub get_options {
         $arg =~ /^-p$/            and $prepare = 1 and next;
         $arg =~ /^--prepare:/    and $prepare = 1 and $only_platform = $' and next;
         $arg =~ /^-p:/            and $prepare = 1 and $only_platform = $' and next;
-        $arg =~ /^--since$/        and $BuildAllParents = 1
+        $arg =~ /^--since$/        and $build_all_parents = 1
                                 and $build_since = shift @ARGV         and next;
-        $arg =~ /^-c$/        and $BuildAllParents = 1
+        $arg =~ /^-c$/        and $build_all_parents = 1
                                 and $build_since = shift @ARGV         and next;
-        $arg =~ /^-s$/            and $BuildAllParents = 1
+        $arg =~ /^-s$/            and $build_all_parents = 1
                                 and $build_since = shift @ARGV         and next;
         $arg =~ /^--help$/        and usage()                            and do_exit(0);
         $arg =~ /^-h$/        and usage()                            and do_exit(0);
@@ -1601,10 +1576,14 @@ sub get_options {
         $arg =~ /^--genconf$/        and $generate_config = 1                  and next;
         if ($arg =~ /^--add$/)      {
                                         get_list_of_modules(\%add_to_config);
+                                        $add_modules_to_config++;
                                         next;
         };
         if ($arg =~ /^--remove$/)   {
                                         get_list_of_modules(\%remove_from_config);
+                                        if (!scalar %remove_from_config) {
+                                            print_error('No module list supplied!!');
+                                        };
                                         next;
         };
         ($arg =~ /^--clear$/ || $arg =~ /^--removeall$/)  and $clear_config = 1 and next;
@@ -1637,7 +1616,7 @@ sub get_options {
 #    print_error('Please prepare the workspace on one of UNIX platforms') if ($prepare && ($ENV{GUI} ne 'UNX'));
     print_error('Switches --with_branches and --since collision') if ($build_from_with_branches && $build_since);
     if ($show) {
-        $QuantityToBuild = 0;
+        $processes_to_run = 0;
         $cmd_file = '';
     };
     print_error('Switches --job and --deliver collision') if ($custom_job && $deliver);
@@ -1647,7 +1626,7 @@ sub get_options {
     if ($prepare) {
         print_error("--prepare is for use with --from switch only!\n") if (!$incompatible);
     };
-    if ($QuantityToBuild) {
+    if ($processes_to_run) {
         if ($ignore && !$html) {
             print_error("Cannot ignore errors in multiprocessing build");
         };
@@ -1675,8 +1654,8 @@ sub get_options {
         if ((scalar %add_to_config) || (scalar %remove_from_config)) {
             print_error('"--add" or/and "--remove"' . $error_message);
         };
-    } elsif ((!scalar %add_to_config) && !$clear_config && (!scalar %remove_from_config)){
-        print_error('Please supply necessary switch for "--genconf" (--add|--remove|--removeall)');
+    } elsif ((!scalar %add_to_config) && !$clear_config && (!scalar %remove_from_config) && !$build_all_parents){
+        print_error('Please supply necessary switch for "--genconf" (--add|--remove|--removeall). --add can be used with --from and such');
     };
 
     if ($only_platform) {
@@ -1698,7 +1677,7 @@ sub get_options {
 
 sub get_module_and_buildlist_paths {
     my $source_config = SourceConfig -> new($StandDir);
-    my $source_config_file = $source_config->get_config_file_path();
+    $source_config_file = $source_config->get_config_file_path();
     $active_modules{$_}++ foreach ($source_config->get_active_modules());
     my %active_modules_copy = %active_modules;
     foreach ($source_config->get_all_modules()) {
@@ -1744,33 +1723,37 @@ sub get_switch_options {
 #
 sub cancel_build {
 #    close_server_socket();
-    $modules_number -= scalar keys %global_deps_hash;
     my $broken_modules_number = scalar @broken_modules_names;
+    my $message_part = 'build ';
+    if (scalar keys %incompatibles) {
+        my @incompatible_modules = keys %incompatibles;
+        if ($stop_build_on_error) {
+            $message_part .= "--from @incompatible_modules:@broken_modules_names\n";
+        } else {
+            $message_part .= "--from @broken_modules_names\n";
+        };
+    } else {
+        $message_part .= "--all:@broken_modules_names\n";
+    };
     if ($broken_modules_number) {
-        $modules_number -= $broken_modules_number;
         print "\n";
         print $broken_modules_number;
         print " module(s): ";
         foreach (@broken_modules_names) {
             print "\n\t$_";
-#            RemoveFromDependencies($_, \%global_deps_hash);
         };
         print "\nneed(s) to be rebuilt\n\nReason(s):\n\n";
         foreach (keys %broken_build) {
             print "ERROR: error " . $broken_build{$_} . " occurred while making $_\n";
         };
-        print "\nAttention: if you build and deliver the above module(s) you may prolongue your the build issuing command \"build --from @broken_modules_names\"\n";
+        print "\nAttention: if you fix the errors in above module(s) you may prolongue your the build issuing command:\n\n\t" . $message_part;
     } else {
-#        if ($ENV{GUI} eq 'WNT') {
-            while (children_number()) {
-                handle_dead_children(1);
-            }
-            foreach (keys %broken_build) {
-                print "ERROR: error " . $broken_build{$_} . " occurred while making $_\n";
-            };
-#        } else {
-#            kill 9 => -$$;
-#        };
+        while (children_number()) {
+            handle_dead_children(1);
+        }
+        foreach (keys %broken_build) {
+            print "ERROR: error " . $broken_build{$_} . " occurred while making $_\n";
+        };
     };
     print "\n";
     do_exit(1);
@@ -1827,9 +1810,9 @@ sub handle_dead_children {
                     };
                 };
             };
-            sleep 1 if (children_number() >= $QuantityToBuild || ($force_wait && ($running_children == children_number())));
+            sleep 1 if (children_number() >= $processes_to_run || ($force_wait && ($running_children == children_number())));
         } else {
-            if (children_number() >= $QuantityToBuild ||
+            if (children_number() >= $processes_to_run ||
                     ($force_wait && ($running_children == children_number()))) {
                 $pid = wait();
             } else {
@@ -1845,7 +1828,7 @@ sub handle_dead_children {
                 $finisched_children++;
             };
         };
-    } while(children_number() >= $QuantityToBuild);
+    } while(children_number() >= $processes_to_run);
 };
 
 sub give_second_chance {
@@ -1881,38 +1864,44 @@ sub clear_from_child {
 #
 # Build the entire project according to queue of dependencies
 #
-sub BuildDependent {
+sub build_dependent {
     $dependencies_hash = shift;
     my $pid = 0;
     my $child_nick = '';
     $running_children{$dependencies_hash} = 0 if (!defined $running_children{$dependencies_hash});
     while ($child_nick = pick_prj_to_build($dependencies_hash)) {
-        if ($QuantityToBuild) {
+        if ($processes_to_run) {
             do {
                 if (defined $modules_with_errors{$dependencies_hash} && !$ignore) {
-                    return 0 if ($BuildAllParents);
+                    return 0 if ($build_all_parents);
                     last;
                 };
                 # start current child & all
                 # that could be started now
-                start_child($child_nick, $dependencies_hash) if ($child_nick);
-                return 1 if ($BuildAllParents);
+                if ($child_nick) {
+                    start_child($child_nick, $dependencies_hash);
+                    return 1 if ($build_all_parents);
+                } else {
+                    return 0 if ($build_all_parents);
+                    if (scalar keys %$dependencies_hash) {
+                        handle_dead_children(1);
+                    };
+                };
                 $child_nick = pick_prj_to_build($dependencies_hash);
             } while (scalar keys %$dependencies_hash || $child_nick);
             while (children_number()) {
-#                print "#### 1902: Starting waiting for dead child\n";
                 handle_dead_children(1);
             };
-#            if (defined $last_module) {
-#                $build_is_finished{$last_module}++ if (!defined $modules_with_errors{$last_module});
-#            };
 
             if (defined $modules_with_errors{$dependencies_hash}) {
                 cancel_build();
             }
             mp_success_exit();
         } else {
-            dmake_dir($child_nick);
+            if (dmake_dir($child_nick)) {
+                push(@broken_modules_names, $module_by_hash{$dependencies_hash});
+                cancel_build();
+            };
         };
         $child_nick = '';
     };
@@ -2010,7 +1999,7 @@ sub build_multiprocessing {
 sub mp_success_exit {
 #    close_server_socket();
 #    if (!$custom_job && $post_custom_job) {
-#        do_post_custom_job(CorrectPath($StandDir.$CurrentPrj));
+#        do_post_custom_job(CorrectPath($StandDir.$initial_module));
 #    };
     print "\nMultiprocessing build is finished\n";
     print "Maximal number of processes run: $maximal_processes\n";
@@ -2045,7 +2034,7 @@ sub build_actual_queue {
                 delete $$build_queue{$Prj};
                 next;
             };
-            $started_children =+ BuildDependent($projects_deps_hash{$Prj});
+            $started_children =+ build_dependent($projects_deps_hash{$Prj});
             if ((!scalar keys %{$projects_deps_hash{$Prj}}) &&
                 !$running_children{$projects_deps_hash{$Prj}}) {
                 if (!defined $modules_with_errors{$projects_deps_hash{$Prj}} || $ignore)
@@ -2142,7 +2131,7 @@ sub print_announce {
     $prj_type = $modules_types{$Prj} if (defined $modules_types{$Prj});
     my $text;
     if ($prj_type eq 'lnk') {
-        if (scalar keys %active_modules && (!defined $active_modules{$Prj})) {
+        if (!defined $active_modules{$Prj}) {
             $text = "Skipping module $Prj\n";
         } else {
             $text = "Skipping link to $Prj\n";
@@ -2193,7 +2182,7 @@ sub modules_classify {
             next;
         };
         if (( $module_paths{$module} =~ /\.lnk$/) || ($module_paths{$module} =~ /\.link$/)
-                || (scalar keys %active_modules && (!defined $active_modules{$module}))) {
+                || (!defined $active_modules{$module})) {
             $modules_types{$module} = 'lnk';
             next;
         };
@@ -2224,19 +2213,10 @@ sub provide_consistency {
 #
 sub get_workspace_lst
 {
-    my $home;
-    if ( $^O eq 'MSWin32' ) {
-        $home = $ENV{TEMP};
-    }
-    else {
-        $home = $ENV{HOME};
-    }
-    my $inifile = "$home/localini/stand.lst";
+    my $home = $ENV{HOME};
+    my $inifile = $ENV{HOME}. '/localini/stand.lst';
     if (-f $inifile) {
         return $inifile;
-#    } else {
-#        $inifile = get_globalini() . "/stand.lst";
-#        return $inifile if (-f $inifile);
     };
     return '';
 }
@@ -2391,7 +2371,11 @@ sub prepare_incompatible_build {
         delete $$deps_hash{$build_all_cont};
     };
     @modules_built = keys %$deps_hash;
-    clear_delivered() if ($prepare);
+    %add_to_config = %$deps_hash;
+    if ($prepare) {
+        generate_config_file();
+        clear_delivered();
+    }
     my $old_output_tree = '';
     foreach $prj (sort keys %$deps_hash) {
         if ($prepare) {
@@ -2416,7 +2400,7 @@ sub prepare_incompatible_build {
     if ($old_output_tree) {
         push(@warnings, 'Some module(s) contain old output tree(s)!');
     };
-    if (scalar @warnings) {
+    if (!$generate_config && scalar @warnings) {
         print "WARNING(S):\n";
         print STDERR "$_\n" foreach (@warnings);
         print "\nATTENTION: If you are performing an incompatible build, please break the build with Ctrl+C and prepare the workspace with \"--prepare\" switch!\n\n" if (!$prepare);
@@ -2439,7 +2423,7 @@ sub prepare_build_from {
     my ($prj, $deps_hash);
     $deps_hash = shift;
     my %from_deps_hash = ();   # hash of dependencies of the -from project
-    GetParentDeps($build_from_with_branches, \%from_deps_hash);
+    get_parent_deps($build_from_with_branches, \%from_deps_hash);
     foreach $prj (keys %from_deps_hash) {
         delete $$deps_hash{$prj};
         RemoveFromDependencies($prj, $deps_hash);
@@ -2508,9 +2492,9 @@ sub get_list_of_modules {
             };
         };
     };
-    if (!scalar %$hash_ref) {
-        print_error('No module list supplied!!');
-    };
+#    if (!scalar %$hash_ref) {
+#        print_error('No module list supplied!!');
+#    };
 };
 
 sub get_incomp_projects {
@@ -2530,6 +2514,26 @@ sub get_incomp_projects {
     };
 };
 
+sub get_workspace_platforms {
+    my $workspace_patforms = shift;
+    my $solver_path = $ENV{SOLARVERSION};
+    opendir(SOLVERDIR, $solver_path);
+    @dir_list = readdir(SOLVERDIR);
+    close SOLVERDIR;
+    foreach (@dir_list) {
+        next if /^common/;
+        next if /^\./;
+        if (open(LS, "ls $solver_path/$_/inc/*minor.mk 2>$nul |")) {
+            foreach my $string (<LS>) {
+                chomp $string;
+                if ($string =~ /minor.mk$/) {
+                    $$workspace_patforms{$_}++
+                };
+            };
+            close LS;
+        };
+    };
+};
 
 sub get_platforms {
     my $platforms_ref = shift;
@@ -2542,17 +2546,22 @@ sub get_platforms {
 
     my $workspace_lst = get_workspace_lst();
     if ($workspace_lst) {
-        my $workspace_db = GenInfoParser->new();
-        my $success = $workspace_db->load_list($workspace_lst);
-        if ( !$success ) {
-            print_error("Can't load workspace list '$workspace_lst'.", 4);
-        }
-        my $access_path = $ENV{WORK_STAMP} . '/Environments';
-        my @platforms_available = $workspace_db->get_keys($access_path);
-        my $solver = $ENV{SOLARVERSION};
-        foreach (@platforms_available) {
-            my $s_path = $solver . '/' .  $_;
-            $$platforms_ref{$_}++ if (-d $s_path);
+        my $workspace_db;
+        eval { $workspace_db = GenInfoParser->new(); };
+        if (!$@) {
+            my $success = $workspace_db->load_list($workspace_lst);
+            if ( !$success ) {
+                print_error("Can't load workspace list '$workspace_lst'.", 4);
+            }
+            my $access_path = $ENV{WORK_STAMP} . '/Environments';
+            my @platforms_available = $workspace_db->get_keys($access_path);
+            my $solver = $ENV{SOLARVERSION};
+            foreach (@platforms_available) {
+                my $s_path = $solver . '/' .  $_;
+                $$platforms_ref{$_}++ if (-d $s_path);
+            };
+        } else {
+            get_workspace_platforms(\%platforms);
         };
     };
 
@@ -2621,12 +2630,8 @@ sub read_ssolar_vars {
     my ($setsolar, $tmp_file);
     $setsolar = $ENV{ENV_ROOT} . '/etools/setsolar.pl';
     my ($platform, $solar_vars) = @_;
-    if ( $^O eq 'MSWin32' ) {
-        $tmp_file = $ENV{TEMP} . "\\solar.env.$$.tmp";
-    } else {
-        $setsolar = '/net/jumbo2.germany/buildenv/r/etools/setsolar.pl' if ! -e $setsolar;
-        $tmp_file = $ENV{HOME} . "/.solar.env.$$.tmp";
-    };
+    $setsolar = '/net/jumbo2.germany/buildenv/r/etools/setsolar.pl' if ! -e $setsolar;
+    $tmp_file = $ENV{HOME} . "/.solar.env.$$.tmp";
     if (!-e $setsolar) {
         print STDERR "There is no setsolar found. Falling back to current platform settings\n";
         return;
@@ -2663,14 +2668,8 @@ sub get_solar_vars {
         next if(!/^\w+\s+(\w+)/o);
         next if (!defined $deliver_env{$1});
         $var = $1;
-        if ( $^O eq 'MSWin32' ) {
-            my $string_tail = $';
-            $string_tail =~ /=(\S+)$/o;
-            $value = $1;
-        } else {
-            /\'(\S+)\'$/o;
-            $value = $1;
-        };
+        /\'(\S+)\'$/o;
+        $value = $1;
         $$solar_vars{$var} = $value;
     };
     close SOLARTABLE;
@@ -2691,8 +2690,8 @@ sub get_current_module {
     if ( ! $result ) {
         print_error("Cannot rename $module_name: $!\n");
     }
-    if ( $CurrentPrj eq $link_name) {
-        $CurrentPrj = $module_name;
+    if ( $initial_module eq $link_name) {
+        $initial_module = $module_name;
     }
     chdir $module_name;
     getcwd();
@@ -2700,26 +2699,17 @@ sub get_current_module {
 
 sub check_dir {
     my $start_dir = getcwd();
-    my @dir_entries = split(/[\\\/]/, $start_dir);
+    my @dir_entries = split(/[\\\/]/, $ENV{PWD});
     my $current_module = $dir_entries[$#dir_entries];
-    $current_module = $` if (($current_module =~ /(\.lnk)$/) || ($current_module =~ /(\.link)$/));
-    my $link_name = $ENV{SOLARSRC}.'/'.$current_module.$1;
-    if ( $^O eq 'MSWin32' ) {
-        $start_dir =~ s/\\/\//go;
-        $link_name =~ s/\\/\//go;
-        if (lc($start_dir) eq lc($link_name)) {
-            get_current_module($current_module);
-        };
-    } elsif ((-l $link_name) && (chdir $link_name)) {
-        if ($start_dir eq getcwd()) {
-            # we're dealing with link => fallback to SOLARSRC under UNIX
-            $StandDir = $ENV{SOLARSRC}.'/';
-            get_current_module($current_module);
-            return;
-        } else {
-            chdir $start_dir;
-            getcwd();
-        };
+    if (($current_module =~ /(\.lnk)$/) || ($current_module =~ /(\.link)$/)) {
+        $current_module = $`;
+        # we're dealing with a link => fallback to SOLARSRC under UNIX
+        $StandDir = $ENV{SOLARSRC}.'/';
+        get_current_module($current_module);
+        return;
+    } else {
+        chdir $start_dir;
+        getcwd();
     };
 };
 
@@ -2836,7 +2826,7 @@ sub generate_html_file {
         print HTML 'document.write("        </ul>");' . "\n";
         print HTML 'document.write("    </div>");' . "\n";
     };
-    if ($BuildAllParents) {
+    if ($build_all_parents) {
         print HTML 'document.write("<table valign=top cellpadding=0 hspace=0 vspace=0 cellspacing=0 border=0>");' . "\n";
         print HTML 'document.write("    <tr>");' . "\n";
         print HTML 'document.write("        <td><a id=ErroneousModules href=\"javascript:top.Error(\'\', \'';
@@ -2874,7 +2864,7 @@ sub generate_html_file {
 
     foreach (@modules_order) {
         next if ($modules_types{$_} eq 'lnk');
-        next if (scalar keys %active_modules && (!defined $active_modules{$_}));
+        next if (!defined $active_modules{$_});
         my ($errors_info_line, $dirs_info_line, $errors_number, $successes_percent, $errors_percent, $time) = get_html_info($_);
 #<one module>
         print HTML 'document.write("    <tr>");' . "\n";
@@ -3517,7 +3507,7 @@ sub get_job_string {
     my $build_queue = shift;
     my $job = $dmake;
     my ($job_dir, $dependencies_hash);
-    if ($BuildAllParents) {
+    if ($build_all_parents) {
         fill_modules_queue($build_queue);
         do {
             ($job_dir, $dependencies_hash) = pick_jobdir($build_queue);
diff --git a/solenv/bin/checkdll.sh b/solenv/bin/checkdll.sh
index 0400f461666e..e64b8fd2aa4c 100755
--- a/solenv/bin/checkdll.sh
+++ b/solenv/bin/checkdll.sh
@@ -60,16 +60,6 @@ if [ -x $checkdll ]; then
         *) DYLD_LIBRARY_PATH=$libpath;;
         esac
         export DYLD_LIBRARY_PATH;;
-    IRIX) case "${LD_LIBRARYN32_PATH+X}" in
-        X) LD_LIBRARYN32_PATH=$libpath:$LD_LIBRARYN32_PATH;;
-        *) LD_LIBRARYN32_PATH=$libpath;;
-    esac
-        export LD_LIBRARYN32_PATH;;
-    IRIX64) case "${LD_LIBRARYN32_PATH+X}" in
-        X) LD_LIBRARYN32_PATH=$libpath:$LD_LIBRARYN32_PATH;;
-        *) LD_LIBRARYN32_PATH=$libpath;;
-    esac
-        export LD_LIBRARYN32_PATH;;
     *)  case "${LD_LIBRARY_PATH+X}" in
         X) LD_LIBRARY_PATH=$libpath:$LD_LIBRARY_PATH;;
         *) LD_LIBRARY_PATH=$libpath;;
diff --git a/solenv/bin/createpdbrelocators.pl b/solenv/bin/createpdbrelocators.pl
index 66c4301be61e..8b6218adbab2 100644
--- a/solenv/bin/createpdbrelocators.pl
+++ b/solenv/bin/createpdbrelocators.pl
@@ -62,6 +62,7 @@ print "$script_name -- version: $script_rev\n";
 
 my $inpath    = $ENV{INPATH};
 my $milestone = $ENV{UPDMINOR};
+my $milestoneext = $ENV{UPDMINOREXT};
 
 if ( $ARGV[0] ) {
     if ( $milestone && ( $milestone ne $ARGV[0] ) ) {
@@ -74,8 +75,8 @@ if ( !$inpath || !$milestone ) {
     print STDERR "$script_name: INAPTH or UPDMINOR not set!\n";
     exit(1);
 }
-
-my $rc = CreatePDBRelocators::create_pdb_relocators($inpath, $milestone, "");
+my $relocators = CreatePDBRelocators->new();
+my $rc = $relocators->create_pdb_relocators($inpath, $milestoneext, "");
 
 if ( !$rc ) {
     print STDERR "$script_name: creating PDB relocators failed!\n";
diff --git a/solenv/bin/cws.pl b/solenv/bin/cws.pl
index 96ea6610fa67..801d62add78c 100644
--- a/solenv/bin/cws.pl
+++ b/solenv/bin/cws.pl
@@ -59,9 +59,11 @@ use Cws;
 
 #### globals ####
 
-# TODO: replace dummy vales with actual SVN->hg migration milestones
+# TODO: replace dummy vales with actual SVN->hg and source_config migration milestones
 my $dev300_migration_milestone = 'm64';
+my $dev300_source_config_milestone = 'm65';
 my $ooo320_migration_milestone = 'm999';
+my $ooo320_source_config_milestone = 'm999';
 
 # valid command with possible abbreviations
 my @valid_commands = (
@@ -101,6 +103,9 @@ for (@valid_commands) {
 
 #  set by --debug switch
 my $debug = 0;
+#  set by --profile switch
+my $profile = 0;
+
 
 #### main ####
 
@@ -126,6 +131,7 @@ sub parse_command_line
                                              'migration',
                                              'childworkspace|child|c=s',
                                              'debug',
+                                             'profile',
                                              'commit|C',
                                              'switch|s',
                                              'platforms|p=s',
@@ -195,6 +201,10 @@ sub verify_options
             $debug = 1;
             next;
         }
+        if ( /profile/ ) {
+            $profile = 1;
+            next;
+        }
         if (!exists $valid_command_options_hash{$_}) {
             print_error("can't use option '--$_' with subcommand '$command'.", 1);
         }
@@ -576,7 +586,7 @@ sub hg_local_clone_repository
         hg_strip($dest, $revision);
     }
     my $t2 = Benchmark->new();
-    print_time_elapsed($t1, $t2);
+    print_time_elapsed($t1, $t2) if $profile;
 }
 
 sub hg_lan_clone_repository
@@ -589,7 +599,7 @@ sub hg_lan_clone_repository
     print_message("... clone LAN repository '$lan_source' to '$dest'");
     hg_clone($lan_source, $dest, "-U -r $milestone_tag");
     my $t2 = Benchmark->new();
-    print_time_elapsed($t1, $t2);
+    print_time_elapsed($t1, $t2) if $profile;
 }
 
 sub hg_remote_pull_repository
@@ -601,7 +611,7 @@ sub hg_remote_pull_repository
     print_message("... pull from REMOTE repository '$remote_source' to '$dest'");
     hg_pull($dest, $remote_source);
     my $t2 = Benchmark->new();
-    print_time_elapsed($t1, $t2);
+    print_time_elapsed($t1, $t2) if $profile;
 }
 
 sub hg_update_repository
@@ -612,7 +622,7 @@ sub hg_update_repository
     print_message("... update repository '$dest'");
     hg_update($dest);
     my $t2 = Benchmark->new();
-    print_time_elapsed($t1, $t2);
+    print_time_elapsed($t1, $t2) if $profile;
 }
 
 # Check if clone source and destination are on the same filesystem,
@@ -1312,10 +1322,11 @@ sub relink_workspace {
 
 sub update_solver
 {
-    my $platform   = shift;
-    my $source     = shift;
-    my $solver     = shift;
-    my $milestone  = shift;
+    my $platform      = shift;
+    my $source        = shift;
+    my $solver        = shift;
+    my $milestone     = shift;
+    my $source_config = shift;
 
     my @zip_sub_dirs = ('bin', 'doc', 'idl', 'inc', 'lib', 'par', 'pck', 'pdb', 'pus', 'rdb', 'res', 'xml', 'sdf');
 
@@ -1344,6 +1355,7 @@ sub update_solver
     my $nzips = @zips;
     print_message("... unzipping $nzips zip archives for platform '$platform'");
 
+
     foreach(@zips) {
         my $zip = Archive::Zip->new();
         unless ( $zip->read( "$platform_source/$_" ) == AZ_OK ) {
@@ -1351,7 +1363,8 @@ sub update_solver
         }
         # TODO: check for erorrs
         foreach (@zip_sub_dirs) {
-            unless ( $zip->extractTree($_, "$platform_solver/$_.$milestone") == AZ_OK ) {
+            my $extract_destination = $source_config ? "$platform_solver/$_" : "$platform_solver/$_.$milestone";
+            unless ( $zip->extractTree($_, $extract_destination) == AZ_OK ) {
                 print_error("Can't extract stream from zip file '$platform_source/$_': $!.", 44);
             }
         }
@@ -1453,11 +1466,40 @@ sub get_scm_for_milestone
         }
     }
     else {
-        $scm = 'SVN'
+        $scm = 'SVN';
     }
     return $scm;
 }
 
+# TODO: special provisions for "source_config" migration, remove this
+# some time after migration
+sub get_source_config_for_milestone
+{
+    my $masterws = shift;
+    my $milestone = shift;
+
+    my $milestone_sequence_number = extract_milestone_sequence_number($milestone);
+    my $dev300_migration_sequence_number = extract_milestone_sequence_number($dev300_source_config_milestone);
+    my $ooo320_migration_sequence_number = extract_milestone_sequence_number($ooo320_source_config_milestone);
+
+    my $source_config = 0;
+
+    if ( $masterws eq 'DEV300' ) {
+        if ( $milestone_sequence_number >= $dev300_migration_sequence_number ) {
+            $source_config = 1;
+        }
+    }
+    elsif ( $masterws eq 'OOO320' ) {
+        if ( $milestone_sequence_number >= $ooo320_migration_sequence_number ) {
+            $source_config = '1';
+        }
+    }
+    else {
+        $source_config = 0;
+    }
+    return $source_config;
+}
+
 sub extract_milestone_sequence_number
 {
     my $milestone = shift;
@@ -2264,11 +2306,24 @@ sub do_fetch
                     hg_clone_repository('ooo', $cws, "$work_master/ooo", $clone_milestone_only);
                     hg_clone_repository('so', $cws, "$work_master/sun", $clone_milestone_only);
                 }
-                my $linkdir = "$work_master/src.$milestone";
-                if ( !mkdir($linkdir) ) {
-                    print_error("Can't create directory '$linkdir': $!.", 8);
+                if ( get_source_config_for_milestone($masterws, $milestone) ) {
+                    # write source_config file
+                    my $source_config_file = "$work_master/source_config";
+                    if ( !open(SOURCE_CONFIG, ">$source_config_file") ) {
+                        print_error("Can't create source_config file '$source_config_file': $!.", 8);
+                    }
+                    print SOURCE_CONFIG "[repositories]\n";
+                    print SOURCE_CONFIG "ooo=active\n";
+                    print SOURCE_CONFIG "sun=active\n";
+                    close(SOURCE_CONFIG);
+                }
+                else {
+                    my $linkdir = "$work_master/src.$milestone";
+                    if ( !mkdir($linkdir) ) {
+                        print_error("Can't create directory '$linkdir': $!.", 8);
+                    }
+                    relink_workspace($linkdir);
                 }
-                relink_workspace($linkdir);
             }
             else {
                 if ( $scm eq 'SVN' ) {
@@ -2294,12 +2349,13 @@ sub do_fetch
                 print_error("Can't create directory '$solver': $!.", 8);
             }
         }
+        my $source_config = get_source_config_for_milestone($masterws, $milestone);
         foreach(@platforms) {
             my $time_solver_start = Benchmark->new();
             print_message("... copying platform solver '$_'.");
-            update_solver($_, $prebuild_dir, $solver, $milestone);
+            update_solver($_, $prebuild_dir, $solver, $milestone, $source_config);
             my $time_solver_stop = Benchmark->new();
-            print_time_elapsed($time_solver_start, $time_solver_stop);
+            print_time_elapsed($time_solver_start, $time_solver_stop) if $profile;
         }
     }
     my $time_fetch_stop = Benchmark->new();
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 611a08a47f62..0d6c8b27afa4 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -100,7 +100,6 @@ $files_copied       = 0;            # statistics
 $files_unchanged    = 0;            # statistics
 
 $opt_force          = 0;            # option force copy
-$opt_minor          = 0;            # option deliver in minor
 $opt_check          = 0;            # do actually execute any action
 $opt_zip            = 0;            # create an additional zip file
 $opt_silent         = 0;            # be silent, only report errors
@@ -402,7 +401,6 @@ sub parse_options
     my $dontdeletecommon = 0;
     while ( $arg = shift @ARGV ) {
         $arg =~ /^-force$/      and $opt_force  = 1  and next;
-        $arg =~ /^-minor$/      and $opt_minor  = 1  and next;
         $arg =~ /^-check$/      and $opt_check  = 1  and $opt_verbose = 1 and next;
         $arg =~ /^-quiet$/      and $opt_silent = 1  and next;
         $arg =~ /^-verbose$/    and $opt_verbose = 1 and next;
@@ -462,6 +460,7 @@ sub init_globals
     my $solarversion  = $ENV{'SOLARVERSION'};
     my $updater       = $ENV{'UPDATER'};
     my $updminor      = $ENV{'UPDMINOR'};
+    my $updminorext   = $ENV{'UPDMINOREXT'};
     my $work_stamp    = $ENV{'WORK_STAMP'};
 
     # special security check for release engineers
@@ -483,14 +482,8 @@ sub init_globals
     }
 
     $ext = "";
-    if ( ($opt_minor || $updminor) && !$dest ) {
-        if ( $updminor ) {
-            $ext = ".$updminor";
-        }
-        else {
-            print_error("can't determine UPDMINOR", 0);
-            exit(3);
-        }
+    if ( ($updminor) && !$dest ) {
+        $ext = "$updminorext";
     }
 
     # Do we have common trees?
@@ -559,7 +552,7 @@ sub get_base
     }
 
     if ( $#field == -1 ) {
-        print_error("can't determine module");
+        print_error("can't find d.lst");
         exit(2);
     }
     else {
@@ -668,6 +661,7 @@ sub glob_line
         my @file_list = glob($from);
 
         foreach $file ( @file_list ) {
+            next if ( -d $file); # we only copy files, not directories
             my ($fname, $dir) = fileparse($file);
             my $copy = ($replace) ? $to_dir . $fname : $to . '/' . $fname;
             push(@globbed_files, [$file, $copy]);
@@ -1123,7 +1117,7 @@ sub push_on_ziplist
     return if ( $opt_check );
     # strip $dest from path since we don't want to record it in zip file
     if ( $file =~ s#^\Q$dest\E/##o ) {
-        if ( $opt_minor ){
+        if ( $updminor ){
             # strip minor from path
             my $ext = "%_EXT%";
             $ext = expand_macros($ext);
@@ -1131,7 +1125,7 @@ sub push_on_ziplist
         }
         push(@zip_list, $file);
     } elsif ( $file =~ s#^\Q$common_dest\E/##o ) {
-        if ( $opt_minor ){
+        if ( $updminor ){
             # strip minor from path
             my $ext = "%_EXT%";
             $ext = expand_macros($ext);
@@ -1529,23 +1523,22 @@ sub cleanup_and_die
 sub usage
 {
     my $exit_code = shift;
-    print STDERR "Usage:\ndeliver [OPTION]... [DESTINATION-PATH]\n";
+    print STDERR "Usage:\ndeliver [OPTIONS] [DESTINATION-PATH]\n";
     print STDERR "Options:\n";
     print STDERR "  -check       just print what would happen, no actual copying of files\n";
     print STDERR "  -checkdlst   be verbose about (possible) d.lst bugs\n";
     print STDERR "  -delete      delete files (undeliver), use with care\n";
     print STDERR "  -deloutput   remove the output tree after copying\n";
-    print STDERR "  -force       copy even if not newer\n";
     print STDERR "  -dontdeletecommon do not delete common files (for -delete option)\n";
+    print STDERR "  -force       copy even if not newer\n";
     print STDERR "  -help        print this message\n";
     if ( !defined($ENV{GUI}) || $ENV{GUI} ne 'WNT' ) {
         print STDERR "  -link        hard link files into the solver to save disk space\n";
     }
-    print STDERR "  -minor       deliver into minor (milestone)\n";
     print STDERR "  -quiet       be quiet, only report errors\n";
     print STDERR "  -verbose     be verbose\n";
     print STDERR "  -zip         additionally create zip files of delivered content\n";
-    print STDERR "Option '-zip' and a destination-path are mutually exclusive.\n";
+    print STDERR "Options '-zip' and a destination-path are mutually exclusive.\n";
     print STDERR "Options '-check' and '-quiet' are mutually exclusive.\n";
     exit($exit_code);
 }
diff --git a/solenv/bin/mhids.pl b/solenv/bin/mhids.pl
index c6fc230cabd4..52a62ef70040 100644
--- a/solenv/bin/mhids.pl
+++ b/solenv/bin/mhids.pl
@@ -88,6 +88,8 @@ sub setcompiler
         $outobj_flag = "-Fo";
         $objext = ".obj";
         $preprocess_flag = "-EP"; # preprocess to stdout
+        $solarincludes =~ s/\/stl/\/xstlx/g;
+        $defs =~ s/\/stl/\/xstlx/g;
     } elsif ( "$whichcom" eq "C52" ) {
         $appext = ""; # windows for now
         $compiler = "cc";
@@ -154,7 +156,10 @@ $filename =~ s/\\/\//g;
 $filebase = $filename;
 $filebase =~ s/.*[\\\/]//;
 $filebase =~ s/\..*?$//;
-$workfile = "$tmpdir/${filebase}_".$$;
+# now stript it to something that doesn't togger vista execution prevention :(
+$flbs = $filebase;
+$flbs =~ s/[aeiou]//g;
+$workfile = "$tmpdir/${flbs}_".$$;
 #$workfile =~ s/setup/set_up/;
 
 # now get $workfile ready for shell usage...
diff --git a/solenv/bin/modules/CreatePDBRelocators.pm b/solenv/bin/modules/CreatePDBRelocators.pm
index e279cf7daeb9..0b57e748b486 100644
--- a/solenv/bin/modules/CreatePDBRelocators.pm
+++ b/solenv/bin/modules/CreatePDBRelocators.pm
@@ -35,7 +35,7 @@
 #                       PDB relocator files are used to find debug infos
 #                       for analysis of creash reports
 #
-# usage: create_pdb_relocators($inpath, $milestone, $pre);
+# usage: create_pdb_relocators($inpath, $milestoneext, $pre);
 #
 #*************************************************************************
 
@@ -43,32 +43,57 @@ package CreatePDBRelocators;
 
 use strict;
 use File::Basename;
+use SourceConfig;
 
-sub create_pdb_relocators
+sub new
 {
-    my $inpath   = shift;
-    my $milestone    = shift;
-    my $pre      = shift;
+    my $Object = shift;
+    my $solarversion = shift;
+    my $self = {};
+    my @repositories;
 
-    my $solarversion = $ENV{SOLARVERSION};
+    if (!defined ($solarversion)) {
+        $solarversion = $ENV{SOLARVERSION};
+    }
     if ( !$solarversion ) {
         print STDERR "can't determine SOLARVERSION.\n";
-        return undef;
+        exit (1);
     }
 
-    my $o = $ENV{SRC_ROOT};
-    if ( !$o ) {
-        print STDERR "can't determine SOLAR_SRC.\n";
-        return undef;
+    $self->{SOLARVERSION} = $solarversion;
+
+    my $SourceConfigObj = SourceConfig->new();
+    @repositories = $SourceConfigObj->get_repositories();
+
+    if (!scalar @repositories) {
+        print STDERR "no repository and no working directory found.\n";
+        exit (2);
     }
+    $self->{REPOSITORIES} = \@repositories;
+    bless($self, $Object);
+    return $self;
+}
 
+sub create_pdb_relocators
+{
+    my $self = shift;
+    my $inpath   = shift;
+    my $milestoneext    = shift;
+    my $pre      = shift;
+
+    my $solarversion = $self->{SOLARVERSION};
     my $root_dir = "$solarversion/$inpath";
 
     # sanitize path
     $root_dir =~ s/\\/\//g;
-    $o =~ s/\\/\//g;
-    my $pdb_dir = $root_dir . "/pdb.$pre$milestone";
-    my $pdb_so_dir = $root_dir . "/pdb.$pre$milestone/so";
+    my $o =~ s/\\/\//g;
+    my $premilestoneext = $milestoneext;
+    if ( $pre ne "" ) {
+        $premilestoneext = ~ s/^\.//;
+        $premilestoneext = ".pre$premilestoneext";
+    }
+    my $pdb_dir = $root_dir . "/pdb$premilestoneext";
+    my $pdb_so_dir = $root_dir . "/pdb$premilestoneext/so";
 
     # create pdb directories if necessary
     if ( ! -d $pdb_dir ) {
@@ -86,42 +111,60 @@ sub create_pdb_relocators
 
     # collect files
     my @pdb_files;
-    collect_files( $o, $inpath, \@pdb_files);
-
-    foreach (@pdb_files) {
-        my $relocator = basename($_) . ".location";
-        /$o\/(.*)/i;
-
-        my $src_location = $1;
-
-        my $location = "";
-        my $target = "";
-        if ( $src_location =~ /\/so\// )
-        {
-            $location = "../../../src.$milestone/" . $src_location;
-            $target = "$pdb_dir/so/$relocator";
-        }
-        else
-        {
-            $location = "../../src.$milestone/" . $src_location;
-            $target = "$pdb_dir/$relocator";
-        }
+    foreach my $repository (@{$self->{REPOSITORIES}}) {
+        my $o = $self->{SOLARVERSION} . "/$repository";
+        $repository =~ s/(.*?)\.(.*)/$1/;
+        $self->collect_files( $o, $inpath, \@pdb_files);
+
+        foreach (@pdb_files) {
+            my $relocator = basename($_) . ".location";
+            /$o\/(.*)/i;
+
+            my $src_location = $1;
+
+            my $location = "";
+            my $target = "";
+            if ( $src_location =~ /\/so\// )
+            {
+                $location = "../../../$repository$milestoneext/" . $src_location;
+                $target = "$pdb_dir/so/$relocator";
+            }
+            else
+            {
+                $location = "../../$repository$milestoneext/" . $src_location;
+                $target = "$pdb_dir/$relocator";
+            }
 
-        if ( !open(RELOCATOR, ">$target") ) {
-            print STDERR "can't write file '$target'\n";
-            return undef;
+            if ( !open(RELOCATOR, ">$target") ) {
+                print STDERR "can't write file '$target'\n";
+                return undef;
+            }
+            print RELOCATOR "$location\n";
+            close(RELOCATOR);
         }
-        print RELOCATOR "$location\n";
-        close(RELOCATOR);
     }
     return 1;
 }
 
+sub collect_files_from_all_repositories
+{
+    my $self = shift;
+    my ($platform, $filesref) = @_;
+    my $repository;
+    my $ret;
+    foreach $repository (@{$self->{REPOSITORIES}}) {
+        my $srcdir = $self->{SOLARVERSION} . "/$repository";
+        $ret |= $self->collect_files ($srcdir, $platform, $filesref);
+    }
+    return $ret;
+}
+
 sub collect_files
 {
+    my $self = shift;
     my ($srcdir, $platform, $filesref) = @_;
     my $template = "$srcdir/*/$platform";
-    if ( $^O eq 'MSWin32' ) {
+    if ( $ENV{GUI} eq "WNT" ) {
         # collect all pdb files on o:
         # regular glob does not work with two wildcard on WNT
         my @bin    = glob("$template/bin/*.pdb");
@@ -145,8 +188,8 @@ sub collect_files
         my @mac_lib = glob("$template/lib/*.dylib*");
         my @mac_lib_so = glob("$template/lib/so/*.dylib*");
         # collect all binary executables on o:
-        my @bin = find_binary_execs("$template/bin");
-        my @bin_so = find_binary_execs("$template/bin/so");
+        my @bin = $self->find_binary_execs("$template/bin");
+        my @bin_so = $self->find_binary_execs("$template/bin/so");
         @$filesref = (@lib, @lib_so, @mac_lib, @mac_lib_so, @bin, @bin_so);
     }
     return 1;
@@ -154,6 +197,7 @@ sub collect_files
 
 sub find_binary_execs
 {
+    my $self = shift;
     my $path = shift;
     my @files = glob("$path/*");
     my @execs = grep(-x $_, @files);
diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm
index 23d89d882bb8..e43b1f50a990 100644
--- a/solenv/bin/modules/SourceConfig.pm
+++ b/solenv/bin/modules/SourceConfig.pm
@@ -44,6 +44,10 @@ use strict;
 use constant SOURCE_CONFIG_FILE_NAME => 'source_config';
 
 use Carp;
+use Cwd;
+use File::Basename;
+
+my $debug = 0;
 
 #####  profiling #####
 
@@ -64,8 +68,9 @@ sub new {
     $self->{REPOSITORIES} = {};
     $self->{MODULE_PATHS} = {};
     $self->{MODULE_BUILD_LIST_PATHS} = {};
-    $self->{ACTIVE_MODULES} = {};
+    $self->{ACTIVATED_MODULES} = {};
     $self->{MODULE_REPOSITORY} = {};
+    $self->{REAL_MODULES} = {};
     $self->{SOURCE_CONFIG_FILE} = get_config_file($source_root);
     $self->{SOURCE_CONFIG_DEFAULT} = Cwd::realpath($source_root) .'/'.SOURCE_CONFIG_FILE_NAME;
     read_config_file($self);
@@ -110,7 +115,7 @@ sub get_module_path {
     if (defined ${$self->{MODULE_PATHS}}{$module}) {
         return ${$self->{MODULE_PATHS}}{$module};
     } else {
-        Carp::cluck("No path for module $module in active repositories!!\n");
+        Carp::cluck("No path for module $module in active repositories!!\n") if ($debug);
         return undef;
     };
 }
@@ -135,13 +140,26 @@ sub get_all_modules
     return sort keys %{$self->{MODULE_PATHS}};
 };
 
-
 sub get_active_modules
 {
     my $self        = shift;
-    return sort keys %{$self->{ACTIVE_MODULES}};
+    if (scalar keys %{$self->{ACTIVATED_MODULES}}) {
+        return sort keys %{$self->{ACTIVATED_MODULES}};
+    }
+    $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}});
+       return sort keys %{$self->{REAL_MODULES}};
 }
 
+sub is_active
+{
+    my $self        = shift;
+    my $module      = shift;
+    if (scalar keys %{$self->{ACTIVATED_MODULES}}) {
+        return exists ($self->{ACTIVATED_MODULES}{$module});
+    }
+       $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}});
+    return exists ($self->{REAL_MODULES}{$module});
+}
 
 ##### private methods #####
 
@@ -163,10 +181,11 @@ sub get_module_paths {
         my $repository_path = ${$self->{REPOSITORIES}}{$repository};
         if (opendir DIRHANDLE, $repository_path) {
             foreach my $module (readdir(DIRHANDLE)) {
-                next if ($module =~ /^\.+/);
+                next if (($module =~ /^\.+/) || (!-d "$repository_path/$module"));
                 my $module_entry = $module;
-                $module =~ s/\.lnk$//;
-                $module =~ s/\.link$//;
+                if (($module !~ s/\.lnk$//) && ($module !~ s/\.link$//)) {
+                    $self->{REAL_MODULES}{$module}++;
+                }
                 my $possible_path = "$repository_path/$module_entry";
                 if (-d $possible_path) {
                     if (defined ${$self->{MODULE_PATHS}}{$module}) {
@@ -182,6 +201,7 @@ sub get_module_paths {
             croak("Cannot read $_ repository content");
         };
     };
+    croak("No modules found!") if (!scalar keys %{$self->{MODULE_PATHS}});
 };
 
 sub get_config_file {
@@ -227,7 +247,7 @@ sub read_config_file {
                     next;
                 }
                 if ($module_section) {
-                    ${$self->{ACTIVE_MODULES}}{$1}++;
+                    ${$self->{ACTIVATED_MODULES}}{$1}++;
                     next;
                 };
             };
@@ -308,6 +328,11 @@ SourceConfig::get_config_file_default_path()
 
 Returns default path for source configuration file
 
+SourceConfig::is_active()
+
+Returns 1 (TRUE) if a module is active
+Returns 0 (FALSE) if a module is not active
+
 =head2 EXPORT
 
 SourceConfig::new()
@@ -319,6 +344,7 @@ SourceConfig::get_module_build_list($module)
 SourceConfig::get_module_repository($module)
 SourceConfig::get_config_file_path()
 SourceConfig::get_config_file_default_path()
+SourceConfig::is_active($module)
 
 =head1 AUTHOR
 
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index cde8204972f9..8579e67ed970 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -82,8 +82,15 @@ BEGIN
         "dgo",
         "kok",
         "mni",
-        "sat"
-
+        "sat",
+        "ug",
+        "om",
+        "si",
+        "or",
+        "oc",
+        "ml",
+        "as",
+        "ast"
     );
     @items_at_modules = ("Files", "Dirs", "Unixlinks");
     @asianlanguages = ("ja", "ko", "zh-CN", "zh-TW");
diff --git a/solenv/bin/modules/installer/javainstaller.pm b/solenv/bin/modules/installer/javainstaller.pm
index 980b48dcbc0a..b9735e5aee29 100644
--- a/solenv/bin/modules/installer/javainstaller.pm
+++ b/solenv/bin/modules/installer/javainstaller.pm
@@ -461,7 +461,6 @@ sub set_classpath_for_install_sdk
     else { installer::exiter::exit_program("ERROR: Environment variable \"INPATH\" not set!", "set_classpath_for_install_sdk"); }
 
     if ( defined( $ENV{ 'UPDMINOREXT' } ) ) { $updMinorExt =  $ENV{'UPDMINOREXT'}; }
-    else { installer::exiter::exit_program("ERROR: Environment variable \"UPDMINOREXT\" not set!", "set_classpath_for_install_sdk") if ( ! $ENV{UPDATER} ); }
 
     $installsdk = $solarVersion .  $installer::globals::separator . $inPath . $installer::globals::separator . "bin" . $updMinorExt;
     $installsdk = $installsdk . $installer::globals::separator . "javainstaller";
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm
index 991f0025e714..e9ad0c73d249 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -484,6 +484,16 @@ sub write_idt_header
         push(@{$idtref}, $oneline);
     }
 
+    if ( $definestring eq "reg64" )
+    {
+        $oneline = "Registry\tRoot\tKey\tName\tValue\tComponent_\n";
+        push(@{$idtref}, $oneline);
+        $oneline = "s72\ti2\tl255\tL255\tL0\ts72\n";
+        push(@{$idtref}, $oneline);
+        $oneline = "Reg64\tRegistry\n";
+        push(@{$idtref}, $oneline);
+    }
+
     if ( $definestring eq "createfolder" )
     {
         $oneline = "Directory_\tComponent_\n";
diff --git a/solenv/bin/modules/installer/windows/registry.pm b/solenv/bin/modules/installer/windows/registry.pm
index 832fd213a9f0..9f9da9485677 100644
--- a/solenv/bin/modules/installer/windows/registry.pm
+++ b/solenv/bin/modules/installer/windows/registry.pm
@@ -216,6 +216,27 @@ sub get_registry_value
 }
 
 ##############################################################
+# Returning 64 bit value for registry table.
+##############################################################
+
+sub get_registry_val64
+{
+    my ($registry, $allvariableshashref) = @_;
+
+    my $value = "";
+
+    if ( $registry->{'Val64'} ) { $value = $registry->{'Val64'}; }
+
+    $value =~ s/\\\"/\"/g;  # no more masquerading of '"'
+    $value =~ s/\<progpath\>/\[OFFICEINSTALLLOCATION\]/;
+    $value =~ s/\[OFFICEINSTALLLOCATION\]\\/\[OFFICEINSTALLLOCATION\]/; # removing "\" after "[OFFICEINSTALLLOCATION]"
+
+    if ( $value =~ /\%/ ) { $value = installer::worker::replace_variables_in_string($value, $allvariableshashref); }
+
+    return $value;
+}
+
+##############################################################
 # Returning component for registry table.
 ##############################################################
 
@@ -286,8 +307,10 @@ sub create_registry_table
         my $onelanguage = ${$languagesarrayref}[$m];
 
         my @registrytable = ();
+        my @reg64table = ();
 
         installer::windows::idtglobal::write_idt_header(\@registrytable, "registry");
+        installer::windows::idtglobal::write_idt_header(\@reg64table, "reg64");
 
         for ( my $i = 0; $i <= $#{$registryref}; $i++ )
         {
@@ -306,6 +329,7 @@ sub create_registry_table
             $registry{'Key'} = get_registry_key($oneregistry, $allvariableshashref);
             $registry{'Name'} = get_registry_name($oneregistry, $allvariableshashref);
             $registry{'Value'} = get_registry_value($oneregistry, $allvariableshashref);
+            $registry{'Val64'} = get_registry_val64($oneregistry, $allvariableshashref);
             $registry{'Component_'} = get_registry_component($oneregistry, $allvariableshashref);
 
             # Collecting all components
@@ -343,7 +367,11 @@ sub create_registry_table
             my $oneline = $registry{'Registry'} . "\t" . $registry{'Root'} . "\t" . $registry{'Key'} . "\t"
                         . $registry{'Name'} . "\t" . $registry{'Value'} . "\t" . $registry{'Component_'} . "\n";
 
-            push(@registrytable, $oneline);
+            my $oneline64 = $registry{'Registry'} . "\t" . $registry{'Root'} . "\t" . $registry{'Key'} . "\t"
+                        . $registry{'Name'} . "\t" . $registry{'Val64'} . "\t" . $registry{'Component_'} . "\n";
+
+            if ( ! ( $style =~ /\bX64_ONLY\b/ )) { push(@registrytable, $oneline); }    # standard registry table for 32 Bit
+            if (( $style =~ /\bX64\b/ ) || ( $style =~ /\bX64_ONLY\b/ )) { push(@reg64table , $oneline64); }
         }
 
         # If there are added user registry keys for files collected in
@@ -360,6 +388,11 @@ sub create_registry_table
         installer::files::save_file($registrytablename ,\@registrytable);
         my $infoline = "Created idt file: $registrytablename\n";
         push(@installer::globals::logfileinfo, $infoline);
+
+        $registrytablename = $basedir . $installer::globals::separator . "Reg64.idt" . "." . $onelanguage;
+        installer::files::save_file($registrytablename ,\@reg64table );
+        my $infoline = "Created idt file: $registrytablename\n";
+        push(@installer::globals::logfileinfo, $infoline);
     }
 }
 
diff --git a/solenv/bin/modules/installer/xpdinstaller.pm b/solenv/bin/modules/installer/xpdinstaller.pm
index f18853dbdcdd..e81380807a87 100644
--- a/solenv/bin/modules/installer/xpdinstaller.pm
+++ b/solenv/bin/modules/installer/xpdinstaller.pm
@@ -449,6 +449,21 @@ sub get_forceintoupdate_value
 }
 
 ###################################################
+# Substituting all occurences of "<" by "&lt;"
+# and all occurences of ">" by "&gt;"
+###################################################
+
+sub replace_brackets_in_string
+{
+    my ( $string ) = @_;
+
+    if ( $string =~ /\</ ) { $string =~ s/\</\&lt\;/g; }
+    if ( $string =~ /\>/ ) { $string =~ s/\>/\&gt\;/g; }
+
+    return $string;
+}
+
+###################################################
 # Substituting all occurences of "\uUXYZ" by
 # "&#xUXYZ;", because the use xml saxparser does
 # not know anything about this encoding. Therfore
@@ -506,6 +521,7 @@ sub collect_lang_values
         if ( $write_line )
         {
             my $value = $module->{$key};
+            $value = replace_brackets_in_string($value);
             $value = replace_javaencoding_in_string($value);
             my $line = $indent . "<" . $saveentry . " lang=" . "\"" . $javalanguage . "\"" . ">" . $value . "<\/" . $saveentry . ">" . "\n";
             push(@{$xpdfile}, $line);
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index c1f1efbf98a8..3232daf2138f 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -493,7 +493,8 @@ sub replace_minor_in_pathes
     {
         my $line = ${$patharrayref}[$i];
 
-        if ( $installer::globals::minor )
+        if ( ! defined $ENV{CWS_WORK_STAMP} and defined $ENV{UPDMINOR} )
+#       if ( $installer::globals::minor )
         {
             $line =~ s/\{minor\}/$installer::globals::minor/g;
             # no difference for minor and minornonpre (ToDo ?)
diff --git a/solenv/bin/modules/osarch.pm b/solenv/bin/modules/osarch.pm
index 8c3a87e4ddc5..205e4c933193 100755
--- a/solenv/bin/modules/osarch.pm
+++ b/solenv/bin/modules/osarch.pm
@@ -27,8 +27,7 @@ chop( $m_str, $s_str );
 #              "SCO_SV",    "scouw21",
                "Darwin",    "macosxp",
                "Mac OS",    "macosxp",
-               "SINIX-N",   "sinix",
-               "IRIX",      "irix"
+               "SINIX-N",   "sinix"
                );
 
 %osDefTable = ("SunOS",     "-DSYSV -DSOLARIS",
@@ -42,8 +41,7 @@ chop( $m_str, $s_str );
 #              "SCO_SV",    "-DSYSV -DSCO -DSCO_UW21",
                "Darwin",    "-DBSD -DMACOSX",
                "Mac OS",    "-DBSD -DMACOSX",
-               "SINIX-N",   "-DSYSV -DSINIX",
-               "IRIX",      "-DSYSV -DIRIX"
+               "SINIX-N",   "-DSYSV -DSINIX"
                );
 
 %osDosTable = ("SunOS",     "sol",
@@ -56,8 +54,7 @@ chop( $m_str, $s_str );
                "SCO_SV",    "sco",
                "Darwin",    "macx",
                "Mac OS",    "macx",
-               "SINIX-N",   "sni",
-               "IRIX",      "irx"
+               "SINIX-N",   "sni"
                );
 
 %archTable  = ("sun4c",         "sparc",
diff --git a/solenv/bin/receditor b/solenv/bin/receditor
index f5d00bfb23fa..1011aeb5d826 100755
--- a/solenv/bin/receditor
+++ b/solenv/bin/receditor
@@ -3,4 +3,4 @@ if [ x${SOLARENV}x = xx ]; then
     echo No environment found, please use 'configure' or 'setsolar'
     exit 1
 fi
-exec java -DSOLARSRC=${SOLARSRC} -DWORK_STAMP=${WORK_STAMP} -DUSE_SHELL=  -jar ${SOLARVER}/${INPATH}/bin.${UPDMINOR}/receditor.jar
+exec java -DSOLARSRC=${SOLARSRC} -DWORK_STAMP=${WORK_STAMP} -DUSE_SHELL=  -jar ${SOLARVER}/${INPATH}/bin${UPDMINOREXT}/receditor.jar
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 6d3a0961fbe4..c3b6f91c9dd7 100644..100755
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -1,17 +1,12 @@
-common 
+common
 {
-	environment 
+	environment
 	{
-		btarget 
-		{
-			BTARGET btarget=%BUILD_TARGET%
-		}
-		common 
+		common
 		{
 			ADDED_MODULES solenv default_images custom_images ooo_custom_images external_images postprocess instset_native instsetoo_native smoketest_native smoketestoo_native
 			BIG_SVX TRUE
 			BMP_WRITES_FLAG TRUE
-			BTARGET 1
 			BUILD_SPECIAL TRUE
 			BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE
 			common_build TRUE
@@ -34,6 +29,9 @@ common
 			ENABLE_SVCTAGS YES
 			ENABLE_VBA YES
 			ISERVER iserver.germany.sun.com
+			LU_HGFLAG ""
+			LU_NOSOURCE ""
+			LU_RFLAG ""
 			NEW_JAR_PACK TRUE
 			NO_REC_RES TRUE
 			OOODMAKEMODE YES
@@ -47,7 +45,6 @@ common
 			WITH_FONTOOO YES
 			WITH_LDAP YES
 			wrapper_override_cc_wrapper TRUE
-			ZIPSOURCE 1
             BUILD_QADEVOOO YES
 			MAXPROC maxproc=15
 		}
@@ -68,24 +65,30 @@ common
 		}
 		common:3 IF %UPDATER% != YES
 		{
-			ENABLE_CRASHDUMP DUMMY
 		}
-		crashdump 
+		crashdump
 		{
 			ENABLE_CRASHDUMP STATIC
 		}
+		hg
+		{
+			LU_HGFLAG hg_source
+		}
 		maxproc
 		{
 			MAXPROC maxproc=%MAXPROCESS%
 		}
-		nojava 
+		minorext
 		{
-			DISABLE_JAVA TRUE
+			UPDMINOREXT .%UPDMINOR%
+		}
+		nosource
+		{
+			LU_NOSOURCE no_source
 		}
 		pro:0 IF %UPDATER% == YES
 		{
 			DELIVER_TO_ZIP TRUE
-			ENABLE_CRASHDUMP STATIC
 			product full
 			PROEXT .pro
 			PROFULLSWITCH product=full
@@ -97,103 +100,106 @@ common
 			PROEXT .pro
 			PROFULLSWITCH product=full
 		}
-		shell 
+		r_only
+		{
+			LU_RFLAG r_only
+		}
+		shell
 		{
 			SHELL %STAR_USE_SHELL%
 			USE_SHELL %STAR_USE_SHELL%
 		}
-		tmp 
+		tmp
 		{
 			SOL_TMP %SOL_TMP_DIR%
 		}
-		verbose 
+		verbose
 		{
 			VERBOSE VERBOSE
 		}
-		zipsource 
-		{
-			ZIPSOURCE zipsource=%ZIP_SOURCE_URL%
-		}
 	}
-	extern 
+	extern
 	{
-		ENVROOT 
-		PATH 
-		SRC_ROOT 
-		STL_ROOT 
-		UPDATER 
+		ENVROOT
+		PATH
+		SRC_ROOT
+		UPDATER
 	}
-	order common:2 common:3 pro:0 pro:1 common common:0 btarget zipsource cwsname common:1 nojava shell tmp crashdump maxproc
-	reset 
+	order minorext common:2 common:3 pro:0 pro:1 common common:0 cwsname common:1 shell tmp crashdump maxproc hg r_only nosource
+	reset
 	{
-		ENVCFLAGS 
-		HOMEDRIVE 
-		HOMEPATH 
-		JAVAHOME 
-		JAVA_HOME 
+		ALT_L10N_MODULE
+		ENVCFLAGS
+		HOMEDRIVE
+		HOMEPATH
+		JAVAHOME
+		JAVA_HOME
+ 		LU_HGFLAG
+ 		LU_NOSOURCE
+ 		LU_RFLAGS
         MKDIRHIER
-		PROEXT 
-		PROFULLSWITCH 
-		SHIPDRIVE 
-		SOLARSRC 
-		SOLAR_JAVA 
-		SPEW 
+		PROEXT
+		PROFULLSWITCH
+		SHIPDRIVE
+		SOLARSRC
+		SOLAR_JAVA
+		SPEW
 		STLPORT4
+		UPDMINOREXT
 		WITH_FONTOOO
 		WITH_LANG
 	}
-	restore 
+	restore
 	{
-		PATH 
+		PATH
 	}
-	standlst 
+	standlst
 	{
 		DRIVE_O %WORK_STAMP%/drives/o:/UnixVolume
 		DRIVE_S %WORK_STAMP%/drives/s:/UnixVolume
 	}
-	switches 
+	switches
 	{
-		btarget BUILD_TARGET
-		crashdump 
+		crashdump
 		cwsname CWS_WORK_STAMP
-		envroot 
-		nojava 
-		pro 
+		envroot
+		hg
+		minorext
+		nosource
+		pro
 		maxproc MAXPROCESS
+		r_only
 		shell STAR_USE_SHELL
 		tmp SOL_TMP_DIR
 		verbose VERBOSE
-		zipsource ZIP_SOURCE_URL
 	}
 }
-finish 
+finish
 {
-	environment 
+	environment
 	{
-		ca 
-		{
-			SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%
-		}
-		cap 
+		cap
 		{
-			SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%
+			SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+			SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
 		}
-		cax 
+		cax
 		{
-			SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%
+			SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+			SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
 		}
 		common_0:0 IF %OS% == MACOSX
 		{
-			ENABLE_GCONF 
-			ENABLE_GNOMEVFS 
-			ENABLE_GTK 
+			ENABLE_GCONF
+			ENABLE_GNOMEVFS
+			ENABLE_GTK
 			SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% -I%SOLARENV%$/%OUTPATH%$/inc -I%SOLARENV%$/inc %SOLAREXTRAINC%
 		}
 		common_0:3 IF %SOLARINCLUDES% ==
 		{
 			SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% %PSDKINC% -I%COMPATH%$/include -I%SOLARENV%$/inc %SOLAREXTRAINC%
 		}
-		common_1 
+		common_1
 		{
 			BISON_HAIRY %SOLARROOT%$/btools$/bison.hairy
 			BISON_SIMPLE %SOLARROOT%$/btools$/bison.simple
@@ -203,6 +209,7 @@ finish
 			SOLARINC -I%SOLAR_STLPATH% -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/external %SOLARINCLUDES%
 			SOLARLIB -L%SOLARVER%/%INPATH%/lib%UPDMINOREXT% %JDKLIBS% %SOLAREXTRALIB%
 			SOLARSRC %SRC_ROOT%
+			SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
 		}
 		common_2:0 IF X%CWS_WORK_STAMP%X == XX
 		{
@@ -211,6 +218,7 @@ finish
 		common_a
 		{
 			*o: cd %SOLARSRC%
+			ALT_L10N_MODULE $expand(%SOLARSRC%/..)/sun/l10n_so
 		}
 		common_jre:0 IF %JREPATH% ==
 		{
@@ -222,8 +230,8 @@ finish
 		}
 		cwsname:0 IF X%SOURCE_ROOT_USED%X == XX
 		{
-			*build 
-			*deliver 
+			*build
+			*deliver
 			DMAKEROOT SOURCE_ROOT_not_used
 			SOLARINC SOURCE_ROOT_not_used
 			SOLARINCLUDE SOURCE_ROOT_not_used
@@ -237,8 +245,8 @@ finish
 		}
 		cwsname:1 IF X%SOURCE_ROOT%X == XX
 		{
-			*build 
-			*deliver 
+			*build
+			*deliver
 			DMAKEROOT SOURCE_ROOT_not_set
 			SOLARINC SOURCE_ROOT_not_set
 			SOLARINCLUDE SOURCE_ROOT_not_set
@@ -252,8 +260,8 @@ finish
 		}
 		cwsname:2 IF X%UPDMINOR%X == XX
 		{
-			*build 
-			*deliver 
+			*build
+			*deliver
 			DMAKEROOT UPDMINOR_not_used
 			SOLARINC UPDMINOR_not_used
 			SOLARINCLUDE UPDMINOR_not_used
@@ -265,86 +273,70 @@ finish
 			SO_GEN_ERROR2 ...resetting path to source tree
 			SRC_ROOT UPDMINOR_not_used
 		}
-		jdk13 
-		{
-			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
-			ILIB %LIB%$;%JDKLIB%
-			LIB %LIB%$;%JDKLIB%
-		}
-		jdk14 
+		jdk14
 		{
 			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
 			ILIB %LIB%$;%JDKLIB%
 			LIB %LIB%$;%JDKLIB%
 		}
-		jdk15 
+		jdk15
 		{
 			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
 			ILIB %LIB%$;%JDKLIB%
 			LIB %LIB%$;%JDKLIB%
 		}
-		l10n 
+		l10n
 		{
 			framework %L10N_framework%
 			L10N-framework %L10N_framework%
 		}
-		ojdk16 
+		ojdk16
 		{
 			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
 			ILIB %LIB%$;%JDKLIB%
 			LIB %LIB%$;%JDKLIB%
 		}
 	}
-	order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk13 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 ca cax cap common_a
-	switches 
+	order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 cax cap common_a
+	switches
 	{
 		cwsname CWS_WORK_STAMP
 	}
 }
-unxfbsdi 
+unxfbsdi
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
-		{
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-		}
-		cap 
+		cap
 		{
 			COPYALL TRUE
 			COPY_PACKED TRUE
 			DEVROOT %SOL_TMP%$/r
 			PCLEAN_PATH %SOLARROOT%/etools
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
 			PCLEAN_PATH %SOL_TMP%$/r/etools
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build nice perl %SOLARENV%/bin/build.pl %PROFULLSWITCH%
 			*build_client nice perl %SOLARENV%/bin/build_client.pl
@@ -365,19 +357,19 @@ unxfbsdi
 			SOLAR_JAVA TRUE
 			ZIPDEP perl %SOLARENV%/bin/zipdep.pl
 		}
-		common0 
+		common0
 		{
 			SOLAR_ENV_ROOT /so/env
 			SOLAR_SOURCE_ROOT %DRIVE_O%
 		}
-		common1 
+		common1
 		{
 			COMPATH %SOLAR_ENV_ROOT%$/gcc_3.0.1_linux_libc2.11_turbolinux
 			DEVROOT %SOLAR_ENV_ROOT%
 			PKGFORMAT some_dummy
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
 			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
 			SOLARROOT %SOLAR_ENV_ROOT%
 			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
 			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
@@ -385,9 +377,9 @@ unxfbsdi
 			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.2_11
 			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_06
 			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%
+			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
 		}
-		common2 
+		common2
 		{
 			BUILD_TOOLS %SOLARROOT%/bt_unxfbsdi/bin
 			COM GCC
@@ -413,11 +405,11 @@ unxfbsdi
 			TEMP /tmp
 			TMP /tmp
 		}
-		compath 
+		compath
 		{
 			COMPATH %STAR_COMPATH%
 		}
-		debug 
+		debug
 		{
 			LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH%
 		}
@@ -431,22 +423,7 @@ unxfbsdi
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13 
-		{
-			JAVA_HOME %JDK13PATH%
-			JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux
-			JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/linux
-			JDKLIB %JDK13PATH%/jre/lib:%JDK13PATH%/jre/lib/i386:%JDK13PATH%/jre/lib/i386/client
-			JDKLIBS -L%JDK13PATH%/jre/lib -L%JDK13PATH%/jre/lib/i386 -L%JDK13PATH%/jre/lib/i386/client
-			JDKPATH %JDK13PATH%/bin
-			JDK_VERSION 131
-			XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/lib/tools.jar
-		}
-		jdk13path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK13PATH %JDK_PATH%
-		}
-		jdk14 
+		jdk14
 		{
 			JAVA_HOME %JDK14PATH%
 			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux
@@ -461,7 +438,7 @@ unxfbsdi
 		{
 			SOLAR_JDK14PATH %JDK_PATH%
 		}
-		jdk15 
+		jdk15
 		{
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
@@ -476,19 +453,7 @@ unxfbsdi
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs 
-		{
-			*cvs %STAR_NATIVECVS%
-		}
-		pre 
-		{
-			ILIB %PRE%/lib:%ILIB%
-			LD_LIBRARY_PATH %PRE%/lib:%LD_LIBRARY_PATH%
-			LIB %PRE%/lib:%LIB%
-			SOLARINC -I. -I%PRE%/inc %SOLARINC%
-			SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib
-		}
-		pro 
+		pro
 		{
 			PROSWITCH -DPRODUCT
 		}
@@ -497,48 +462,38 @@ unxfbsdi
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
-		sysbaseroot 
+		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
 		}
 	}
-	extern 
+	extern
 	{
-		DIST_ROOT 
-		ENV_ROOT 
-		HOME 
-		JDK_PATH 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
-		SYSBASE_ROOT 
-		USER 
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
+		SYSBASE_ROOT
+		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 distroot:0 nativecvs ca cap cax compath common2 pro stl:0 stl:1 common jdk13 jdk14 jdk15 debug pre
-	reset 
+	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 cap cax compath common2 pro common jdk14 jdk15 debug
+	reset
 	{
-		CLASSPATH 
-		COPYALL 
+		CLASSPATH
+		COPYALL
 	}
-	restore 
+	restore
 	{
-		INCLUDE 
+		INCLUDE
 	}
-	script 
+	script
 	{
 		csh 
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			600: umask 002
 			800: rehash
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -546,10 +501,10 @@ unxfbsdi
 			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
 			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
 		}
-		sh 
+		sh
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -567,79 +522,62 @@ unxfbsdi
 			882: fi
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		cap
+		cax
 		compath STAR_COMPATH
-		debug 
-		distroot 
-		envroot 
-		jdk13 
-		jdk13path 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		debug
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
-		nativecvs STAR_NATIVECVS
-		pre PRE
-		pro 
-		sourceroot 
-		stl 
-		sysbaseroot 
+		pro
+		sourceroot
+		sysbaseroot
 	}
 }
-unxlngi6 
+unxlngi6
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
-		{
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-		}
-		cap 
+		cap
 		{
 			COPYALL TRUE
 			COPY_PACKED TRUE
 			DEVROOT %SOL_TMP%$/r
 			PCLEAN_PATH %SOLARROOT%/etools
 			PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
 			PCLEAN_PATH %SOL_TMP%$/r/etools
 			PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
 			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -663,22 +601,22 @@ unxlngi6
 			SOLAR_JAVA TRUE
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
 		}
-		common0 
+		common0
 		{
 			SOLAR_ENV_ROOT /so/env
 			SOLAR_SOURCE_ROOT %DRIVE_O%
-			SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux_libc2.32/glibc2.3.2            
+			SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux_libc2.32/glibc2.3.2
 		}
-		common1 
+		common1
 		{
-			COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux_libc2.32            
+			COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux_libc2.32
 			DEVROOT %SOLAR_ENV_ROOT%
 			LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 			PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin/perl
 			PKGFORMAT rpm
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
 			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
 			SOLARROOT %SOLAR_ENV_ROOT%
 			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
 			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
@@ -687,9 +625,9 @@ unxlngi6
 			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_06
 			SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-i586
 			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%
+			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
 		}
-		common2 
+		common2
 		{
 			ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin
@@ -726,7 +664,7 @@ unxlngi6
 		{
 			FORCE2ARCHIVE TRUE
 		}
-		compath 
+		compath
 		{
 			COMPATH %STAR_COMPATH%
 		}
@@ -740,22 +678,7 @@ unxlngi6
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13 
-		{
-			JAVA_HOME %JDK13PATH%
-			JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux
-			JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/linux
-			JDKLIB %JDK13PATH%/jre/lib:%JDK13PATH%/jre/lib/i386:%JDK13PATH%/jre/lib/i386/client
-			JDKLIBS -L%JDK13PATH%/jre/lib -L%JDK13PATH%/jre/lib/i386 -L%JDK13PATH%/jre/lib/i386/client
-			JDKPATH %JDK13PATH%/bin
-			JDK_VERSION 131
-			XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/lib/tools.jar
-		}
-		jdk13path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK13PATH %JDK_PATH%
-		}
-		jdk14 
+		jdk14
 		{
 			JAVA_HOME %JDK14PATH%
 			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux
@@ -770,7 +693,7 @@ unxlngi6
 		{
 			SOLAR_JDK14PATH %JDK_PATH%
 		}
-		jdk15 
+		jdk15
 		{
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
@@ -785,11 +708,7 @@ unxlngi6
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs 
-		{
-			*cvs %STAR_NATIVECVS%
-		}
-		ojdk16 
+		ojdk16
 		{
 			JAVA_HOME %OJDK16PATH%
 			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
@@ -804,14 +723,7 @@ unxlngi6
 		{
 			SOLAR_OJDK16PATH %JDK_PATH%
 		}
-		pre 
-		{
-			ILIB %PRE%/lib:%ILIB%
-			LIB %PRE%/lib:%LIB%
-			SOLARINC -I. -I%PRE%/inc %SOLARINC%
-			SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib
-		}
-		pro 
+		pro
 		{
 			PROSWITCH -DPRODUCT
 		}
@@ -820,48 +732,38 @@ unxlngi6
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
-		sysbaseroot 
+		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
 		}
 	}
-	extern 
+	extern
 	{
-		DIST_ROOT 
-		ENV_ROOT 
-		HOME 
-		JDK_PATH 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
-		SYSBASE_ROOT 
-		USER 
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
+		SYSBASE_ROOT
+		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs ca cap cax compath common2 pro common3:0 stl:0 stl:1 common jdk13 jdk14 jdk15 ojdk16 pre
-	reset 
+	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 cap cax compath common2 pro common3:0 common jdk14 jdk15 ojdk16
+	reset
 	{
-		CLASSPATH 
-		COPYALL 
+		CLASSPATH
+		COPYALL
 	}
-	restore 
+	restore
 	{
-		INCLUDE 
+		INCLUDE
 	}
-	script 
+	script
 	{
 		csh 
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			600: umask 002
 			800: rehash
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -869,10 +771,10 @@ unxlngi6
 			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
 			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
 		}
-		sh 
+		sh
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -890,81 +792,64 @@ unxlngi6
 			882: fi
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		cap
+		cax
 		compath STAR_COMPATH
-		debug 
-		distroot 
-		envroot 
-		jdk13 
-		jdk13path 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		debug
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
-		nativecvs STAR_NATIVECVS
-		ojdk16 
-		ojdk16path 
-		pre PRE
-		pro 
-		sourceroot 
-		stl 
-		sysbaseroot 
+		ojdk16
+		ojdk16path
+		pro
+		sourceroot
+		sysbaseroot
 	}
 }
-unxlngx6 
+unxlngx6
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
-		{
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-		}
-		cap 
+		cap
 		{
 			COPYALL TRUE
 			COPY_PACKED TRUE
 			DEVROOT %SOL_TMP%$/r
 			PCLEAN_PATH %SOLARROOT%/etools
 			PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
 			PCLEAN_PATH %SOL_TMP%$/r/etools
 			PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
 			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -988,22 +873,21 @@ unxlngx6
 			SOLAR_JAVA TRUE
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
 		}
-		common0 
+		common0
 		{
 			SOLAR_ENV_ROOT /so/env
 			SOLAR_SOURCE_ROOT %DRIVE_O%
 			SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux64_libc3.4.6/glibc3.4.6
 		}
-		common1 
+		common1
 		{
 			COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux64_libc3.4.6/
 			DEVROOT %SOLAR_ENV_ROOT%
 			PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin/perl
 			PKGFORMAT rpm
-			PTHREAD_CFLAGS -DNPTL
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
 			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
 			SOLARROOT %SOLAR_ENV_ROOT%
 			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
 			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
@@ -1011,11 +895,11 @@ unxlngx6
 			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_15.x64
 			SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-amd64
 			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%
+			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
 			USE_SYSTEM_STL YES
 			XAU_LIBS -lXau
 		}
-		common2 
+		common2
 		{
 			ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin
@@ -1053,7 +937,7 @@ unxlngx6
 		{
 			FORCE2ARCHIVE TRUE
 		}
-		compath 
+		compath
 		{
 			COMPATH %STAR_COMPATH%
 		}
@@ -1067,7 +951,7 @@ unxlngx6
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk14 
+		jdk14
 		{
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
@@ -1082,7 +966,7 @@ unxlngx6
 		{
 			SOLAR_JDK14PATH %JDK_PATH%
 		}
-		jdk15 
+		jdk15
 		{
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
@@ -1097,11 +981,7 @@ unxlngx6
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs 
-		{
-			*cvs %STAR_NATIVECVS%
-		}
-		ojdk16 
+		ojdk16
 		{
 			JAVA_HOME %OJDK16PATH%
 			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
@@ -1116,14 +996,7 @@ unxlngx6
 		{
 			SOLAR_OJDK16PATH %JDK_PATH%
 		}
-		pre 
-		{
-			ILIB %PRE%/lib:%ILIB%
-			LIB %PRE%/lib:%LIB%
-			SOLARINC -I. -I%PRE%/inc %SOLARINC%
-			SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib
-		}
-		pro 
+		pro
 		{
 			PROSWITCH -DPRODUCT
 		}
@@ -1132,48 +1005,38 @@ unxlngx6
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
-		sysbaseroot 
+		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
 		}
 	}
-	extern 
+	extern
 	{
-		DIST_ROOT 
-		ENV_ROOT 
-		HOME 
-		JDK_PATH 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
-		SYSBASE_ROOT 
-		USER 
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
+		SYSBASE_ROOT
+		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs ca cap cax compath common2  common3:0 pro stl:0 stl:1 common jdk14 jdk15 ojdk16 pre
-	reset 
+	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 cap cax compath common2  common3:0 pro common jdk14 jdk15 ojdk16
+	reset
 	{
-		CLASSPATH 
-		COPYALL 
+		CLASSPATH
+		COPYALL
 	}
-	restore 
+	restore
 	{
-		INCLUDE 
+		INCLUDE
 	}
-	script 
+	script
 	{
 		csh 
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			600: umask 002
 			800: rehash
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -1181,10 +1044,10 @@ unxlngx6
 			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
 			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
 		}
-		sh 
+		sh
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -1202,79 +1065,64 @@ unxlngx6
 			882: fi
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		cap
+		cax
 		compath STAR_COMPATH
-		debug 
-		distroot 
-		envroot 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		debug
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
-		nativecvs STAR_NATIVECVS
-		ojdk16 
-		ojdk16path 
-		pre PRE
-		pro 
-		sourceroot 
-		stl 
-		sysbaseroot 
+		ojdk16
+		ojdk16path
+		pro
+		sourceroot
+		sysbaseroot
 	}
 }
-unxmacxi 
+unxmacxi
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
-		{
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_macosx_intel$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-		}
-		cap 
+		cap
 		{
 			COPYALL TRUE
 			COPY_PACKED TRUE
 			DEVROOT %SOL_TMP%$/r
 			PCLEAN_PATH %SOLARROOT%/etools
 			PERL %SOL_TMP%$/r$/bt_macosx_intel$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
 			PCLEAN_PATH %SOL_TMP%$/r/etools
 			PERL %SOL_TMP%$/r$/bt_macosx_intel$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
 			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -1296,7 +1144,7 @@ unxmacxi
 			SOLAR_JAVA TRUE
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
 		}
-		common0 
+		common0
 		{
 			GXX_INCLUDE_PATH /so/env/gcc_4.0.1_macosx/usr/include/c++/4.0.0
 			SOLAR_ENV_ROOT /so/env
@@ -1304,7 +1152,7 @@ unxmacxi
 			SOLAR_SYSBASE_ROOT /so/env/gcc_4.0.1_macosx
             MACDEVSDK /so/env/gcc_4.0.1_macosx/MacOSX10.4u.sdk
 		}
-		common1 
+		common1
 		{
 			BUILD_OS_APPLEOSX TRUE
 			BUILD_OS_MAJOR 10
@@ -1326,17 +1174,16 @@ unxmacxi
 			OPENSSL_LIBS -lssl -lcrypto
 			PERL %SOLAR_ENV_ROOT%/bt_macosx_intel/%WORK_STAMP%/bin/perl
 			PKGFORMAT dmg
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
 			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
 			SOLARROOT %SOLAR_ENV_ROOT%
 			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
 			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/mac_jdk13_unknown
 			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/mac_jdk14_unknown
 			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/MacOSX_JDK_1.5.0_07.intel
 			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%
+			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
 			SYSTEM_CURL YES
 			SYSTEM_LIBXML YES
 			SYSTEM_LIBXSLT YES
@@ -1347,7 +1194,7 @@ unxmacxi
 			BUILD_PIXMAN YES
 			WITH_MOZILLA YES
 		}
-		common2 
+		common2
 		{
 			BUILD_TOOLS %SOLARROOT%/bt_macosx_intel/%WORK_STAMP%/bin
 			COM GCC
@@ -1374,7 +1221,7 @@ unxmacxi
 			TEMP /tmp
 			TMP /tmp
 		}
-		compath 
+		compath
 		{
 			COMPATH %STAR_COMPATH%
 		}
@@ -1388,22 +1235,7 @@ unxmacxi
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13 
-		{
-			JAVA_HOME %JDK13PATH%
-			JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux
-			JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/linux
-			JDKLIB %JDK13PATH%/jre/lib:%JDK13PATH%/jre/lib/i386:%JDK13PATH%/jre/lib/i386/client
-			JDKLIBS -L%JDK13PATH%/jre/lib -L%JDK13PATH%/jre/lib/i386 -L%JDK13PATH%/jre/lib/i386/client
-			JDKPATH %JDK13PATH%/bin
-			JDK_VERSION 131
-			XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/lib/tools.jar
-		}
-		jdk13path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK13PATH %JDK_PATH%
-		}
-		jdk14 
+		jdk14
 		{
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
@@ -1418,7 +1250,7 @@ unxmacxi
 		{
 			SOLAR_JDK14PATH %JDK_PATH%
 		}
-		jdk15 
+		jdk15
 		{
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
@@ -1433,18 +1265,7 @@ unxmacxi
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs 
-		{
-			*cvs %STAR_NATIVECVS%
-		}
-		pre 
-		{
-			ILIB %PRE%/lib:%ILIB%
-			LIB %PRE%/lib:%LIB%
-			SOLARINC -I. -I%PRE%/inc %SOLARINC%
-			SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib
-		}
-		pro 
+		pro
 		{
 			PROSWITCH -DPRODUCT
 		}
@@ -1453,48 +1274,38 @@ unxmacxi
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
-		sysbaseroot 
+		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
 		}
 	}
-	extern 
+	extern
 	{
-		DIST_ROOT 
-		ENV_ROOT 
-		HOME 
-		JDK_PATH 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
-		SYSBASE_ROOT 
-		USER 
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
+		SYSBASE_ROOT
+		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 distroot:0 nativecvs ca cap cax compath common2 pro stl:0 stl:1 common jdk13 jdk14 jdk15 pre
-	reset 
+	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 cap cax compath common2 pro common jdk14 jdk15
+	reset
 	{
-		CLASSPATH 
-		COPYALL 
+		CLASSPATH
+		COPYALL
 	}
-	restore 
+	restore
 	{
-		INCLUDE 
+		INCLUDE
 	}
-	script 
+	script
 	{
 		csh 
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			600: umask 002
 			800: rehash
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -1502,10 +1313,10 @@ unxmacxi
 			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
 			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
 		}
-		sh 
+		sh
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -1523,79 +1334,62 @@ unxmacxi
 			882: fi
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		cap
+		cax
 		compath STAR_COMPATH
-		debug 
-		distroot 
-		envroot 
-		jdk13 
-		jdk13path 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		debug
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
-		nativecvs STAR_NATIVECVS
-		pre PRE
-		pro 
-		sourceroot 
-		stl 
-		sysbaseroot 
+		pro
+		sourceroot
+		sysbaseroot
 	}
 }
-unxsoli4 
+unxsoli4
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
-		{
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_solaris_intel$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-		}
-		cap 
+		cap
 		{
 			COPYALL TRUE
 			COPY_PACKED TRUE
 			DEVROOT %SOL_TMP%$/r
 			PCLEAN_PATH %SOLARROOT%/etools
 			PERL %SOL_TMP%$/r$/bt_solaris_intel$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
 			PCLEAN_PATH %SOL_TMP%$/r/etools
 			PERL %SOL_TMP%$/r$/bt_solaris_intel$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
 			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -1614,24 +1408,24 @@ unxsoli4
 			SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
 			SOLAR_JAVA TRUE
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
-			__cdpath %DRIVE_O%/%WORK_STAMP%/src%UPDMINOREXT%
+			__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
 		}
-		common0 
+		common0
 		{
 			SOLAR_ENV_ROOT /so/env
 			SOLAR_SOURCE_ROOT %DRIVE_O%
 			SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_intel
 		}
-		common1 
+		common1
 		{
 			COMPATH /so/env/compilers/SUNWS12_p/intel/SUNWspro
 			DEVROOT %SOLAR_ENV_ROOT%
 			LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 			PERL %SOLAR_ENV_ROOT%/bt_solaris_intel/bin/perl
 			PKGFORMAT pkg
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
 			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
 			SOLARROOT %SOLAR_ENV_ROOT%
 			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
 			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
@@ -1640,9 +1434,9 @@ unxsoli4
 			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.5.0_06.intel
 			SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-solaris-i586
 			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%
+			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
 		}
-		common2 
+		common2
 		{
 			BUILD_TOOLS %SOLARROOT%/bt_solaris_intel/%WORK_STAMP%/bin
 			COM C52
@@ -1670,7 +1464,7 @@ unxsoli4
 			TEMP /var/tmp
 			TMP /var/tmp
 		}
-		compath 
+		compath
 		{
 			COMPATH %STAR_COMPATH%
 		}
@@ -1684,22 +1478,7 @@ unxsoli4
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13 
-		{
-			JAVA_HOME %JDK13PATH%
-			JDKINC %JDK13PATH%/include:%JDK13PATH%/include/solaris
-			JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/solaris
-			JDKLIB %JDK13PATH%/jre/lib/i386:%JDK13PATH%/lib:%JDK13PATH%/jre/lib/i386/native_threads:%JDK13PATH%/jre/plugin/i386:%JDK13PATH%/jre/lib/i386/motif21
-			JDKLIBS -L%JDK13PATH%/jre/lib/i386 -L%JDK13PATH%/lib -L%JDK13PATH%/jre/lib/i386/native_threads -L%JDK13PATH%/jre/plugin/i386 -L%JDK13PATH%/jre/plugin/i386 -L%JDK13PATH%/jre/lib/i386/motif21
-			JDKPATH %JDK13PATH%/bin
-			JDK_VERSION 131
-			XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/jre/lib/i18n.jar:%JDK13PATH%/lib/tools.jar:%JDK13PATH%/jre/lib/javaplugin.jar
-		}
-		jdk13path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK13PATH %JDK_PATH%
-		}
-		jdk14 
+		jdk14
 		{
 			JAVA_HOME %JDK14PATH%
 			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris
@@ -1714,7 +1493,7 @@ unxsoli4
 		{
 			SOLAR_JDK14PATH %JDK_PATH%
 		}
-		jdk15 
+		jdk15
 		{
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
@@ -1729,11 +1508,7 @@ unxsoli4
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs 
-		{
-			*cvs %STAR_NATIVECVS%
-		}
-		ojdk16 
+		ojdk16
 		{
 			JAVA_HOME %OJDK16PATH%
 			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris
@@ -1748,13 +1523,7 @@ unxsoli4
 		{
 			SOLAR_OJDK16PATH %JDK_PATH%
 		}
-		pre 
-		{
-			ILIB %PRE%/lib:%ILIB%
-			SOLARINC -I. -I%PRE%/inc %SOLARINC%
-			SOLARLIB -L%PRE%/lib %SOLARLIB%
-		}
-		pro 
+		pro
 		{
 			PROSWITCH -DPRODUCT
 		}
@@ -1763,43 +1532,33 @@ unxsoli4
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
-		sysbaseroot 
+		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
 		}
 	}
-	extern 
+	extern
 	{
-		DIST_ROOT 
-		ENV_ROOT 
-		HOME 
-		JDK_PATH 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
-		SYSBASE_ROOT 
-		USER 
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
+		SYSBASE_ROOT
+		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot ca cap cax compath nativecvs common2 pro stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre
-	reset 
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath common2 pro common jdk14 jdk15 ojdk16
+	reset
 	{
-		CLASSPATH 
+		CLASSPATH
 	}
-	script 
+	script
 	{
 		csh 
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			600: umask 002
 			800: rehash
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -1807,10 +1566,10 @@ unxsoli4
 			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
 			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
 		}
-		sh 
+		sh
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -1828,80 +1587,63 @@ unxsoli4
 			882: fi
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		cap
+		cax
 		compath STAR_COMPATH
-		distroot 
-		envroot 
-		jdk13 
-		jdk13path 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
-		nativecvs STAR_NATIVECVS
-		ojdk16 
-		ojdk16path 
-		pre PRE
-		pro 
-		sourceroot 
-		stl 
-		sysbaseroot 
+		ojdk16
+		ojdk16path
+		pro
+		sourceroot
+		sysbaseroot
 	}
 }
-unxsols4 
+unxsols4
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
-		{
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-		}
-		cap 
+		cap
 		{
 			COPYALL TRUE
 			COPY_PACKED TRUE
 			DEVROOT %SOL_TMP%$/r
 			PCLEAN_PATH %SOLARROOT%/etools
 			PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
 			PCLEAN_PATH %SOL_TMP%$/r/etools
 			PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
 			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -1920,25 +1662,25 @@ unxsols4
 			SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
 			SOLAR_JAVA TRUE
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
-			__cdpath %DRIVE_O%/%WORK_STAMP%/src%UPDMINOREXT%
+			__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
 		}
-		common0 
+		common0
 		{
 			SOLAR_ENV_ROOT /so/env
 			SOLAR_LICENSE_FILE /opt/SUNWspro/license_dir/sunpro.lic,1
 			SOLAR_SOURCE_ROOT %DRIVE_O%
 			SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc
 		}
-		common1 
+		common1
 		{
 			COMPATH /so/env/compilers/SUNWS12_p/sparc/SUNWspro
 			DEVROOT %SOLAR_ENV_ROOT%
 			LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 			PERL %SOLAR_ENV_ROOT%/bt_solaris_sparc/bin/perl
 			PKGFORMAT pkg
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
 			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
 			SOLARROOT %SOLAR_ENV_ROOT%
 			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
 			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
@@ -1947,9 +1689,9 @@ unxsols4
 			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.5.0_06.sparc
 			SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-solaris-sparc
 			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%
+			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
 		}
-		common2 
+		common2
 		{
 			BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin
 			COM C52
@@ -1983,7 +1725,7 @@ unxsols4
 			TEMP /tmp
 			TMP /tmp
 		}
-		compath 
+		compath
 		{
 			COMPATH %STAR_COMPATH%
 		}
@@ -1997,22 +1739,7 @@ unxsols4
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13 
-		{
-			JAVA_HOME %JDK13PATH%
-			JDKINC %JDK13PATH%/include:%JDK13PATH%/include/solaris
-			JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/solaris
-			JDKLIB %JDK13PATH%/jre/lib/sparc:%JDK13PATH%/lib:%JDK13PATH%/jre/lib/sparc/native_threads:%JDK13PATH%/jre/plugin/sparc:%JDK13PATH%/jre/lib/sparc/motif21
-			JDKLIBS -L%JDK13PATH%/jre/lib/sparc -L%JDK13PATH%/lib -L%JDK13PATH%/jre/lib/sparc/native_threads -L%JDK13PATH%/jre/plugin/sparc -L%JDK13PATH%/jre/plugin/sparc -L%JDK13PATH%/jre/lib/sparc/motif21
-			JDKPATH %JDK13PATH%/bin
-			JDK_VERSION 131
-			XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/jre/lib/i18n.jar:%JDK13PATH%/lib/tools.jar:%JDK13PATH%/jre/lib/javaplugin.jar
-		}
-		jdk13path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK13PATH %JDK_PATH%
-		}
-		jdk14 
+		jdk14
 		{
 			JAVA_HOME %JDK14PATH%
 			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris
@@ -2027,7 +1754,7 @@ unxsols4
 		{
 			SOLAR_JDK14PATH %JDK_PATH%
 		}
-		jdk15 
+		jdk15
 		{
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
@@ -2042,11 +1769,7 @@ unxsols4
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs 
-		{
-			*cvs %STAR_NATIVECVS%
-		}
-		ojdk16 
+		ojdk16
 		{
 			JAVA_HOME %OJDK16PATH%
 			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris
@@ -2061,13 +1784,7 @@ unxsols4
 		{
 			SOLAR_OJDK16PATH %JDK_PATH%
 		}
-		pre 
-		{
-			ILIB %PRE%/lib:%ILIB%
-			SOLARINC -I. -I%PRE%/inc %SOLARINC%
-			SOLARLIB -L%PRE%/lib %SOLARLIB%
-		}
-		pro 
+		pro
 		{
 			PROSWITCH -DPRODUCT
 		}
@@ -2076,44 +1793,34 @@ unxsols4
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
-		sysbaseroot 
+		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
 		}
 	}
-	extern 
+	extern
 	{
-		DIST_ROOT 
-		ENV_ROOT 
-		HOME 
-		JDK_PATH 
-		LM_LICENSE_FILE 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
-		SYSBASE_ROOT 
-		USER 
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		LM_LICENSE_FILE
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
+		SYSBASE_ROOT
+		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0  sysbaseroot ca cap cax compath nativecvs common2 common:3 pro stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre
-	reset 
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0  sysbaseroot cap cax compath common2 common:3 pro common jdk14 jdk15 ojdk16
+	reset
 	{
-		CLASSPATH 
+		CLASSPATH
 	}
-	script 
+	script
 	{
 		csh 
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			600: umask 002
 			800: rehash
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -2121,10 +1828,10 @@ unxsols4
 			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
 			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
 		}
-		sh 
+		sh
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -2142,80 +1849,63 @@ unxsols4
 			882: fi
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		cap
+		cax
 		compath STAR_COMPATH
-		distroot 
-		envroot 
-		jdk13 
-		jdk13path 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
-		nativecvs STAR_NATIVECVS
-		ojdk16 
-		ojdk16path 
-		pre PRE
-		pro 
-		sourceroot 
-		stl 
-		sysbaseroot 
+		ojdk16
+		ojdk16path
+		pro
+		sourceroot
+		sysbaseroot
 	}
 }
-unxsolu4 
+unxsolu4
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
-		{
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-		}
-		cap 
+		cap
 		{
 			COPYALL TRUE
 			COPY_PACKED TRUE
 			DEVROOT %SOL_TMP%$/r
 			PCLEAN_PATH %SOLARROOT%/etools
 			PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
 			PCLEAN_PATH %SOL_TMP%$/r/etools
 			PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
 			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -2228,7 +1918,7 @@ unxsolu4
 			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
 			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
 			DMAKEROOT %SOLARENV%/inc/startup
-			ENABLE_GNOMEVFS 
+			ENABLE_GNOMEVFS
 			FREETYPE_CFLAGS -I%SYSBASE%/usr/sfw/include -I%SYSBASE%/usr/sfw/include/freetype2
 			FREETYPE_LIBS -L%SYSBASE%/usr/sfw/lib/sparcv9 -lfreetype
 			LIBXML_CFLAGS -I%SYSBASE%/usr/include/libxml2
@@ -2244,32 +1934,32 @@ unxsolu4
 			SYSTEM_LIBXML YES
 			SYSTEM_LIBXSLT YES
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
-			__cdpath %DRIVE_O%/%WORK_STAMP%/src%UPDMINOREXT%
+			__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
 		}
-		common0 
+		common0
 		{
 			SOLAR_ENV_ROOT /so/env
 			SOLAR_SOURCE_ROOT %DRIVE_O%
 			SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc
 		}
-		common1 
+		common1
 		{
 			COMPATH /so/env/compilers/SUNWS12m1/sparc/SUNWspro
 			DEVROOT %SOLAR_ENV_ROOT%
 			PERL %SOLAR_ENV_ROOT%/bt_solaris_sparc/bin/perl
 			PKGFORMAT pkg
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
 			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
 			SOLARROOT %SOLAR_ENV_ROOT%
 			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
 			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
 			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.5.0_15.sparc
 			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%
+			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
 			USE_SYSTEM_STL YES
 		}
-		common2 
+		common2
 		{
 			BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin
 			COM C52
@@ -2298,7 +1988,7 @@ unxsolu4
 			TEMP /tmp
 			TMP /tmp
 		}
-		compath 
+		compath
 		{
 			COMPATH %STAR_COMPATH%
 		}
@@ -2312,7 +2002,7 @@ unxsolu4
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk15 
+		jdk15
 		{
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
@@ -2327,17 +2017,7 @@ unxsolu4
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs 
-		{
-			*cvs %STAR_NATIVECVS%
-		}
-		pre 
-		{
-			ILIB %PRE%/lib:%ILIB%
-			SOLARINC -I. -I%PRE%/inc %SOLARINC%
-			SOLARLIB -L%PRE%/lib %SOLARLIB%
-		}
-		pro 
+		pro
 		{
 			PROSWITCH -DPRODUCT
 		}
@@ -2346,44 +2026,34 @@ unxsolu4
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
-		sysbaseroot 
+		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
 		}
 	}
-	extern 
+	extern
 	{
-		DIST_ROOT 
-		ENV_ROOT 
-		HOME 
-		JDK_PATH 
-		LM_LICENSE_FILE 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
-		SYSBASE_ROOT 
-		USER 
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		LM_LICENSE_FILE
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
+		SYSBASE_ROOT
+		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk15path:0 sysbaseroot ca cap cax compath nativecvs common2 common:3 pro stl:1 stl:0 common jdk15 pre
-	reset 
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk15path:0 sysbaseroot cap cax compath common2 common:3 pro common jdk15
+	reset
 	{
-		CLASSPATH 
+		CLASSPATH
 	}
-	script 
+	script
 	{
-		csh 
+		csh
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			600: umask 002
 			800: rehash
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -2391,10 +2061,10 @@ unxsolu4
 			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
 			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
 		}
-		sh 
+		sh
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -2412,74 +2082,59 @@ unxsolu4
 			882: fi
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		cap
+		cax
 		compath STAR_COMPATH
-		distroot 
-		envroot 
-		jdk15 
-		jdk15path 
+		distroot
+		envroot
+		jdk15
+		jdk15path
 		l10n L10N_framework
-		nativecvs STAR_NATIVECVS
-		pre PRE
-		pro 
-		sourceroot 
-		stl 
-		sysbaseroot 
+		pro
+		sourceroot
+		sysbaseroot
 	}
 }
-unxubti8 
+unxubti8
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
-		{
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-		}
-		cap 
+		cap
 		{
 			COPYALL TRUE
 			COPY_PACKED TRUE
 			DEVROOT %SOL_TMP%$/r
 			PCLEAN_PATH %SOLARROOT%/etools
 			PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
 			PCLEAN_PATH %SOL_TMP%$/r/etools
 			PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
 			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -2500,12 +2155,12 @@ unxubti8
 			SOLAR_JAVA TRUE
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
 		}
-		common0 
+		common0
 		{
 			SOLAR_ENV_ROOT /so/env
 			SOLAR_SOURCE_ROOT %DRIVE_O%
 		}
-		common1 
+		common1
 		{
 			AGG_VERSION 2300
 			ANT /usr/share/ant/bin/ant
@@ -2529,15 +2184,14 @@ unxubti8
 			PAM_LINK NO
 			PERL /usr/bin/perl
 			PKGFORMAT deb
-			PTHREAD_CFLAGS -DNPTL
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
 			SOLARROOT %SOLAR_ENV_ROOT%
 			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
 			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
 			SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-i586
 			SOLAR_PLUGIN TRUE
 			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%
+			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
 			USE_SHELL tcsh
 			VBA_EXTENSION NO
 			WITH_LANG en-US de
@@ -2546,7 +2200,7 @@ unxubti8
 			XINERAMA_LINK dynamic
 			ZIPDEP zipdep.pl
 		}
-		common2 
+		common2
 		{
 			ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin
@@ -2569,11 +2223,11 @@ unxubti8
 			TEMP /tmp
 			TMP /tmp
 		}
-		compath 
+		compath
 		{
 			COMPATH /usr/bin
 		}
-		debug 
+		debug
 		{
 			LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH%
 		}
@@ -2586,7 +2240,7 @@ unxubti8
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk15 
+		jdk15
 		{
 			JAVA_HOME %OJDK16PATH%
 			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
@@ -2600,11 +2254,7 @@ unxubti8
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs 
-		{
-			*cvs %STAR_NATIVECVS%
-		}
-		ojdk16 
+		ojdk16
 		{
 			JAVA_HOME %OJDK16PATH%
 			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
@@ -2618,17 +2268,11 @@ unxubti8
 		{
 			SOLAR_OJDK16PATH %JDK_PATH%
 		}
-		pre 
-		{
-			LD_LIBRARY_PATH %PRE%/lib:%LD_LIBRARY_PATH%
-			SOLARINC -I. -I%PRE%/inc %SOLARINC%
-			SOLARLIB -L../lib -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib
-		}
-		pro 
+		pro
 		{
 			PROSWITCH -DPRODUCT
 		}
-		shell 
+		shell
 		{
 			USE_SHELL STAR_USE_SHELL
 		}
@@ -2637,135 +2281,109 @@ unxubti8
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
 	}
-	extern 
+	extern
 	{
-		DIST_ROOT 
-		ENV_ROOT 
-		HOME 
-		JDK_PATH 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
-		USER 
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
+		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 ojdk16path:0 distroot:0 nativecvs ca cap cax compath common2 pro stl:0 stl:1 common jdk15 ojdk16 debug pre
-	reset 
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 ojdk16path:0 distroot:0 cap cax compath common2 pro common jdk15 ojdk16 debug
+	reset
 	{
-		CLASSPATH 
-		COPYALL 
-		ENABLE_CRASHDUMP 
+		CLASSPATH
+		COPYALL
+		ENABLE_CRASHDUMP
 	}
-	restore 
+	restore
 	{
-		INCLUDE 
+		INCLUDE
 	}
-	script 
+	script
 	{
-		csh 
+		csh
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			600: umask 002
 			800: rehash
 		}
-		sh 
+		sh
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			415: fi
 			600: umask 002
 			800: hash -r
 			882: fi
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
-		debug 
-		distroot 
-		envroot 
-		jdk15 
+		bsclient
+		cap
+		cax
+		debug
+		distroot
+		envroot
+		jdk15
 		l10n L10N_framework
-		nativecvs STAR_NATIVECVS
-		ojdk16 
-		ojdk16path 
-		pre PRE
-		pro 
-		sourceroot 
+		ojdk16
+		ojdk16path
+		pro
+		sourceroot
 	}
 }
-wntgcci1 
+wntgcci1
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
-		{
-			COMPATH %SOL_TMP%$/r$/MinGW
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
-			PCLEAN_PATH %SOLARROOT%$/etw
-			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
-			PSDK %SOL_TMP%$/r$/MinGW$/w32api
-			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc7net$/Common7$/ide
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-		}
-		cap 
+		cap
 		{
 			COMPATH %SOL_TMP%$/r$/MinGW
 			COPYALL TRUE
 			COPY_PACKED TRUE
 			DEVROOT %SOL_TMP%$/r
 			FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
+			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
 			PCLEAN_PATH %SOLARROOT%$/etw
 			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
 			PSDK %SOL_TMP%$/r$/MinGW$/w32api
 			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc7net$/Common7$/ide
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COMPATH %SOL_TMP%$/r$/MinGW
 			COPYALL FALSE
 			FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
+			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
 			PCLEAN_PATH %SOL_TMP%$/r$/etw
 			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
 			PSDK %SOL_TMP%$/r$/MinGW$/w32api
 			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc7net$/Common7$/ide
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
 			*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
@@ -2777,7 +2395,7 @@ wntgcci1
 			*r cd %SOLARROOT%
 			*s cd %SOLARVERSION%
 			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
-			BIG_SVX 
+			BIG_SVX
 			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
 			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
 			DMAKEROOT %SOLARENV%$/inc$/startup
@@ -2794,13 +2412,13 @@ wntgcci1
 			XCLASSPATH .
 			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
 		}
-		common0 
+		common0
 		{
 			SOLAR_ENV_ROOT r:
 			SOLAR_SOURCE_ROOT o:
 			USE_SHELL bash
 		}
-		common1 
+		common1
 		{
 			COMPATH %SOLAR_ENV_ROOT%$/MinGW
 			#			FSDK %SOLAR_ENV_ROOT%$/msvc7net$/FrameworkSDK
@@ -2810,21 +2428,21 @@ wntgcci1
 			PKGFORMAT some_dummy
 			PSDK %SOLAR_ENV_ROOT%$/MinGW$/w32api
 			SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc7net$/Common7$/ide
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOLAR_ENV_ROOT%
 			SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
 			SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
 			SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT%
+			SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
 		}
-		common2 
+		common2
 		{
 			ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP%
 			CALL_CDECL TRUE
-			CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:o:$/%WORK_STAMP%$/src%UPDMINOREXT%
+			CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:o:$/%WORK_STAMP%$/ooo%UPDMINOREXT%
 			COM GCC
 			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
 			COMMON_ENV_TOOLS %SOLARROOT%$/etools
@@ -2848,7 +2466,7 @@ wntgcci1
 			SORT sort -T %TMP%
 			use_shl_versions TRUE
 		}
-		compath 
+		compath
 		{
 			COMPATH %STAR_COMPATH%
 		}
@@ -2862,26 +2480,7 @@ wntgcci1
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13 
-		{
-			HOMEDRIVE %DEVROOT%
-			HOMEPATH $/jdk131
-			JAVAHOME %JDK13PATH%
-			JAVA_HOME %JDK13PATH%
-			JDKINC %JDK13PATH%$/include$:%JDK13PATH%$/include$/win32
-			JDKINCS -I%JDK13PATH%$/include -I%JDK13PATH%$/include$/win32
-			JDKLIB %JDK13PATH%$/lib
-			JDKLIBS %JDK13PATH%$/lib
-			JDKPATH %JDK13PATH%$/bin
-			JDK_VERSION 131
-			JREPATH %JDK13PATH%$/jre$/bin$/hotspot
-			XCLASSPATH .$:%JDK13PATH%$/jre$/lib$/rt.jar$:%JDK13PATH%$/lib$/tools.jar
-		}
-		jdk13path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK13PATH %JDK_PATH%
-		}
-		jdk14 
+		jdk14
 		{
 			HOMEDRIVE %DEVROOT%
 			HOMEPATH $/jdk141
@@ -2900,7 +2499,7 @@ wntgcci1
 		{
 			SOLAR_JDK14PATH %JDK_PATH%
 		}
-		jdk15 
+		jdk15
 		{
 			HOMEDRIVE %DEVROOT%
 			HOMEPATH $/jdk151
@@ -2919,16 +2518,11 @@ wntgcci1
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		pre 
-		{
-			ILIB %PRE%$/lib$:%ILIB%
-			LIB %PRE%$/lib$:%LIB%
-		}
-		psdk 
+		psdk
 		{
 			PSDK %STAR_PSDK%
 		}
-		shell 
+		shell
 		{
 			USE_SHELL STAR_USE_SHELL
 		}
@@ -2937,42 +2531,32 @@ wntgcci1
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
 	}
-	extern 
+	extern
 	{
-		COMSPEC 
-		DIST_ROOT 
-		ENV_ROOT 
-		JDK_PATH 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
+		COMSPEC
+		DIST_ROOT
+		ENV_ROOT
+		JDK_PATH
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 ca cap cax psdk compath common2 jdk13path:0 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 pre
-	reset 
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 common jdk14 jdk15
+	reset
 	{
-		COPYALL 
-		NSIS_PATH 
-		SOLAR_ENV_ROOT 
-		WST 
+		COPYALL
+		NSIS_PATH
+		SOLAR_ENV_ROOT
+		WST
 	}
-	script 
+	script
 	{
-		csh 
+		csh
 		{
 			150: setenv MYENV_PATH $PATH
 			160: setenv PATH $SSX_PATH
-			200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+			200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			260: setenv PATH $MYENV_PATH
 			270: unsetenv MYENV_PATH
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -2980,14 +2564,14 @@ wntgcci1
 			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
 			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
 		}
-		sh 
+		sh
 		{
 			150: export MYENV_PATH=$PATH
 			160: export PATH=$SSX_PATH
 			260: export PATH=$MYENV_PATH
 			270: unset MYENV_PATH
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+			410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			415: fi
 			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
 			851: export SO_GEN_ERROR
@@ -3003,59 +2587,37 @@ wntgcci1
 			882: fi
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		cap
+		cax
 		compath STAR_COMPATH
-		distroot 
-		envroot 
-		jdk13 
-		jdk13path 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
-		pre PRE
-		pro 
+		pro
 		psdk STAR_PSDK
 		shell STAR_USE_SHELL
-		sourceroot 
-		stl 
+		sourceroot
 	}
 }
-wntmsci11 
+wntmsci11
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
-		{
-			COMPATH %SOL_TMP%$/r$/msvc8p
-			COMPROOT %SOL_TMP%$/r$/msvc8p
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			DSDK %SOL_TMP%$/r$/msvc8p$/DirectXSDK
-			FSDK %SOL_TMP%$/r$/msvc8p$/Sdk$/v2.0
-			PCLEAN_PATH %SOLARROOT%$/etw
-			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
-			PSDK %SOL_TMP%$/r$/msvc8p$/PlatformSDK
-			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc8p$/Common7$/ide
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-		}
-		cap 
+		cap
 		{
 			COMPATH %SOL_TMP%$/r$/msvc8p
 			COMPROOT %SOL_TMP%$/r$/msvc8p
@@ -3068,13 +2630,13 @@ wntmsci11
 			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
 			PSDK %SOL_TMP%$/r$/msvc8p$/PlatformSDK
 			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc8p$/Common7$/ide
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COMPATH %SOL_TMP%$/r$/msvc8p
 			COMPROOT %SOL_TMP%$/r$/msvc8p
@@ -3085,13 +2647,13 @@ wntmsci11
 			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
 			PSDK %COMPATH%$/PlatformSDK
 			SHARED_COM_SDK_PATH %COMPATH%$/Common7$/ide
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
 			*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
@@ -3103,7 +2665,7 @@ wntmsci11
 			*r cdd %SOLARROOT%
 			*s cdd %SOLARVERSION%
 			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
-			BIG_SVX 
+			BIG_SVX
 			BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison
 			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
 			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
@@ -3126,14 +2688,14 @@ wntmsci11
 			XCLASSPATH .
 			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
 		}
-		common0 
+		common0
 		{
 			BS_ROOT n:
 			SOLAR_ENV_ROOT r:
 			SOLAR_SOURCE_ROOT o:
 			USE_SHELL 4nt
 		}
-		common1 
+		common1
 		{
 			COMPATH %SOLAR_ENV_ROOT%$/msvc8p
 			COMPROOT %SOLAR_ENV_ROOT%$/msvc8p
@@ -3143,21 +2705,21 @@ wntmsci11
 			PERL %SOLAR_ENV_ROOT%$/btw$/perl$/bin$/perl
 			PSDK %SOLAR_ENV_ROOT%$/msvc8p$/PlatformSDK
 			SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc8p$/Common7$/ide
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOLAR_ENV_ROOT%
 			SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
 			SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
 			SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT%
+			SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
 		}
-		common2 
+		common2
 		{
 			ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP%
 			CALL_CDECL TRUE
-			CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:o:$/%WORK_STAMP%$/src%UPDMINOREXT%
+			CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:o:$/%WORK_STAMP%$/ooo%UPDMINOREXT%
 			COM MSC
 			COMEX 11
 			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
@@ -3184,7 +2746,7 @@ wntmsci11
 			SORT sort -T %TMP%
 			use_shl_versions TRUE
 		}
-		compath 
+		compath
 		{
 			COMPATH %STAR_COMPATH%
 		}
@@ -3198,26 +2760,7 @@ wntmsci11
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13 
-		{
-			HOMEDRIVE %DEVROOT%
-			HOMEPATH $/jdk131
-			JAVAHOME %JDK13PATH%
-			JAVA_HOME %JDK13PATH%
-			JDKINC %JDK13PATH%$/include$:%JDK13PATH%$/include$/win32
-			JDKINCS -I%JDK13PATH%$/include -I%JDK13PATH%$/include$/win32
-			JDKLIB %JDK13PATH%$/lib
-			JDKLIBS %JDK13PATH%$/lib
-			JDKPATH %JDK13PATH%$/bin
-			JDK_VERSION 131
-			JREPATH %JDK13PATH%$/jre$/bin$/hotspot
-			XCLASSPATH .$:%JDK13PATH%$/jre$/lib$/rt.jar$:%JDK13PATH%$/lib$/tools.jar
-		}
-		jdk13path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK13PATH %JDK_PATH%
-		}
-		jdk14 
+		jdk14
 		{
 			HOMEDRIVE %DEVROOT%
 			HOMEPATH $/jdk141
@@ -3236,7 +2779,7 @@ wntmsci11
 		{
 			SOLAR_JDK14PATH %JDK_PATH%
 		}
-		jdk15 
+		jdk15
 		{
 			HOMEDRIVE %DEVROOT%
 			HOMEPATH $/jdk151
@@ -3255,16 +2798,11 @@ wntmsci11
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		pre 
-		{
-			ILIB %PRE%$/lib$:%ILIB%
-			LIB %PRE%$/lib$:%LIB%
-		}
-		psdk 
+		psdk
 		{
 			PSDK %STAR_PSDK%
 		}
-		shell 
+		shell
 		{
 			use_shell STAR_USE_SHELL
 		}
@@ -3273,105 +2811,411 @@ wntmsci11
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
 	}
-	extern 
+	extern
 	{
-		COMSPEC 
-		DIST_ROOT 
-		ENV_ROOT 
-		JDK_PATH 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
+		COMSPEC
+		DIST_ROOT
+		ENV_ROOT
+		JDK_PATH
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 ca cap cax psdk compath common2 jdk13path:0 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 pre
-	reset 
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 common jdk14 jdk15
+	reset
 	{
-		COPYALL 
-		SOLAR_ENV_ROOT 
-		WST 
+		COPYALL
+		SOLAR_ENV_ROOT
+		WST
 	}
-	script 
+	script
 	{
-		post 
+		post
 		{
 			150: set MYENV_PATH=%PATH
 			160: set PATH=%SSX_PATH
-			200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET%
+			200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %BTARGET% $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			260: set PATH=%MYENV_PATH
 			270: unset MYENV_PATH
 			400: if "%SO_GEN_ERROR%" NE "" @echo %SO_GEN_ERROR%
 			401: if "%SO_GEN_ERROR2%" NE "" echo %SO_GEN_ERROR2%
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		cap
+		cax
 		compath STAR_COMPATH
-		distroot 
-		envroot 
-		jdk13 
-		jdk13path 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
-		pre PRE
-		pro 
+		pro
 		psdk STAR_PSDK
 		shell STAR_USE_SHELL
-		sourceroot 
-		stl 
+		sourceroot
 	}
 }
-wntmsci12 
+wntmsci12
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
 			SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
+		cap
 		{
 			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
 			COMPATH %SOL_TMP%$/r$/msvc9p
 			COMPROOT %SOL_TMP%$/r$/msvc9p
 			COPYALL TRUE
+			COPY_PACKED TRUE
 			DEVROOT %SOL_TMP%$/r
 			DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK
 			ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
 			FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
 			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
 			PCLEAN_PATH %SOLARROOT%$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
 			PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1
 			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 #			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
 
 		}
-		cap 
+		cax
+		{
+			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
+			COMPATH %SOL_TMP%$/r$/msvc9p
+			COMPROOT %SOL_TMP%$/r$/msvc9p
+			COPYALL FALSE
+			DSDK %COMPATH%$/DirectXSDK
+			ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
+			FSDK %COMPATH%$/Sdk$/v3.5
+			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
+			PCLEAN_PATH %SOL_TMP%$/r$/etw
+			PERL %SOL_TMP%$/r$/%PERLDIR%
+			PSDK %COMPATH%$/PlatformSDK$/V6.1
+			SHARED_COM_SDK_PATH %COMPATH%$/Common7$/IDE
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOL_TMP%$/r
+			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+#			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
+		}
+		common
+		{
+			*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
+			*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
+			*copyprj %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
+			*deliver %PERL% %SOLARENV%$/bin$/deliver.pl
+			*mkout %PERL% %SOLARENV%$/bin$/mkout.pl
+			*mwscommit %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
+			*o cd %SOLARENV%$/..
+			*r cd %SOLARROOT%
+			*s cd %SOLARVERSION%
+			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
+			*z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
+			BIG_SVX
+			BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison
+			COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
+			CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
+			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
+			DMAKEROOT %SOLARENV%$/inc$/startup
+			ENABLE_PCH TRUE
+			ILIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86
+			JDK13PATH %SOLAR_JDK13PATH%
+			JDK14PATH %SOLAR_JDK14PATH%
+			JDK15PATH %SOLAR_JDK15PATH%
+			LIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86;%SOLAR_STLLIBPATH%
+			LIBMGR_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/lib.exe
+			LINK_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/link.exe
+			MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
+			MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
+			OJDK16PATH %SOLAR_OJDK16PATH%
+			PATH $cp(%PSDK%$/bin)$:%PATH%$:$cp(%SHARED_COM_SDK_PATH%)$:$cp(%COMPATH%$/bin)$:$cp(%FSDK%)$:$cp(%F20SDK%)$/bin$:$cp(%DSDK%$/Utilities$/bin$/x86)$:$cp(%PACKMS%)
+			PROF_EDITION TRUE
+			PSDKINC -I%PSDK%$/include
+			SOLAREXTRAINC -I%DSDK%$/include
+			SOLAR_JAVA TRUE
+			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
+			BUILD_X64 TRUE
+		}
+		common0
+		{
+			BS_ROOT n:
+			SOLAR_ENV_ROOT r:
+			SOLAR_SOURCE_ROOT o:
+			USE_SHELL bash
+			STAR_USE_SHELL bash
+			BTOOLDIR %WORK_STAMP%$/cygtools
+			PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl
+		}
+		common02
+		{
+			PERL perl
+		}
+		common1
+		{
+			COMPATH %SOLAR_ENV_ROOT%$/msvc9p
+			COMPROOT %SOLAR_ENV_ROOT%$/msvc9p
+			DEVROOT %SOLAR_ENV_ROOT%
+			DSDK %SOLAR_ENV_ROOT%$/msvc9p$/DirectXSDK
+			FSDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v3.5
+			F20SDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v2.0
+			NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
+			PERL %SOLAR_ENV_ROOT%$/%PERLDIR%
+			PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/V6.1
+			SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide
+			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+			SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOLAR_ENV_ROOT%
+			SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+			SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+			SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
+			SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+#			TEMP $dp(%TEMP%)
+#			TMP $dp(%TMP%)
+		}
+		common2
+		{
+			ENABLE_GRAPHITE TRUE
+            BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR%
+			CALL_CDECL TRUE
+			CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:$cp(%SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%)
+			COM MSC
+			COMEX 12
+			COMMON_BUILD_TOOLS $cp(%SOLARROOT%$/btools)
+			COMMON_ENV_TOOLS %SOLARROOT%$/etools
+			COMP_ENV wntmsci12
+			CPU I
+			CPUNAME INTEL
+			CVER M1500
+			DYNAMIC_CRT TRUE
+			ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
+			GUI WNT
+			GUIBASE WIN
+			GVER NT351
+			INPATH wntmsci12%PROEXT%
+			MOZILLABUILD %SOLARROOT%/mozilla-build-1.3
+			OS WNT
+			OUTPATH wntmsci12
+			PACKMS %SO_PACK%$/wntmsci12$/MS
+			SET_EXEPTIONS TRUE
+			SHIPDRIVE %SOLAR_ENV_ROOT%$/ship$/install
+			SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
+			SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
+			SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
+			SOLAR_OJDK16PATH %SOLARROOT%$/openjdk-6-b08-windows-i586
+			SOLAR_STLPATH %SOLARVERSION%$/wntmsci12%PROEXT%$/inc%UPDMINOREXT%$/stl
+			SORT sort -T %TMP%
+#			TOUCH %SOLARROOT%$/btw$/%BTOOLDIR%$/touch.exe
+			use_shl_versions TRUE
+		}
+		common:3 IF %UPDATER% == YES
+		{
+			SHIPDRIVE %BS_ROOT%$/ship$/install
+		}
+		compath
+		{
+			COMPATH $dp(%STAR_COMPATH%)
+		}
+		distroot:0 if X%DIST_ROOT%X != XX
+		{
+			SHARED_SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
+			SOLARVER $dp(%DIST_ROOT%$/%WORK_STAMP%)
+			SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
+		}
+		envroot:0 IF X%ENV_ROOT%X != XX
+		{
+			SOLAR_ENV_ROOT $dp(%ENV_ROOT%)
+		}
+		jdk14
+		{
+#			HOMEDRIVE %DEVROOT%
+#			HOMEPATH $/jdk141
+			JAVAHOME %JDK14PATH%
+			JAVA_HOME %JDK14PATH%
+			JDKINC %JDK14PATH%$/include$/win32;%JDK14PATH%$/include
+			JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
+			JDKLIB %JDK14PATH%$/lib
+			JDKLIBS %JDK14PATH%$/lib
+			JDKPATH %JDK14PATH%$/bin
+			JDK_VERSION 142
+			JREPATH %JDK14PATH%$/jre$/bin$/client
+			XCLASSPATH .;%JDK14PATH%$/jre$/lib$/rt.jar
+		}
+		jdk14path:0 if X%JDK_PATH%X != XX
+		{
+			SOLAR_JDK14PATH $dp(%JDK_PATH%)
+		}
+		jdk15
+		{
+#			HOMEDRIVE %DEVROOT%
+#			HOMEPATH $/jdk151
+			JAVAHOME %JDK15PATH%
+			JAVA_HOME %JDK15PATH%
+			JDKINC %JDK15PATH%$/include$/win32;%JDK15PATH%$/include
+			JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
+			JDKLIB %JDK15PATH%$/lib
+			JDKLIBS %JDK15PATH%$/lib
+			JDKPATH %JDK15PATH%$/bin
+			JDK_VERSION 150
+			JREPATH %JDK15PATH%$/jre$/bin$/client
+			XCLASSPATH .;%JDK15PATH%$/jre$/lib$/rt.jar
+		}
+		jdk15path:0 if X%JDK_PATH%X != XX
+		{
+			SOLAR_JDK15PATH $dp(%JDK_PATH%)
+		}
+		ojdk16
+		{
+#			HOMEDRIVE %DEVROOT%
+#			HOMEPATH $/openjdk-6-b08-windows-i586
+			JAVA_HOME %OJDK16PATH%
+			JDKINC %OJDK16PATH%$/include$/win32;%OJDK16PATH%$/include
+			JDKINCS -I%OJDK16PATH%$/include -I%OJDK16PATH%$/include$/win32
+			JDKLIB %OJDK16PATH%$/lib
+			JDKLIBS %OJDK16PATH%$/lib
+			JDKPATH %OJDK16PATH%$/bin
+			JDK_VERSION 160
+			JREPATH %OJDK16PATH%$/jre$/bin$/client
+			XCLASSPATH .;%OJDK16PATH%$/jre$/lib$/rt.jar
+		}
+		ojdk16path:0 if X%JDK_PATH%X != XX
+		{
+			SOLAR_OJDK16PATH $dp(%JDK_PATH%)
+		}
+		pro
+		{
+			RES_ENUS TRUE
+		}
+		psdk
+		{
+			PSDK $dp(%STAR_PSDK%)
+		}
+		sourceroot:0 if X%SOURCE_ROOT%X != XX
+		{
+			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%)
+			SOURCE_ROOT_USED TRUE
+		}
+		tmp
+		{
+			SOL_TMP $dp(%SOL_TMP_DIR%)
+		}
+	}
+	extern
+	{
+		COMSPEC
+		DIST_ROOT
+		ENV_ROOT
+		JDK_PATH
+		LOCALINI
+		OSTYPE
+		$dp(SOL_TMP)
+		$dp(SOURCE_ROOT)
+		$dp(TMP)
+		$dp(TEMP)
+	}
+	order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 common jdk14 jdk15 ojdk16
+	reset
+	{
+		COPYALL
+		CXX_X64_BINARY
+		DB2IMP
+		GCRINC
+		GCRLIB
+		GCRPATH
+		LIBMGR_X64_BINARY
+		LINK_X64_BINARY
+		NSIS_PATH
+		OLD_CHAOS
+		PERLDIR
+		SOLAR_ENV_ROOT
+		TFDEF
+		TFDIR
+		WST
+	}
+	script
+	{
+         sh
+            {
+            400: if [ $COPYALL ]; then
+            410:    perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            415: fi
+            600: umask 002
+            800: hash -r
+            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+            851:       export SO_GEN_ERROR
+            852: fi
+            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+            861:       export SO_GEN_ERROR2
+            862: fi
+            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
+            871:       echo $SO_GEN_ERROR
+            872: fi
+            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
+            881:       echo $SO_GEN_ERROR2
+            882: fi
+        }
+	}
+	switches
+	{
+       	bs_sourceroot SOURCE_ROOT_TMP
+		bsclient
+		cap
+		cax
+		compath STAR_COMPATH
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
+		l10n L10N_framework
+		ojdk16
+		ojdk16path
+		pro
+		psdk STAR_PSDK
+		shell STAR_USE_SHELL
+		sourceroot
+		tmp SOL_TMP_DIR
+	}
+}
+wntmsci13
+{
+	environment
+	{
+		bs_sourceroot
+		{
+			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
+			SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
+			SOURCE_ROOT_USED TRUE
+		}
+		cap
 		{
 			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
 			COMPATH %SOL_TMP%$/r$/msvc9p
@@ -3383,11 +3227,12 @@ wntmsci12
 			ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
 			FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
 			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
 			PCLEAN_PATH %SOLARROOT%$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
 			PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1
 			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
@@ -3395,7 +3240,7 @@ wntmsci12
 #			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
 
 		}
-		cax 
+		cax
 		{
 			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
 			COMPATH %SOL_TMP%$/r$/msvc9p
@@ -3405,18 +3250,19 @@ wntmsci12
 			ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
 			FSDK %COMPATH%$/Sdk$/v3.5
 			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
 			PCLEAN_PATH %SOL_TMP%$/r$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
 			PSDK %COMPATH%$/PlatformSDK$/V6.1
 			SHARED_COM_SDK_PATH %COMPATH%$/Common7$/IDE
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 #			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
 		}
-		common 
+		common
 		{
 			*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
 			*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
@@ -3429,7 +3275,7 @@ wntmsci12
 			*s cd %SOLARVERSION%
 			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
 			*z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
-			BIG_SVX 
+			BIG_SVX
 			BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison
 			COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
 			CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
@@ -3458,6 +3304,7 @@ wntmsci12
             WITH_VC_REDIST TRUE
 			XCLASSPATH .
 			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
+			BUILD_X64 TRUE
 		}
 		common0
 		{
@@ -3473,7 +3320,7 @@ wntmsci12
 		{
 			PERL perl
 		}
-		common1 
+		common1
 		{
 			COMPATH %SOLAR_ENV_ROOT%$/msvc9p
 			COMPROOT %SOLAR_ENV_ROOT%$/msvc9p
@@ -3485,28 +3332,28 @@ wntmsci12
 			PERL %SOLAR_ENV_ROOT%$/%PERLDIR%
 			PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/V6.1
 			SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+			SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOLAR_ENV_ROOT%
 			SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
 			SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
 			SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT%
+			SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
 #			TEMP $dp(%TEMP%)
 #			TMP $dp(%TMP%)
 		}
-		common2 
+		common2
 		{
 			ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR%
 			CALL_CDECL TRUE
-			CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:$cp(%SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT%)
+			CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:$cp(%SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%)
 			COM MSC
 			COMEX 12
 			COMMON_BUILD_TOOLS $cp(%SOLARROOT%$/btools)
 			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			COMP_ENV wntmsci12
+			COMP_ENV wntmsci13
 			CPU I
 			CPUNAME INTEL
 			CVER M1500
@@ -3515,18 +3362,18 @@ wntmsci12
 			GUI WNT
 			GUIBASE WIN
 			GVER NT351
-			INPATH wntmsci12%PROEXT%
+			INPATH wntmsci13%PROEXT%
 			MOZILLABUILD %SOLARROOT%/mozilla-build-1.3
 			OS WNT
-			OUTPATH wntmsci12
-			PACKMS %SO_PACK%$/wntmsci12$/MS
+			OUTPATH wntmsci13
+			PACKMS %SO_PACK%$/wntmsci13$/MS
 			SET_EXEPTIONS TRUE
 			SHIPDRIVE %SOLAR_ENV_ROOT%$/ship$/install
 			SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
 			SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
 			SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
 			SOLAR_OJDK16PATH %SOLARROOT%$/openjdk-6-b08-windows-i586
-			SOLAR_STLPATH %SOLARVERSION%$/wntmsci12%PROEXT%$/inc%UPDMINOREXT%$/stl
+			SOLAR_STLPATH %SOLARVERSION%$/wntmsci13%PROEXT%$/inc%UPDMINOREXT%$/stl
 			SORT sort -T %TMP%
 #			TOUCH %SOLARROOT%$/btw$/%BTOOLDIR%$/touch.exe
 			use_shl_versions TRUE
@@ -3535,7 +3382,7 @@ wntmsci12
 		{
 			SHIPDRIVE %BS_ROOT%$/ship$/install
 		}
-		compath 
+		compath
 		{
 			COMPATH $dp(%STAR_COMPATH%)
 		}
@@ -3549,26 +3396,7 @@ wntmsci12
 		{
 			SOLAR_ENV_ROOT $dp(%ENV_ROOT%)
 		}
-		jdk13 
-		{
-#			HOMEDRIVE %DEVROOT%
-#			HOMEPATH $/jdk131
-			JAVAHOME %JDK13PATH%
-			JAVA_HOME %JDK13PATH%
-			JDKINC %JDK13PATH%$/include;%JDK13PATH%$/include$/win32
-			JDKINCS -I%JDK13PATH%$/include -I%JDK13PATH%$/include$/win32
-			JDKLIB %JDK13PATH%$/lib
-			JDKLIBS %JDK13PATH%$/lib
-			JDKPATH %JDK13PATH%$/bin
-			JDK_VERSION 131
-			JREPATH %JDK13PATH%$/jre$/bin$/hotspot
-			XCLASSPATH .;%JDK13PATH%$/jre$/lib$/rt.jar;%JDK13PATH%$/lib$/tools.jar
-		}
-		jdk13path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK13PATH $dp(%JDK_PATH%)
-		}
-		jdk14 
+		jdk14
 		{
 #			HOMEDRIVE %DEVROOT%
 #			HOMEPATH $/jdk141
@@ -3587,7 +3415,7 @@ wntmsci12
 		{
 			SOLAR_JDK14PATH $dp(%JDK_PATH%)
 		}
-		jdk15 
+		jdk15
 		{
 #			HOMEDRIVE %DEVROOT%
 #			HOMEPATH $/jdk151
@@ -3606,11 +3434,7 @@ wntmsci12
 		{
 			SOLAR_JDK15PATH $dp(%JDK_PATH%)
 		}
-		nojava 
-		{
-			DISABLE_JAVA TRUE
-		}
-		ojdk16 
+		ojdk16
 		{
 #			HOMEDRIVE %DEVROOT%
 #			HOMEPATH $/openjdk-6-b08-windows-i586
@@ -3628,16 +3452,11 @@ wntmsci12
 		{
 			SOLAR_OJDK16PATH $dp(%JDK_PATH%)
 		}
-		pre 
-		{
-			ILIB %PRE%$/lib;%ILIB%
-			LIB %PRE%$/lib;%LIB%
-		}
-		pro 
+		pro
 		{
 			RES_ENUS TRUE
 		}
-		psdk 
+		psdk
 		{
 			PSDK $dp(%STAR_PSDK%)
 		}
@@ -3646,59 +3465,49 @@ wntmsci12
 			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%)
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH $dp(%STL_ROOT%$/..$/lib)
-			SOLAR_STLPATH $dp(%STL_ROOT%)
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
-		tmp 
+		tmp
 		{
 			SOL_TMP $dp(%SOL_TMP_DIR%)
 		}
 	}
-	extern 
+	extern
 	{
-		COMSPEC 
-		DIST_ROOT 
-		ENV_ROOT 
-		JDK_PATH 
-		LOCALINI 
+		COMSPEC
+		DIST_ROOT
+		ENV_ROOT
+		JDK_PATH
+		LOCALINI
 		OSTYPE
-		$dp(SOL_TMP) 
-		$dp(SOURCE_ROOT) 
-		$dp(STL_ROOT) 
+		$dp(SOL_TMP)
+		$dp(SOURCE_ROOT)
 		$dp(TMP)
 		$dp(TEMP)
 	}
-	order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 ca cap cax common02 psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16  pre
-	reset 
-	{
-		COPYALL 
-		CXX_X64_BINARY 
-		DB2IMP 
-		GCRINC 
-		GCRLIB 
-		GCRPATH 
-		LIBMGR_X64_BINARY 
-		LINK_X64_BINARY 
-		NSIS_PATH 
-		OLD_CHAOS 
+	order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 common jdk14 jdk15 ojdk16
+	reset
+	{
+		COPYALL
+		CXX_X64_BINARY
+		DB2IMP
+		GCRINC
+		GCRLIB
+		GCRPATH
+		LIBMGR_X64_BINARY
+		LINK_X64_BINARY
+		NSIS_PATH
+		OLD_CHAOS
 		PERLDIR
-		SOLAR_ENV_ROOT 
-		TFDEF 
-		TFDIR 
-		WST 
+		SOLAR_ENV_ROOT
+		TFDEF
+		TFDIR
+		WST
 	}
-	script 
+	script
 	{
          sh
             {
             400: if [ $COPYALL ]; then
-            410:    perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+            410:    perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
             415: fi
             600: umask 002
             800: hash -r
@@ -3716,32 +3525,27 @@ wntmsci12
             882: fi
         }
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		cap
+		cax
 		compath STAR_COMPATH
-		distroot 
-		envroot 
-		jdk13 
-		jdk13path 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
-		nojava 
-		ojdk16 
-		ojdk16path 
-		pre PRE
-		pro 
+		ojdk16
+		ojdk16path
+		pro
 		psdk STAR_PSDK
 		shell STAR_USE_SHELL
-		sourceroot 
-		stl 
+		sourceroot
 		tmp SOL_TMP_DIR
 	}
 }
+
diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn
index dca20cc902b1..877d82e566a5 100644
--- a/solenv/config/ssolar.cmn
+++ b/solenv/config/ssolar.cmn
@@ -25,6 +25,7 @@ common
         rsc_once
         wrapper_override_cc_wrapper
         *zipdep
+		ALT_L10N_MODULE
         AWK
 		BIG_SVX
 		BIG_TOOLS
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index a862ec39897f..19f6e30ad175 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -100,9 +100,7 @@ $(USE_SHL1VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL1VERSIONMAP)"!=""
 
-.IF "$(OS)"!="IRIX"
 SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP)
-.ENDIF
 
 $(USE_SHL1VERSIONMAP): \
                     $(SHL1OBJS)\
@@ -139,9 +137,7 @@ $(USE_SHL1VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL1VERSIONMAP)"!=""
 USE_SHL1VERSIONMAP=$(MISC)/$(SHL1VERSIONMAP:b)_$(SHL1TARGET)$(SHL1VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
 SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP)
-.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL1VERSIONMAP): $(SHL1OBJS) $(SHL1LIBS)
@@ -189,11 +185,7 @@ $(USE_SHL1VERSIONMAP): $(SHL1VERSIONMAP)
 .IF "$(UNIXVERSIONNAMES)"!=""
 .IF "$(OS)"!="MACOSX"
 .IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL1SONAME=$(SONAME_SWITCH)$(SHL1TARGETN:f)
-.ELSE
 SHL1SONAME=\"$(SONAME_SWITCH)$(SHL1TARGETN:f)\"
-.ENDIF
 .ENDIF			# "$(GUI)"!="UNX"
 .ENDIF			# "$(OS)"!="MACOSX"
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -654,9 +646,7 @@ $(USE_SHL2VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL2VERSIONMAP)"!=""
 
-.IF "$(OS)"!="IRIX"
 SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP)
-.ENDIF
 
 $(USE_SHL2VERSIONMAP): \
                     $(SHL2OBJS)\
@@ -693,9 +683,7 @@ $(USE_SHL2VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL2VERSIONMAP)"!=""
 USE_SHL2VERSIONMAP=$(MISC)/$(SHL2VERSIONMAP:b)_$(SHL2TARGET)$(SHL2VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
 SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP)
-.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL2VERSIONMAP): $(SHL2OBJS) $(SHL2LIBS)
@@ -743,11 +731,7 @@ $(USE_SHL2VERSIONMAP): $(SHL2VERSIONMAP)
 .IF "$(UNIXVERSIONNAMES)"!=""
 .IF "$(OS)"!="MACOSX"
 .IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL2SONAME=$(SONAME_SWITCH)$(SHL2TARGETN:f)
-.ELSE
 SHL2SONAME=\"$(SONAME_SWITCH)$(SHL2TARGETN:f)\"
-.ENDIF
 .ENDIF			# "$(GUI)"!="UNX"
 .ENDIF			# "$(OS)"!="MACOSX"
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -1208,9 +1192,7 @@ $(USE_SHL3VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL3VERSIONMAP)"!=""
 
-.IF "$(OS)"!="IRIX"
 SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP)
-.ENDIF
 
 $(USE_SHL3VERSIONMAP): \
                     $(SHL3OBJS)\
@@ -1247,9 +1229,7 @@ $(USE_SHL3VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL3VERSIONMAP)"!=""
 USE_SHL3VERSIONMAP=$(MISC)/$(SHL3VERSIONMAP:b)_$(SHL3TARGET)$(SHL3VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
 SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP)
-.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL3VERSIONMAP): $(SHL3OBJS) $(SHL3LIBS)
@@ -1297,11 +1277,7 @@ $(USE_SHL3VERSIONMAP): $(SHL3VERSIONMAP)
 .IF "$(UNIXVERSIONNAMES)"!=""
 .IF "$(OS)"!="MACOSX"
 .IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL3SONAME=$(SONAME_SWITCH)$(SHL3TARGETN:f)
-.ELSE
 SHL3SONAME=\"$(SONAME_SWITCH)$(SHL3TARGETN:f)\"
-.ENDIF
 .ENDIF			# "$(GUI)"!="UNX"
 .ENDIF			# "$(OS)"!="MACOSX"
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -1762,9 +1738,7 @@ $(USE_SHL4VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL4VERSIONMAP)"!=""
 
-.IF "$(OS)"!="IRIX"
 SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP)
-.ENDIF
 
 $(USE_SHL4VERSIONMAP): \
                     $(SHL4OBJS)\
@@ -1801,9 +1775,7 @@ $(USE_SHL4VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL4VERSIONMAP)"!=""
 USE_SHL4VERSIONMAP=$(MISC)/$(SHL4VERSIONMAP:b)_$(SHL4TARGET)$(SHL4VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
 SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP)
-.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL4VERSIONMAP): $(SHL4OBJS) $(SHL4LIBS)
@@ -1851,11 +1823,7 @@ $(USE_SHL4VERSIONMAP): $(SHL4VERSIONMAP)
 .IF "$(UNIXVERSIONNAMES)"!=""
 .IF "$(OS)"!="MACOSX"
 .IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL4SONAME=$(SONAME_SWITCH)$(SHL4TARGETN:f)
-.ELSE
 SHL4SONAME=\"$(SONAME_SWITCH)$(SHL4TARGETN:f)\"
-.ENDIF
 .ENDIF			# "$(GUI)"!="UNX"
 .ENDIF			# "$(OS)"!="MACOSX"
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -2316,9 +2284,7 @@ $(USE_SHL5VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL5VERSIONMAP)"!=""
 
-.IF "$(OS)"!="IRIX"
 SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP)
-.ENDIF
 
 $(USE_SHL5VERSIONMAP): \
                     $(SHL5OBJS)\
@@ -2355,9 +2321,7 @@ $(USE_SHL5VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL5VERSIONMAP)"!=""
 USE_SHL5VERSIONMAP=$(MISC)/$(SHL5VERSIONMAP:b)_$(SHL5TARGET)$(SHL5VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
 SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP)
-.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL5VERSIONMAP): $(SHL5OBJS) $(SHL5LIBS)
@@ -2405,11 +2369,7 @@ $(USE_SHL5VERSIONMAP): $(SHL5VERSIONMAP)
 .IF "$(UNIXVERSIONNAMES)"!=""
 .IF "$(OS)"!="MACOSX"
 .IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL5SONAME=$(SONAME_SWITCH)$(SHL5TARGETN:f)
-.ELSE
 SHL5SONAME=\"$(SONAME_SWITCH)$(SHL5TARGETN:f)\"
-.ENDIF
 .ENDIF			# "$(GUI)"!="UNX"
 .ENDIF			# "$(OS)"!="MACOSX"
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -2870,9 +2830,7 @@ $(USE_SHL6VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL6VERSIONMAP)"!=""
 
-.IF "$(OS)"!="IRIX"
 SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP)
-.ENDIF
 
 $(USE_SHL6VERSIONMAP): \
                     $(SHL6OBJS)\
@@ -2909,9 +2867,7 @@ $(USE_SHL6VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL6VERSIONMAP)"!=""
 USE_SHL6VERSIONMAP=$(MISC)/$(SHL6VERSIONMAP:b)_$(SHL6TARGET)$(SHL6VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
 SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP)
-.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL6VERSIONMAP): $(SHL6OBJS) $(SHL6LIBS)
@@ -2959,11 +2915,7 @@ $(USE_SHL6VERSIONMAP): $(SHL6VERSIONMAP)
 .IF "$(UNIXVERSIONNAMES)"!=""
 .IF "$(OS)"!="MACOSX"
 .IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL6SONAME=$(SONAME_SWITCH)$(SHL6TARGETN:f)
-.ELSE
 SHL6SONAME=\"$(SONAME_SWITCH)$(SHL6TARGETN:f)\"
-.ENDIF
 .ENDIF			# "$(GUI)"!="UNX"
 .ENDIF			# "$(OS)"!="MACOSX"
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -3424,9 +3376,7 @@ $(USE_SHL7VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL7VERSIONMAP)"!=""
 
-.IF "$(OS)"!="IRIX"
 SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP)
-.ENDIF
 
 $(USE_SHL7VERSIONMAP): \
                     $(SHL7OBJS)\
@@ -3463,9 +3413,7 @@ $(USE_SHL7VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL7VERSIONMAP)"!=""
 USE_SHL7VERSIONMAP=$(MISC)/$(SHL7VERSIONMAP:b)_$(SHL7TARGET)$(SHL7VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
 SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP)
-.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL7VERSIONMAP): $(SHL7OBJS) $(SHL7LIBS)
@@ -3513,11 +3461,7 @@ $(USE_SHL7VERSIONMAP): $(SHL7VERSIONMAP)
 .IF "$(UNIXVERSIONNAMES)"!=""
 .IF "$(OS)"!="MACOSX"
 .IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL7SONAME=$(SONAME_SWITCH)$(SHL7TARGETN:f)
-.ELSE
 SHL7SONAME=\"$(SONAME_SWITCH)$(SHL7TARGETN:f)\"
-.ENDIF
 .ENDIF			# "$(GUI)"!="UNX"
 .ENDIF			# "$(OS)"!="MACOSX"
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -3978,9 +3922,7 @@ $(USE_SHL8VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL8VERSIONMAP)"!=""
 
-.IF "$(OS)"!="IRIX"
 SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP)
-.ENDIF
 
 $(USE_SHL8VERSIONMAP): \
                     $(SHL8OBJS)\
@@ -4017,9 +3959,7 @@ $(USE_SHL8VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL8VERSIONMAP)"!=""
 USE_SHL8VERSIONMAP=$(MISC)/$(SHL8VERSIONMAP:b)_$(SHL8TARGET)$(SHL8VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
 SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP)
-.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL8VERSIONMAP): $(SHL8OBJS) $(SHL8LIBS)
@@ -4067,11 +4007,7 @@ $(USE_SHL8VERSIONMAP): $(SHL8VERSIONMAP)
 .IF "$(UNIXVERSIONNAMES)"!=""
 .IF "$(OS)"!="MACOSX"
 .IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL8SONAME=$(SONAME_SWITCH)$(SHL8TARGETN:f)
-.ELSE
 SHL8SONAME=\"$(SONAME_SWITCH)$(SHL8TARGETN:f)\"
-.ENDIF
 .ENDIF			# "$(GUI)"!="UNX"
 .ENDIF			# "$(OS)"!="MACOSX"
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -4532,9 +4468,7 @@ $(USE_SHL9VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL9VERSIONMAP)"!=""
 
-.IF "$(OS)"!="IRIX"
 SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP)
-.ENDIF
 
 $(USE_SHL9VERSIONMAP): \
                     $(SHL9OBJS)\
@@ -4571,9 +4505,7 @@ $(USE_SHL9VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL9VERSIONMAP)"!=""
 USE_SHL9VERSIONMAP=$(MISC)/$(SHL9VERSIONMAP:b)_$(SHL9TARGET)$(SHL9VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
 SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP)
-.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL9VERSIONMAP): $(SHL9OBJS) $(SHL9LIBS)
@@ -4621,11 +4553,7 @@ $(USE_SHL9VERSIONMAP): $(SHL9VERSIONMAP)
 .IF "$(UNIXVERSIONNAMES)"!=""
 .IF "$(OS)"!="MACOSX"
 .IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL9SONAME=$(SONAME_SWITCH)$(SHL9TARGETN:f)
-.ELSE
 SHL9SONAME=\"$(SONAME_SWITCH)$(SHL9TARGETN:f)\"
-.ENDIF
 .ENDIF			# "$(GUI)"!="UNX"
 .ENDIF			# "$(OS)"!="MACOSX"
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -5086,9 +5014,7 @@ $(USE_SHL10VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL10VERSIONMAP)"!=""
 
-.IF "$(OS)"!="IRIX"
 SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP)
-.ENDIF
 
 $(USE_SHL10VERSIONMAP): \
                     $(SHL10OBJS)\
@@ -5125,9 +5051,7 @@ $(USE_SHL10VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL10VERSIONMAP)"!=""
 USE_SHL10VERSIONMAP=$(MISC)/$(SHL10VERSIONMAP:b)_$(SHL10TARGET)$(SHL10VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
 SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP)
-.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL10VERSIONMAP): $(SHL10OBJS) $(SHL10LIBS)
@@ -5175,11 +5099,7 @@ $(USE_SHL10VERSIONMAP): $(SHL10VERSIONMAP)
 .IF "$(UNIXVERSIONNAMES)"!=""
 .IF "$(OS)"!="MACOSX"
 .IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL10SONAME=$(SONAME_SWITCH)$(SHL10TARGETN:f)
-.ELSE
 SHL10SONAME=\"$(SONAME_SWITCH)$(SHL10TARGETN:f)\"
-.ENDIF
 .ENDIF			# "$(GUI)"!="UNX"
 .ENDIF			# "$(OS)"!="MACOSX"
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
diff --git a/solenv/inc/_tg_srs.mk b/solenv/inc/_tg_srs.mk
index 1dea9b066680..063f98f2f322 100644
--- a/solenv/inc/_tg_srs.mk
+++ b/solenv/inc/_tg_srs.mk
@@ -27,7 +27,7 @@ $(foreach,i,$(SRC1FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     @echo "Making:   " $(@:f)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+    $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
     $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
@@ -80,7 +80,7 @@ $(foreach,i,$(SRC2FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     @echo "Making:   " $(@:f)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+    $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
     $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
@@ -133,7 +133,7 @@ $(foreach,i,$(SRC3FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     @echo "Making:   " $(@:f)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+    $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
     $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
@@ -186,7 +186,7 @@ $(foreach,i,$(SRC4FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     @echo "Making:   " $(@:f)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+    $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
     $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
@@ -239,7 +239,7 @@ $(foreach,i,$(SRC5FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     @echo "Making:   " $(@:f)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+    $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
     $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
@@ -292,7 +292,7 @@ $(foreach,i,$(SRC6FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     @echo "Making:   " $(@:f)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+    $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
     $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
@@ -345,7 +345,7 @@ $(foreach,i,$(SRC7FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     @echo "Making:   " $(@:f)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+    $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
     $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
@@ -398,7 +398,7 @@ $(foreach,i,$(SRC8FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     @echo "Making:   " $(@:f)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+    $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
     $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
@@ -451,7 +451,7 @@ $(foreach,i,$(SRC9FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     @echo "Making:   " $(@:f)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+    $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
     $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
@@ -504,7 +504,7 @@ $(foreach,i,$(SRC10FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     @echo "Making:   " $(@:f)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+    $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
     $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index cce1aac0ea6e..4d40600ba368 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # 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
@@ -187,6 +187,7 @@ SAXLIB=-lsax$(DLLPOSTFIX)
 MAILLIB=-lmail
 DOCMGRLIB=-ldmg$(DLLPOSTFIX)
 BASICLIB=-lsb$(DLLPOSTFIX)
+VBAHELPERLIB=-lvbahelper$(DLLPOSTFIX)
 DBTOOLSLIB=-ldbtools$(DLLPOSTFIX)
 HM2LIBSH=-lhmwrpdll
 HM2LIBST=-lhmwrap
@@ -220,12 +221,14 @@ JPEG3RDLIB=-ljpeg
 .ELSE
 JPEG3RDLIB=-ljpeglib
 .ENDIF
-.IF "$(SYSTEM_NEON)" == "YES" || "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(SYSTEM_NEON)" == "YES"
+NEON3RDLIB=-lneon
+.ELIF "$(GUI)$(COM)"=="WNTGCC"
 NEON3RDLIB=-lneon
 .ELIF "$(OS)" == "MACOSX"
-NEON3RDLIB=$(SOLARLIBDIR)/libneon.a
+NEON3RDLIB=$(SOLARLIBDIR)/libneon.dylib
 .ELSE
-NEON3RDLIB=$(STATIC) -lneon $(DYNAMIC)
+NEON3RDLIB=-lneon
 .ENDIF
 .IF "$(SYSTEM_DB)" == "YES"
 BERKELEYLIB=-ldb
@@ -240,7 +243,7 @@ SFXDEBUGLIB=
 FWELIB=-lfwe$(DLLPOSTFIX)
 FWILIB=-lfwi$(DLLPOSTFIX)
 SVXCORELIB=-lsvxcore$(DLLPOSTFIX)
-SVXMSFILTERLIB=-lsvxmsfilter$(DLLPOSTFIX)
+MSFILTERLIB=-lmsfilter$(DLLPOSTFIX)
 SVXLIB=-lsvx$(DLLPOSTFIX)
 BASCTLLIB=-lbasctl$(DLLPOSTFIX)
 BASICIDELIB=-lybctl
@@ -268,10 +271,11 @@ JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID)
 JVMACCESSLIB = -ljvmaccess$(COMID)
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
 CPPUNITLIB = -lcppunit$(DLLPOSTFIX)
+TESTSHL2LIB = -ltestshl2$(DLLPOSTFIX)
 .IF "$(SYSTEM_LIBXSLT)"=="YES"
 XSLTLIB=$(LIBXSLT_LIBS)
 .ELSE
-XSLTLIB=-lxslt $(ZLIB3RDLIB) $(LIBXML2LIB)
+XSLTLIB=-lxslt $(LIBXML2LIB)
 .ENDIF
 .IF "$(GUI)$(COM)"=="WNTGCC"
 JVMFWKLIB = -ljvmfwk$(UDK_MAJOR)
@@ -422,9 +426,11 @@ SAXLIB=isax.lib
 MAILLIB=mail.lib
 DOCMGRLIB=docmgr.lib
 BASICLIB=basic.lib
+VBAHELPERLIB=vbahelper.lib
 TKTLIB=tkt.lib
+SJLIB=sj.lib
 SVXCORELIB=isvxcore.lib
-SVXMSFILTERLIB=isvxmsfilter.lib
+MSFILTERLIB=imsfilter.lib
 SVXLIB=isvx.lib
 BASCTLLIB=basctl.lib
 BASICIDELIB=ybctl.lib
@@ -438,7 +444,7 @@ EXPAT3RDLIB=expat_xmltok.lib expat_xmlparse.lib
 EXPATASCII3RDLIB=expat_xmltok.lib ascii_expat_xmlparse.lib
 ZLIB3RDLIB=zlib.lib
 JPEG3RDLIB=jpeglib.lib
-NEON3RDLIB=neon.lib
+NEON3RDLIB=ineon.lib
 BERKELEYLIB=libdb47.lib
 CURLLIB=libcurl.lib
 CHAOSLIB=ichaos.lib
@@ -473,7 +479,8 @@ PKGCHKLIB=ipkgchk.lib
 HELPLINKERLIB=ihelplinker.lib
 JVMACCESSLIB = ijvmaccess.lib
 CPPUNITLIB = cppunit.lib
-XSLTLIB = libxslt.lib $(ZLIB3RDLIB) $(LIBXML2LIB)
+TESTSHL2LIB = testshl2.lib
+XSLTLIB = libxslt.lib $(LIBXML2LIB)
 .IF "$(GUI)"=="OS2"
 REDLANDLIB = raptor.a rasqal.a rdf.a $(LIBXML2LIB) $(OPENSSLLIB) pthread.lib
 .ELSE
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index eb479d4adafb..74248a6e8cd7 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=300
-RSCREVISION=300m64(Build:9446)
-BUILD=9446
-LAST_MINOR=m64
+RSCREVISION=300m69(Build:9475)
+BUILD=9475
+LAST_MINOR=m69
 SOURCEVERSION=DEV300
diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk
index 3101d0a6ac01..30bb91599903 100644
--- a/solenv/inc/postset.mk
+++ b/solenv/inc/postset.mk
@@ -35,116 +35,118 @@
 defaultlangiso=en-US
 
 # Complete list of all supported ISO codes
-
-completelangiso=\
-    af \
-    ar \
-    as-IN \
-    ast \
-    be-BY \
-    bg \
-    bn \
-    bn-BD \
-    bn-IN \
-    br \
-    brx \
-    bs \
-    by \
-    ca \
-    cs \
-    cy \
-    da \
-    de \
-    dgo \
-    dz \
-    el \
-    en-GB \
-    en-US \
-    en-ZA \
-    eo \
-    es \
-    et \
-    eu \
-    fa \
-    fi \
-    fr \
-    ga \
-    gd \
-    gl \
-    gu \
-    gu-IN \
-    he \
-    hi-IN \
-    hr \
-    hu \
-    is \
-    it \
-    ja \
-    ka \
-    kk \
-    km \
-    kn \
-    ko \
-    kok \
-    ks \
-    ku \
-    lo \
-    lt \
-    lv \
-    mai \
-    mk \
-    ml-IN \
-    mn \
-    mni \
-    mr-IN \
-    ms \
-    my \
-    nb \
-    ne \
-    nl \
-    nn \
-    nr \
-    ns \
-    oc \
-    om \
-    or-IN \
-    pa-IN \
-    pl \
-    pt \
-    pt-BR \
-    ro \
-    ru \
-    rw \
-    sa-IN \
-    sat \
-    sc \
-    sd \
-    sh \
-    sk \
-    sl \
-    so \
-    sr \
-    ss \
-    st \
-    sv \
-    sw \
-    sw-TZ \
-    ta-IN \
-    te-IN \
-    tg \
-    th \
-    ti-ER \
-    tn \
-    tr \
-    ts \
-    uk \
-    ur-IN \
-    uz \
-    ve \
-    vi \
-    xh \
-    zh-CN \
-    zh-TW \
-    zu
+completelangiso=af \
+ar \
+as-IN \
+be-BY \
+bo \
+bg \
+br \
+brx \
+bn \
+bn-BD \
+bn-IN \
+bs \
+by \
+ca \
+cs \
+cy \
+da \
+de \
+dgo \
+dz \
+el \
+en-GB \
+en-US \
+en-ZA \
+eo \
+es \
+et \
+eu \
+fa \
+fi \
+fr \
+ga \
+gd \
+gl \
+gu \
+gu-IN \
+he \
+hi-IN \
+hr \
+hu \
+is \
+it \
+ja \
+kid \
+ky \
+ka \
+kk \
+km \
+kn \
+ko \
+kok \
+ks \
+ku \
+lo \
+lt \
+lv \
+mai \
+mk \
+mn \
+mni \
+ms \
+ml-IN \
+mr-IN \
+my \
+ne \
+nb \
+nl \
+nn \
+nr \
+ns \
+om \
+oc \
+or-IN \
+pap \
+pa-IN \
+pl \
+ps \
+pt \
+pt-BR \
+ru \
+rw \
+sat \
+sa-IN \
+si \
+sc \
+sd \
+sk \
+sl \
+sh \
+sr \
+ss \
+st \
+sv \
+sw \
+sw-TZ \
+te-IN \
+ti-ER \
+ta-IN \
+th \
+tn \
+tr \
+ts \
+tg \
+ug \
+ur-IN \
+uk \
+uz \
+ve \
+vi \
+xh \
+zh-CN \
+zh-TW \
+zu
 
 alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG)))))
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 71909c8d348b..991309d6de6e 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -160,7 +160,7 @@ $(SLO)/precompiled_ex.% .PHONY:
 
 $(SLO)/%.obj : %.cxx
     @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
-.IF "$(ENABLE_PCH)"!="" && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" )
+.IF "$(ENABLE_PCH)"!="" && ( "$(BUILD_SPECIAL)"!="TRUE" )
 # just a helper var	
     @noop $(assign used_exc_switches=$(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)))
 # cleanup first
@@ -224,7 +224,7 @@ $(SLO)/%.obj : %.cpp
 .ENDIF			# "$(nodep)"==""
 
 $(SLO)/%.obj : $(MISC)/%.cxx
-    @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
+    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(MISC)/$*.cxx
@@ -249,7 +249,7 @@ $(SLO)/%.obj : $(MISC)/%.cxx
 .ENDIF			# "$(nodep)"==""
 
 $(SLO)/%.obj : $(MISC)/%.cc
-    @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
+    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(MISC)/$*.cc
@@ -266,7 +266,7 @@ $(SLO)/%.obj : $(MISC)/%.cc
 .ENDIF
 
 $(OBJ)/%.obj : $(MISC)/%.cxx
-    @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
+    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(MISC)/$*.cxx
@@ -321,7 +321,7 @@ $(OBJ)/%.obj : %.c
 .ENDIF			# "$(nodep)"==""
 
 $(OBJ)/%.obj : $(MISC)/%.c
-    @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
+    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.c
@@ -343,7 +343,7 @@ $(OBJ)/%.obj : $(MISC)/%.c
 .ENDIF			# "$(nodep)"==""
 
 $(SLO)/%.obj : $(MISC)/%.c
-    @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
+    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.c
@@ -404,7 +404,7 @@ $(OBJ)/%.obj : %.m
 
 # Objective-C files
 $(OBJ)/%.obj : $(MISC)/%.m
-    @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
+    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
 .IF "$(OS)"=="MACOSX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.m
@@ -415,7 +415,7 @@ $(OBJ)/%.obj : $(MISC)/%.m
 
 # Objective-C files
 $(SLO)/%.obj : $(MISC)/%.m
-    @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
+    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
 .IF "$(OS)"=="MACOSX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.m
@@ -461,7 +461,7 @@ $(OBJ)/%.obj : %.mm
 
 # Objective-C++ files
 $(OBJ)/%.obj : $(MISC)/%.mm
-    @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
+    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
 .IF "$(OS)"=="MACOSX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.mm
@@ -476,7 +476,7 @@ $(OBJ)/%.obj : $(MISC)/%.mm
 
 # Objective-C++ files
 $(SLO)/%.obj : $(MISC)/%.mm
-    @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
+    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
 .IF "$(OS)"=="MACOSX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.mm
diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk
index 35d9e483ded8..23dbee21d2cd 100644
--- a/solenv/inc/set_wntx64.mk
+++ b/solenv/inc/set_wntx64.mk
@@ -46,8 +46,12 @@ LIBMGR_X64=$(WRAPCMD) $(LIBMGR_X64_BINARY) $(NOLOGO)
 IMPLIB_X64=$(WRAPCMD) $(LIBMGR_X64_BINARY)
 
 USE_CFLAGS_X64=-c -nologo -Gs $(NOLOGO) -Zm500 -Zc:forScope,wchar_t- -GR
-USE_CFLAGS_X64+=$(CFLAGS_X64)
 USE_CDEFS_X64+= -DWIN32 -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS
+.IF "$(debug)"!=""
+USE_CFLAGS_X64+=-Zi -Fd$(MISC_X64)/$(@:b).pdb
+USE_CDEFS_X64+=-DDEBUG
+.ENDIF # "$(debug)"!=""
+USE_CFLAGS_X64+=$(CFLAGS_X64)
 USE_CDEFS_X64+=$(CDEFS_X64)
 INCLUDE_X64=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
 
@@ -85,6 +89,10 @@ LINKFLAGS_X64+= -NODEFAULTLIB -RELEASE -DEBUG -INCREMENTAL:NO
 .ENDIF # "$(PRODUCT)"!="full"
 MAPFILE=-out:$$@
 
+.IF "$(debug)" != ""
+LINKFLAGS_X64+= $(LINKFLAGSDEBUG)
+.ENDIF
+
 LINKFLAGSSHLCUI_X64=/SUBSYSTEM:CONSOLE /DLL
 LINKFLAGSSHL_X64=$(LINKFLAGSSHLCUI_X64)
 CDEFSSLO_X64+=$(CDEFSMT_X64) $(CDEFSOBJMT_X64)
@@ -98,7 +106,7 @@ STDSLOCUI_X64=
 IMPLIBFLAGS_X64=-machine:X64
 
 LIBPATH_X64=$(PSDK)/lib/x64
-LIBPATH_VC_X64=$(PSDK)/vc/lib/x64
+LIBPATH_VC_X64=$(COMPATH)/lib/amd64
 
 ADVAPI32LIB_X64=$(LIBPATH_X64)/advapi32.lib
 SHELL32LIB_X64=$(LIBPATH_X64)/shell32.lib
@@ -140,7 +148,7 @@ L_X64=$(SOLARLIBDIR_X64)
 VERSIONOBJ_X64=$(SLO_X64)/_version.obj
 BIN_X64=$(BIN)/x64
 RES_X64=$(RES)/x64
-SOLARLIBDIR_X64=$(SOLARVERSION)/$(INPATH)/lib$(EXT_UPDMINOR)/x64
+SOLARLIBDIR_X64=$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT)/x64
 LIB_X64:=$(LB_X64);$(SLB_X64);$(ILIB_X64)
 
 .IF "$(LIBTARGET)"==""
@@ -182,8 +190,16 @@ DEF1TARGETN_X64=$(MISC_X64)/$(DEF1NAME_X64).def
 .IF "$(DEF2NAME_X64)"!=""
 DEF2TARGETN_X64=$(MISC_X64)/$(DEF2NAME_X64).def
 .ENDIF
-.ENDIF # "$(BUILD_X64)"!=""
-
 
+$(SLO_X64)/%.obj : $(MISC_X64)/%.c
+    @echo ------------------------------
+    @echo Making: $@
+    -$(MKDIR) $(@:d)
+    @-$(MKDIR) $(MISC_X64)
+    @@-$(RM) $@
+    @$(TYPE) $(mktmp $(CC_X64) $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(MISC_X64)/$*.c )
+    @$(ECHONL)
+    $(CC_X64) @$(mktmp $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(MISC_X64)/$*.c )
 
+.ENDIF # "$(BUILD_X64)"!=""
 
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 49b9d2c8e755..6110498edd29 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -191,7 +191,6 @@ CDEFSPROF=
 CDEFSDEBUG=
 CDEFSDBGUTIL=
 CDEFSOPT=
-HDEFS=
 
 CFLAGS=
 CFLAGSCALL=
@@ -648,29 +647,6 @@ MISC=$(OUT)/misc
 COMMONMISC={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))}
 .ENDIF
 
-L10N_MODULE*=l10n
-ALT_L10N_MODULE*=l10n_so
-
-.IF "$(WITH_LANG)"!=""
-.INCLUDE .IGNORE: $(SOLARSRC)/$(L10N_MODULE)/localization_present.mk
-.INCLUDE .IGNORE: $(SOLARSRC)/$(ALT_L10N_MODULE)/localization_present.mk
-
-.IF "$(LOCALIZATION_FOUND)"!="" || "$(ALT_LOCALIZATION_FOUND)"!=""
-TRYSDF:=$(SOLARSRC)/$(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/$(PRJNAME)/$(PATH_IN_MODULE)/localize.sdf
-.IF "$(ALT_LOCALIZATION_FOUND)"!=""
-TRYALTSDF:=$(SOLARSRC)/$(ALT_L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/$(PRJNAME)/$(PATH_IN_MODULE)/localize.sdf
-# TODO: check performance impact...
-LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYALTSDF) $(THEN) echo $(TRYALTSDF) $(FI)))
-.ENDIF			# "$(ALT_LOCALIZATION_FOUND)"!=""
-some_local_helper_var:=$(strip $(shell @+$(IFEXIST) $(TRYSDF) $(THEN) echo $(TRYSDF) $(FI) ))
-LOCALIZESDF!:=$(eq,$(LOCALIZESDF),$(NULL) $(some_local_helper_var) $(LOCALIZESDF))
-LOCALIZESDF!:=$(eq,$(LOCALIZESDF),$(NULL) $(COMMONMISC)/$(PRJNAME)/$(PATH_IN_MODULE)/localize.sdf $(LOCALIZESDF))
-.ELSE			# "$(LOCALIZATION_FOUND)"!="" || "$(ALT_LOCALIZATION_FOUND)"!=""
-LOCALIZESDF:=$(COMMONMISC)/$(PRJNAME)/$(PATH_IN_MODULE)/localize.sdf
-.ENDIF			# "$(LOCALIZATION_FOUND)"!="" || "$(ALT_LOCALIZATION_FOUND)"!=""
-.ENDIF			# "$(WITH_LANG)"!=""
-
-
 OUTCXX=$(OUT)/cxx
 
 .IF "$(PACKAGE)"!=""
@@ -791,7 +767,6 @@ SRSX=$(OUT)/srs
 # Resource-Pfad fuer .RC und .RES
 RES=$(OUT)/res
 
-
 # das normale MISC wird nicht an LDMISC angepasst, stattdessen MISCX
 
 .IF "$(make_xl)"!=""
@@ -801,39 +776,39 @@ BIN=$(PRJ)/$(OUTPATH).xl/bin
 # damit gezielt Abhaengigkeiten auf s: angegeben werden koennen
 
 .IF "$(common_build)"!=""
-SOLARIDLDIR=$(SOLARVERSION)/common$(PROEXT)/idl$(EXT_UPDMINOR)
+SOLARIDLDIR=$(SOLARVERSION)/common$(PROEXT)/idl$(UPDMINOREXT)
 .ELSE
-SOLARIDLDIR=$(SOLARVERSION)/$(INPATH)/idl$(EXT_UPDMINOR)
+SOLARIDLDIR=$(SOLARVERSION)/$(INPATH)/idl$(UPDMINOREXT)
 .ENDIF
 
-.IF "$(UPDMINOR)" != ""
-EXT_UPDMINOR=.$(UPDMINOR)
-.ELSE
-EXT_UPDMINOR=
-.ENDIF
-SOLARRESDIR=$(SOLARVERSION)/$(INPATH)/res$(EXT_UPDMINOR)
-SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res$(EXT_UPDMINOR)
-SOLARLIBDIR=$(SOLARVERSION)/$(INPATH)/lib$(EXT_UPDMINOR)
-SOLARJAVADIR=$(SOLARVERSION)/$(INPATH)/java$(EXT_UPDMINOR)
-SOLARINCDIR=$(SOLARVERSION)/$(INPATH)/inc$(EXT_UPDMINOR)
-SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc$(EXT_UPDMINOR)
+#.IF "$(UPDMINOR)" != ""
+#UPDMINOREXT=.$(UPDMINOR)
+#.ELSE
+#UPDMINOREXT=
+#.ENDIF
+SOLARRESDIR=$(SOLARVERSION)/$(INPATH)/res$(UPDMINOREXT)
+SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res$(UPDMINOREXT)
+SOLARLIBDIR=$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT)
+SOLARJAVADIR=$(SOLARVERSION)/$(INPATH)/java$(UPDMINOREXT)
+SOLARINCDIR=$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)
+SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)
 .IF "$(SOLARLANG)"!="deut"
 .IF "$(SOLARLANG)" != ""
-SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc$(EXT_UPDMINOR)/$(SOLARLANG)
-SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res$(EXT_UPDMINOR)/$(SOLARLANG)
-.ENDIF
-.ENDIF
-SOLARBINDIR:=$(SOLARVERSION)/$(INPATH)/bin$(EXT_UPDMINOR)
-SOLARUCRDIR=$(SOLARVERSION)/$(INPATH)/ucr$(EXT_UPDMINOR)
-SOLARPARDIR=$(SOLARVERSION)/$(INPATH)/par$(EXT_UPDMINOR)
-SOLARXMLDIR=$(SOLARVERSION)/$(INPATH)/xml$(EXT_UPDMINOR)
-SOLARDOCDIR=$(SOLARVERSION)/$(INPATH)/doc$(EXT_UPDMINOR)
-SOLARPCKDIR=$(SOLARVERSION)/$(INPATH)/pck$(EXT_UPDMINOR)
-SOLARSDFDIR=$(SOLARVERSION)/$(INPATH)/sdf$(EXT_UPDMINOR)
-SOLARCOMMONBINDIR=$(SOLARVERSION)/common$(PROEXT)/bin$(EXT_UPDMINOR)
-SOLARCOMMONRESDIR=$(SOLARVERSION)/common$(PROEXT)/res$(EXT_UPDMINOR)
-SOLARCOMMONPCKDIR=$(SOLARVERSION)/common$(PROEXT)/pck$(EXT_UPDMINOR)
-SOLARCOMMONSDFDIR=$(SOLARVERSION)/common$(PROEXT)/sdf$(EXT_UPDMINOR)
+SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(SOLARLANG)
+SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res$(UPDMINOREXT)/$(SOLARLANG)
+.ENDIF
+.ENDIF
+SOLARBINDIR:=$(SOLARVERSION)/$(INPATH)/bin$(UPDMINOREXT)
+SOLARUCRDIR=$(SOLARVERSION)/$(INPATH)/ucr$(UPDMINOREXT)
+SOLARPARDIR=$(SOLARVERSION)/$(INPATH)/par$(UPDMINOREXT)
+SOLARXMLDIR=$(SOLARVERSION)/$(INPATH)/xml$(UPDMINOREXT)
+SOLARDOCDIR=$(SOLARVERSION)/$(INPATH)/doc$(UPDMINOREXT)
+SOLARPCKDIR=$(SOLARVERSION)/$(INPATH)/pck$(UPDMINOREXT)
+SOLARSDFDIR=$(SOLARVERSION)/$(INPATH)/sdf$(UPDMINOREXT)
+SOLARCOMMONBINDIR=$(SOLARVERSION)/common$(PROEXT)/bin$(UPDMINOREXT)
+SOLARCOMMONRESDIR=$(SOLARVERSION)/common$(PROEXT)/res$(UPDMINOREXT)
+SOLARCOMMONPCKDIR=$(SOLARVERSION)/common$(PROEXT)/pck$(UPDMINOREXT)
+SOLARCOMMONSDFDIR=$(SOLARVERSION)/common$(PROEXT)/sdf$(UPDMINOREXT)
 .IF "$(common_build)"==""
 SOLARCOMMONBINDIR=$(SOLARBINDIR)
 SOLARCOMMONRESDIR=$(SOLARRESDIR)
@@ -843,12 +818,37 @@ SOLARCOMMONSDFDIR=$(SOLARSDFDIR)
 
 .EXPORT : SOLARBINDIR
 
-.IF "$(PRE)"==""
-#JARDIR=$(CLASSDIR)
+L10N_MODULE*=$(SOLARSRC)$/l10n
+ALT_L10N_MODULE*=$(SOLARSRC)$/l10n_so
+
+.IF "$(WITH_LANG)"!=""
+.INCLUDE .IGNORE: $(L10N_MODULE)/localization_present.mk
+.INCLUDE .IGNORE: $(ALT_L10N_MODULE)/localization_present.mk
+
+# check for localizations not hosted in l10n module. if a file exists there
+# it won't in l10n
+.IF "$(ALT_LOCALIZATION_FOUND)"!=""
+TRYALTSDF:=$(ALT_L10N_MODULE)$/$(COMMON_OUTDIR)$(PROEXT)$/misc/sdf$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf
+LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYALTSDF) $(THEN) echo $(TRYALTSDF) $(FI)))
+.ENDIF			# "$(ALT_LOCALIZATION_FOUND)"!=""
+# if the l10n module exists, use split localize.sdf directly from there
+.IF "$(LOCALIZATION_FOUND)"!="" && "$(LOCALIZESDF)"==""
+# still check for existence as there may be no localization yet
+TRYSDF:=$(L10N_MODULE)$/$(COMMON_OUTDIR)$(PROEXT)$/misc/sdf$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf
+LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYSDF) $(THEN) echo $(TRYSDF) $(FI)))
+.ENDIF			# "$(LOCALIZATION_FOUND)"!="" && "$(LOCALIZESDF)"==""
+# else use localize.sdf from local output tree if localization .zip exists
+.IF  "$(LOCALIZESDF)"==""
+LOCALSDFFILE:=$(COMMONMISC)$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf
+LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip $(THEN) echo $(LOCALSDFFILE) $(FI)))
+.ENDIF			# "$(LOCALIZESDF)"==""
+# dummy target to keep the build happy.
+.IF  "$(LOCALIZESDF)"==""
+LOCALIZESDF:=$(COMMONMISC)$/$(PRJNAME)$/dummy$/localize.sdf
+.ENDIF			# "$(LOCALIZESDF)"==""
+.ENDIF			# "$(WITH_LANG)"!=""
+
 JARDIR=$(OUT)/class
-.ELSE
-JARDIR=$(PRE)/class
-.ENDIF
 
 # needs to be expanded!!!
 
@@ -891,9 +891,6 @@ UNOIDLDEFS+=-DSUPD=$(UPD) -DUPD=$(UPD)
 
 UNOIDLDEPFLAGS=-Mdepend=$(SOLARVER)
 
-.IF "$(PRE)"!=""
-UNOIDLINC!:=-I$(PRE)/idl $(UNOIDLINC)
-.ENDIF
 UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)/inc -I$(PRJ)/$(INPATH)/idl -I$(OUT)/inc -I$(SOLARIDLDIR) -I$(SOLARINCDIR)
 
 CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -D$(CPUNAME)
@@ -922,7 +919,6 @@ CDEFSDEBUG=-DDEBUG
 .ENDIF
 CDEFSDBGUTIL=-DDBG_UTIL
 CDEFSOPT=-DOPTIMIZE
-HDEFS=-D:$(GUI) -D:$(COM)
 
 MKDEPFLAGS+=-I$(INCDEPN:s/ / -I/:s/-I-I/-I/)
 MKDEPALLINC=$(SOLARINC:s/-I/ -I/)
@@ -1130,11 +1126,8 @@ RSCDEFS+=-DDBG_UTIL
 
 .IF "$(product)"!=""
 CDEFS+= -DPRODUCT -DNDEBUG
-HDEFS+= -D:PRODUCT
 RSCDEFS+= -DPRODUCT 
-CDEFS+=-DPRODUCT_FULL
-HDEFS+=-D:PRODUCT_FULL
-RSCDEFS+= -DPRODUCT_FULL -DNDEBUG
+RSCDEFS+= -DNDEBUG
 .ENDIF
 
 .IF "$(DBG_LEVEL)"!=""
@@ -1225,26 +1218,9 @@ STDLIB+=$(FILLUPARC)
 STDSHL+=$(FILLUPARC)
 .ENDIF			# "$(FILUPARC)"!=""
 
-.IF "$(DISABLE_JAVA)"==""
 .IF "$(SOLAR_JAVA)"!=""
 CDEFS+=$(JAVADEF)
 .ENDIF          # "$(SOLAR_JAVA)"!=""
-.ELSE           # "$(DISABLE_JAVA)"==""
-SOLAR_JAVA!:=
-.EXPORT : SOLAR_JAVA
-.IF "$(JDKPATH)"!=""
-environment_confusion:
-    @echo ----------------------------------------------------------
-    @echo -
-    @echo - Error!
-    @echo -
-    @echo - $$JDKPATH and $$DISABLE_JAVA are set. this will lead
-    @echo - to impropper results.
-    @echo -
-    @echo ----------------------------------------------------------
-    force_dmake_to_error
-.ENDIF          # "$(JDKPATH)"!=""
-.ENDIF          # "$(DISABLE_JAVA)"==""
 
 .INCLUDE .IGNORE: $(UPD)$(LAST_MINOR).mk
 
diff --git a/solenv/inc/shlinfo.rc b/solenv/inc/shlinfo.rc
index 07853e84862e..c114458617de 100644
--- a/solenv/inc/shlinfo.rc
+++ b/solenv/inc/shlinfo.rc
@@ -29,7 +29,7 @@
 #define LG_D 					// generate always german version
 #endif
 
-#define VER_FIRSTYEAR	2008
+#define VER_FIRSTYEAR	2010
 
 
 #if defined(OS2)
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index ca28d651989d..2330aa64e49b 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -55,9 +55,6 @@ target_empty=warn_target_empty
 INCEXT*=.
 INCPRE*=.
 INCPOST*=.
-.IF "$(PRE)"!=""
-ENVINCPRE+=-I$(PRE)/inc
-.ENDIF			# "$(PRE)"!=""
 .IF "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
 UNOINCLUDES=$(SOLARINCDIR)/offuh
 .ENDIF			# "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
@@ -66,9 +63,9 @@ SOLARINC+=$(JDKINCS)
 INCLUDE:=
 .EXPORT : INCLUDE
 .IF "$(PRJINC)"!=""
-INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
+INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
 .ELSE		# "$(PRJINC)"!=""
-INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
+INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
 .ENDIF		# "$(PRJINC)"!=""
 INCLUDE_C=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
 .EXPORT : LIB
@@ -1259,9 +1256,6 @@ CPPUMAKERFLAGS*=-L
 .IF "$(UNOTYPES)" != ""
 # makeing all in one
 .DIRCACHE=no
-.IF "$(ENVINCPRE)"!=""
-MKDEPFLAGS+=-I:$(ENVINCPRE)
-.ENDIF			# "$(ENVINCPRE))"!=""
 .IF "$(OBJFILES)"!=""
 $(OBJFILES) : $(UNOUCRTARGET)
 .ENDIF			# "$(OBJFILES)"!=""
@@ -1389,24 +1383,26 @@ $(UNIXTEXT) : $(UNIXTEXT:f)
 .ENDIF			# "$(UNIXTEXT)"!=""
 
 .IF "$(WITH_LANG)"!=""
-.IF "$(LOCALIZATION_FOUND)"==""
 .IF "$(LOCALIZESDF)"!=""
+
+# dummy target to keep the build happy if not even the .zip exists. localization tools deal with not existing
+# localize.sdf themself
+"$(LOCALIZESDF)%":
+    @echo $(LOCALIZESDF)
+    @@-$(MKDIRHIER) $(@:d)
+    $(TOUCH) $@
+
+.IF "$(LOCALIZATION_FOUND)"==""
+.IF "$(LOCALSDFFILE)"!=""
 "$(LOCALIZESDF)" : $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip
     @@-$(MKDIRHIER) $(@:d)
     @@-$(MKDIRHIER) $(COMMONMISC)/$(PRJNAME)_$(TARGET)
-    @@$(IFNOTEXIST) $(LOCALIZESDF) $(THEN) unzip -o -d $(COMMONMISC)/$(PRJNAME)_$(TARGET) $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip $(FI)
-    @@-cp -r $(COMMONMISC)/$(PRJNAME)_$(TARGET)/* $(COMMONMISC)/$(PRJNAME)
-    @@-$(RM) -rf $(COMMONMISC)/$(PRJNAME)_$(TARGET)
-.ENDIF			# "$(LOCALIZESDF)"!=""
+    @-unzip -o -d $(COMMONMISC)/$(PRJNAME) $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip $(subst,$(COMMONMISC)/$(PRJNAME)/, $@)
+    @@$(TOUCH) $@
+.ENDIF			# "$(LOCALSDFFILE)"!=""
 .ENDIF			# "$(LOCALIZATION_FOUND)"==""
-.ENDIF			# "$(WITH_LANG)"!=""
-
-.IF "$(LOCALIZESDF)"!=""
-"$(LOCALIZESDF)%" :
-    echo $(LOCALIZESDF)
-    @@-$(MKDIRHIER) $(@:d)
-    @$(TOUCH) $(LOCALIZESDF)
 .ENDIF			# "$(LOCALIZESDF)"!=""
+.ENDIF			# "$(WITH_LANG)"!=""
 
 .IF "$(EXTUPDATEINFO_NAME)"!=""
 $(EXTUPDATEINFO_DEST) : $(EXTUPDATEINFO_SOURCE)
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index 5318f2d8350b..bb5402813282 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -68,6 +68,9 @@ fake_root_dir=/$(TARFILE_NAME)
 fake_back=../
 .ENDIF "$(TARFILE_IS_FLAT)" != ""
 
+TARFILE_LOCATION*=$(BACK_PATH)$(fake_back)download
+TARFILE_LOCATION2=$(eq,$(BACK_PATH)$(fake_back)download,$(TARFILE_LOCATION) $(PRJ)/download $(TARFILE_LOCATION))
+
 P_CONFIGURE_DIR=$(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$(CONFIGURE_DIR)
 P_BUILD_DIR=$(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$(BUILD_DIR)
 P_INSTALL_DIR=$(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$(BUILD_DIR)
@@ -112,56 +115,56 @@ clean:
     $(COMMAND_ECHO)cd $(P_BUILD_DIR) && $(BUILD_ACTION) $(BUILD_FLAGS) clean
     $(COMMAND_ECHO)$(RM) $(PACKAGE_DIR)/$(BUILD_FLAG_FILE)
 
-$(MISC)/%.unpack : $(PRJ)/download/%.tar.bz2
+$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.bz2
     @-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := sh -c "bzip2 -cd $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ")
+    @noop $(assign UNPACKCMD := sh -c "bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ")
 .ELSE			# "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := bzip2 -cd $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
+    @noop $(assign UNPACKCMD := bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
 .ENDIF			# "$(GUI)"=="UNX"
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
-$(MISC)/%.unpack : $(PRJ)/download/%.tar.Z
+$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.Z
     @-$(RM) $@
 .IF "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := sh -c "uncompress -c $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar.Z | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ")
+    @noop $(assign UNPACKCMD := sh -c "uncompress -c $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.Z | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ")
 .ELSE			# "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := uncompress -c $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar.Z | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
+    @noop $(assign UNPACKCMD := uncompress -c $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.Z | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
 .ENDIF			# "$(GUI)"=="UNX"
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
-$(MISC)/%.unpack : $(PRJ)/download/%.tar.gz
+$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.gz
     @-$(RM) $@
-    @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar.gz) $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
+    @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.gz) $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
-$(MISC)/%.unpack : $(PRJ)/download/%.tgz
+$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tgz
     @-$(RM) $@
-    @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tgz) $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
+    @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_NAME).tgz) $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
-$(MISC)/%.unpack : $(PRJ)/download/%.tar
+$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar
     @-$(RM) $@
-    @noop $(assign UNPACKCMD := $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar)
+    @noop $(assign UNPACKCMD := $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f $(TARFILE_LOCATION)/$(TARFILE_NAME).tar)
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
-$(MISC)/%.unpack : $(PRJ)/download/%.zip
+$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.zip
     @-$(RM) $@
-    @noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).zip)
+    @noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o $(TARFILE_LOCATION)/$(TARFILE_NAME).zip)
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
-$(MISC)/%.unpack : $(PRJ)/download/%.jar
+$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.jar
     @-$(RM) $@
 .IF "$(OS)"=="SOLARIS"
-    @noop $(assign UNPACKCMD := jar xf $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).jar)
+    @noop $(assign UNPACKCMD := jar xf $(TARFILE_LOCATION)/$(TARFILE_NAME).jar)
 .ELSE			# "$(OS)"=="SOLARIS"
-    @noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).jar)
+    @noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o $(TARFILE_LOCATION)/$(TARFILE_NAME).jar)
 .ENDIF			# "$(OS)"=="SOLARIS"
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
diff --git a/solenv/inc/tg_help.mk b/solenv/inc/tg_help.mk
new file mode 100755
index 000000000000..a8a33051f0fc
--- /dev/null
+++ b/solenv/inc/tg_help.mk
@@ -0,0 +1,86 @@
+#*************************************************************************
+#
+# 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.pmk,v $
+#
+# $Revision: 1.25 $
+#
+# 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.
+#
+#*************************************************************************
+
+# to make it usable with special lang selection of
+# helpcontent2
+
+aux_alllangiso*:=$(alllangiso)
+
+SHELL_PACKAGE:=$(subst,/,$/ $(PACKAGE))
+HLANGXHPFILES:=$(foreach,i,$(XHPFILES) $(foreach,j,$(aux_alllangiso) $(COMMONMISC)$/$j$/$(SHELL_PACKAGE)$/$(i:f)))
+
+ALLTAR : $(COMMONMISC)$/$(TARGET).done $(COMMONMISC)$/xhp_changed.flag optix
+
+$(HLANGXHPFILES) : $$(@:d)thisdir.created
+
+$(COMMONMISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp
+    @$(TOUCH) $@
+# internal dependencies not sufficient to trigger merge?
+#    @$(NULL)
+
+
+$(COMMONMISC)$/$(TARGET).done : $(HLANGXHPFILES)
+.IF "$(WITH_LANG)"!=""
+    $(AUGMENT_LIBRARY_PATH) $(HELPEX) -QQ -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@
+.ELSE			# "$(WITH_LANG)"!=""
+    cp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES)))) $(COMMONMISC)$/en-US$/$(SHELL_PACKAGE) && $(TOUCH) $@
+.ENDIF			# "$(WITH_LANG)"!=""
+.IF "$(OS)"=="SOLARIS"
+    @$(ECHONL) " "
+.ELSE			# "$(OS)"=="SOLARIS"
+    @$(ECHONL)
+.ENDIF			# "$(OS)"=="SOLARIS"
+
+$(COMMONMISC)$/xhp_changed.flag : $(HLANGXHPFILES)
+    @$(TOUCH) $@
+
+# urks - dmake mixes up operators and strings :-(
+.IF "$(HLANGXHPFILES:s/defined/xxx/)"!=""
+
+.IF "$(HELPTRANSPHONY)"!=""
+$(COMMONMISC)$/$(TARGET).done .PHONY :
+.ELSE           # "$(HELPTRANSPHONY)"!=""
+
+$(COMMONMISC)$/$(TARGET).done : makefile.mk
+.IF "$(WITH_LANG)"!=""
+$(COMMONMISC)$/$(TARGET).done : $(LOCALIZESDF)
+.ENDIF			# "$(WITH_LANG)"!=""
+.ENDIF          # "$(HELPTRANSPHONY)"!=""
+.ENDIF          # "$(HLANGXHPFILES)"!=""
+
+optix: $(COMMONMISC)$/$(TARGET).done
+    @echo done
+
+%.created :
+    @@-$(MKDIRHIER) $(@:d)
+    @$(TOUCH) $@
+
+
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index 496e95926981..8cb6653f334e 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -133,9 +133,7 @@ $(USE_SHL$(TNR)VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL$(TNR)VERSIONMAP)"!=""
 
-.IF "$(OS)"!="IRIX"
 SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP)
-.ENDIF
 
 $(USE_SHL$(TNR)VERSIONMAP): \
                     $(SHL$(TNR)OBJS)\
@@ -172,9 +170,7 @@ $(USE_SHL$(TNR)VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL$(TNR)VERSIONMAP)"!=""
 USE_SHL$(TNR)VERSIONMAP=$(MISC)/$(SHL$(TNR)VERSIONMAP:b)_$(SHL$(TNR)TARGET)$(SHL$(TNR)VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
 SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP)
-.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL$(TNR)VERSIONMAP): $(SHL$(TNR)OBJS) $(SHL$(TNR)LIBS)
@@ -222,11 +218,7 @@ $(USE_SHL$(TNR)VERSIONMAP): $(SHL$(TNR)VERSIONMAP)
 .IF "$(UNIXVERSIONNAMES)"!=""
 .IF "$(OS)"!="MACOSX"
 .IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL$(TNR)SONAME=$(SONAME_SWITCH)$(SHL$(TNR)TARGETN:f)
-.ELSE
 SHL$(TNR)SONAME=\"$(SONAME_SWITCH)$(SHL$(TNR)TARGETN:f)\"
-.ENDIF
 .ENDIF			# "$(GUI)"!="UNX"
 .ENDIF			# "$(OS)"!="MACOSX"
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
diff --git a/solenv/inc/tg_srs.mk b/solenv/inc/tg_srs.mk
index 9a8ec8bb72c2..3d79bd932b00 100644
--- a/solenv/inc/tg_srs.mk
+++ b/solenv/inc/tg_srs.mk
@@ -59,7 +59,7 @@ $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESD
     @echo "Making:   " $(@:f)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+    $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
     $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
diff --git a/solenv/inc/tg_wntx64.mk b/solenv/inc/tg_wntx64.mk
index def76718733e..987b81276748 100644
--- a/solenv/inc/tg_wntx64.mk
+++ b/solenv/inc/tg_wntx64.mk
@@ -484,16 +484,25 @@ $(SHL2IMPLIBN_X64):	\
 .ENDIF 			# "$(SHL2TARGETN_X64)"!=""
 
 
+$(SLO_X64)/%.obj : %.cpp
+    @echo ------------------------------
+    @echo Making: $@
+    @@-$(RM) $@ >& $(NULLDEV)
+    -$(MKDIR) $(@:d)
+    @-$(MKDIR) $(MISC_X64)
+    $(CAPTURE_COMMAND) $(CXX_X64) $(USE_CFLAGS_X64) $(INCLUDE_X64) $(CFLAGSCXX_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp $(CAPTURE_OUTPUT)
 
 $(SLO_X64)/%.obj : %.cxx
     @echo Making: $@
     @@-$(RM) $@ >& $(NULLDEV)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
+    $(COMMAND_ECHO)@-$(MKDIR) $(MISC_X64)
     $(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX_X64) $(USE_CFLAGS_X64) $(INCLUDE_X64) $(CFLAGSCXX_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
 
 $(SLO_X64)/%.obj : $(MISC)/%.c
     @echo Making: $@
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
+    $(COMMAND_ECHO)@-$(MKDIR) $(MISC_X64)
     @@-$(RM) $@
     @$(TYPE) $(mktmp $(CC_X64) $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(MISC)/$*.c )
     @$(ECHONL)
@@ -502,9 +511,8 @@ $(SLO_X64)/%.obj : $(MISC)/%.c
 $(SLO_X64)/%.obj : %.c
     @echo Making: $@
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
+    $(COMMAND_ECHO)@-$(MKDIR) $(MISC_X64)
     @@-$(RM) $@
     $(COMMAND_ECHO)$(CC_X64) @$(mktmp $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $*.c )
 
 .ENDIF			# "$(BUILD_X64)"!=""
-
-BUILD64=1
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index 718e23c01b4e..36e5cd70447f 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -151,18 +151,6 @@
 .INCLUDE : unxfbsd.mk
 .ENDIF
 
-.IF "$(COM)$(OS)$(CPU)" == "C730IRIXM"
-.INCLUDE : unxirxm3.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCIRIXM"
-.INCLUDE : unxirgm.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "C710IRIXM"
-.INCLUDE : unxirxm.mk
-.ENDIF
-
 .IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
 .INCLUDE : unxmacxp.mk
 .ENDIF
@@ -179,6 +167,10 @@
 .INCLUDE : unxlngm68k.mk
 .ENDIF
 
+.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXH"
+.INCLUDE : unxlnghppa.mk
+.ENDIF
+
 # --- general *ix settings ---
 HC=hc
 HCFLAGS=
diff --git a/solenv/inc/unxfbsdx.mk b/solenv/inc/unxfbsdx.mk
index 61edc8dcaf51..62817d5604fc 100644
--- a/solenv/inc/unxfbsdx.mk
+++ b/solenv/inc/unxfbsdx.mk
@@ -50,3 +50,4 @@ CFLAGSOPT=   					# no optimizing for non products
 
 # platform specific identifier for shared libs
 DLLPOSTFIX=fx
+BUILD64=1
diff --git a/solenv/inc/unxirgm.mk b/solenv/inc/unxirgm.mk
deleted file mode 100644
index b3abfb76d2c3..000000000000
--- a/solenv/inc/unxirgm.mk
+++ /dev/null
@@ -1,163 +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: unxirgm.mk,v $
-#
-# $Revision: 1.15 $
-#
-# 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.
-#
-#*************************************************************************
-
-
-# Makefile for IRIX/mips using GNU compilers 2.95.2 for n32 ABI
-ASM=
-AFLAGS=
-
-SOLAR_JAVA=TRUE
-JAVADEF=-DSOLAR_JAVA
-#JAVAFLAGSDEBUG=-g
-
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-
-CC= gcc
-CXX= g++
-CFLAGS=-c
-CDEFS+= -D_PTHREADS -DSTLPORT_VERSION=0x450 -D_USE_NAMESPACE=1 -DNEW_SOLAR
-CFLAGSCC=$(ARCH_FLAGS)
-CFLAGSCXX=$(ARCH_FLAGS)
-PICSWITCH:=-fpic
-
-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-CFLAGSOBJGUIMT=
-# Compiler flags for compiling static object in multi threaded environment with character user interface
-CFLAGSOBJCUIMT=
-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-CFLAGSSLOGUIMT=$(PICSWITCH)
-# Compiler flags for compiling shared object in multi threaded environment with character user interface
-CFLAGSSLOCUIMT=$(PICSWITCH)
-# Compiler flags for profiling
-CFLAGSPROF=
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL= 
-# Compiler flags for enabling optimizations
-CFLAGSOPT=-O2
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-CFLAGSWARNCC=-w
-CFLAGSWALLCC=-Wall
-CFLAGSWERRCC=-Werror
-
-# exception flags
-CFLAGSEXCEPTIONS=-fexceptions
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-
-STATIC=			-Wl,-Bstatic
-DYNAMIC=		-Wl,-Bdynamic
-
-#
-# To use the map files, you need to have a gcc_specs file which contains:
-# *linker:
-# /path/to/bin/ld.sh
-# where ld.sh is a wrapper script that does some conversion of the
-# map files on the fly.
-#
-LINK= g++
-LINKFLAGS=	-L/usr/lib32 -Wl,-no_unresolved
-LINKVERSIONMAPFLAG= -Wl,-exports_file
-
-LINKFLAGSAPPGUI= $(THREADLIB)
-LINKFLAGSAPPCUI= $(THREADLIB)
-LINKFLAGSSHLGUI= $(THREADLIB)
-LINKFLAGSSHLCUI= $(THREADLIB)
-
-LINKFLAGSAPPGUI+= -Wl,-multigot
-LINKFLAGSAPPCUI+= -Wl,-multigot
-LINKFLAGSSHLGUI+= -shared 
-LINKFLAGSSHLCUI+= -shared
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG= -g
-LINKFLAGSOPT=
-
-LINKFLAGSSHLGUI += -Wl,-Bsymbolic
-LINKFLAGSSHLCUI += -Wl,-Bsymbolic
-
-APPLINKSTATIC=-Bstatic
-APPLINKSHARED=-Bsymbolic
-
-SONAME_SWITCH = -Wl,-soname -Wl,
-
-# Sequence of libraries DOES matter!
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-STDLIBGUIMT=	$(THREADLIB) $(DYNAMIC) -lX11 -lm -lgcc -lc
-STDLIBCUIMT=	$(THREADLIB) $(DYNAMIC) -lgcc -lc -lm
-STDSHLGUIMT=	-L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lm -lgcc -lc
-STDSHLCUIMT=	-L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lm -lgcc -lc
-THREADLIB=		-lpthread
-
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlport
-LIBSTLPORTST= -lstlport
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST= -lstlport_gcc
-.ENDIF
-
-LIBMGR=			ar
-LIBFLAGS=		-r
-
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=				irc
-RCFLAGS=		-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPOSTFIX=		im
-DLLPRE=			lib
-DLLPOST=		.so
-
-
-LDUMP=c++filt
diff --git a/solenv/inc/unxirxm.mk b/solenv/inc/unxirxm.mk
deleted file mode 100644
index 80aae3d5b382..000000000000
--- a/solenv/inc/unxirxm.mk
+++ /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: unxirxm.mk,v $
-#
-# $Revision: 1.10 $
-#
-# 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.
-#
-#*************************************************************************
-
-# mak-file for IRIX/mips
-ASM=
-AFLAGS=
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-
-#
-# Zu den Compilerflags:
-#
-# -ptused :		instantisiert Templates, wenn sie benutzt werden.
-#				Der Schalter wurde neu eingefuegt, weil sich eine 
-#				statische Memberfunktion nicht instantisieren liess.
-#				(ts&sdo/10.06.98)
-#
-CC=			cc -KPIC -c -n32
-CXX=		CC -KPIC -c -n32 -ptused -OPT:Olimit=20523 
-CDEFS+=-D_PTHREADS
-CDEFS+=	-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
-# 1009    ...nested comment is not allowed...
-# 1021    ...type qualifiers are meaningless in this declaration...
-# 1107    ...signed bit field of length 1...
-# 1110    ...statement not reached...
-# 1155    ...unrecognized #pragma...
-# 1171    ...expression has no effect...
-# 1183    ...comparison of unsigned integer with zero... 
-# 1185    ...enumerated type mixed with another type... 
-# 1188    ...type qualifier is meaningless on cast type... 
-# 1233    ...explicit type is missing ("int" assumed)...
-# 1234    ...access control not specified...
-# 1257    ...NULL reference is not allowed...
-# 1440    ...initial value of reference to non-const must be an lvalue...
-# 1516    ...pointless comparison of unsigned integer with a negative constant
-# 1681    ...virtual function override intended...
-# 1682    ...is only partially overridden in class...
-CFLAGSCC=	-Xcpluscomm -woff 1009,1021,1107,1110,1155,1171,1183,1185,1188,1233,1234,1257,1440,1516,1681,1682 $(ARCH_FLAGS)
-CFLAGSCXX=	-woff 1009,1021,1107,1110,1155,1171,1183,1185,1188,1233,1234,1257,1440,1516,1681,1682 $(ARCH_FLAGS)
-CFLAGSOBJGUIMT=
-CFLAGSOBJCUIMT=
-CFLAGSSLOGUIMT=
-CFLAGSSLOCUIMT=
-CFLAGSPROF=
-CFLAGSDEBUG=	-g
-CFLAGSDBGUTIL=
-CFLAGSOPT=		-O
-CFLAGSNOOPT=
-CFLAGSOUTOBJ=	-o
-
-STATIC=			-B static
-DYNAMIC=		-B dynamic
-
-#
-# Zu den Linkflags:
-#
-# -update_registry <file> :	fuer das Linken mehrerer shared Libraries 
-#				erforderlich. 
-#				**FUER LOKALE STAENDE FEHLT Z.ZT. EIN GULTIGER 
-#				MECHANISMUS**					
-#
-LINK=			CC
-LINKFLAGS=		
-LINKFLAGSAPPGUI=-n32 -multigot
-LINKFLAGSSHLGUI=-B symbolic -soname $(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOSTFIX)$(DLLPOST) $(DYNAMIC) -shared -n32 -multigot -update_registry $(SOLARLIBDIR)/so_locations
-LINKFLAGSAPPCUI=-n32 -multigot
-LINKFLAGSSHLCUI=-B symbolic -soname $(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOSTFIX)$(DLLPOST) $(DYNAMIC) -shared -n32 -multigot -update_registry $(SOLARLIBDIR)/so_locations
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=
-LINKFLAGSOPT=
-APPLINKSTATIC=-Bstatic
-APPLINKSHARED=-Bsymbolic
-
-# Reihenfolge der Libraries NICHT egal!
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-# STDLIBGUIMT=	$(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
-STDLIBGUIMT=	$(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
-STDLIBCUIMT=	$(THREADLIB) $(DYNAMIC) -lc -lm
-# STDSHLGUIMT=	-L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
-STDSHLGUIMT=	-L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
-STDSHLCUIMT=	-L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lc -lm
-THREADLIB=		-lpthread
-
-LIBMGR=			ar
-LIBFLAGS=		-r
-# LIBEXT=		.so
-
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=				irc
-RCFLAGS=		-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPOSTFIX=		im
-.IF "$(WORK_STAMP)"=="MIX364"
-DLLPOSTFIX=
-.ENDIF
-DLLPRE=			lib
-DLLPOST=		.so
-
-
-LDUMP=
-
-
-# --------------------------
-# AUS DEM ALTEN ENVIRONMENT:
-# --------------------------
-#
-# Linken einer statischen Library:
-#	ar -r ...
-#
-# Linken einer shared Library:
-#	CC -B symbolic -soname <...> -B dynamic -shared -n32 -multigot
-#		-update_registry <...> ...
-#
-# Linken einer Applikation mit statischen Librarys:
-#	CC -B static ...
-#
-# Linken einer Applikation mit stared Librarys:
-#	CC -n32 -multigot ...
-#
-
diff --git a/solenv/inc/unxirxm3.mk b/solenv/inc/unxirxm3.mk
deleted file mode 100644
index 8d24d2c54032..000000000000
--- a/solenv/inc/unxirxm3.mk
+++ /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: unxirxm3.mk,v $
-#
-# $Revision: 1.12 $
-#
-# 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.
-#
-#*************************************************************************
-
-
-# Makefile for IRIX/mips
-ASM=
-AFLAGS=
-
-SOLAR_JAVA*=TRUE
-JAVADEF=-DSOLAR_JAVA
-#JAVAFLAGSDEBUG=-g
-
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-
-CC= cc
-CXX= CC
-CFLAGS= -c
-CDEFS+= -DSTLPORT_VERSION=0x450 -D_USE_NAMESPACE=1 -DNEW_SOLAR
-CFLAGSCC=$(ARCH_FLAGS)
-CFLAGSCXX=      -LANG:ansi-for-init-scope=OFF -LANG:std=ON -LANG:libc_in_namespace_std=ON $(ARCH_FLAGS)
-
-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-CFLAGSOBJGUIMT=
-# Compiler flags for compiling static object in multi threaded environment with character user interface
-CFLAGSOBJCUIMT=
-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-CFLAGSSLOGUIMT=-KPIC
-# Compiler flags for compiling shared object in multi threaded environment with character user interface
-CFLAGSSLOCUIMT=-KPIC
-# Compiler flags for profiling
-CFLAGSPROF=
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-# Compiler flags for enabling optimizations
-CFLAGSOPT=-O2
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-CFLAGSWARNCC=-w
-CFLAGSWALLCC=-fullwarn
-CFLAGSWERRCC=
-
-# exception flags
-CFLAGSEXCEPTIONS=-LANG:exceptions=ON
-CFLAGS_NO_EXCEPTIONS=-LANG:exceptions=OFF
-#CFLAGS_NO_EXCEPTIONS=
-
-STATIC=                 -Wl,-Bstatic
-DYNAMIC=                -Wl,-Bdynamic
-
-#
-# To use the map files, you need to have a gcc_specs file which contains:
-# *linker:
-# /path/to/bin/ld.sh
-# where ld.sh is a wrapper script that does some conversion of the
-# map files on the fly.
-#
-LINK= CC
-LINKFLAGS=      -L/usr/lib32 -Wl,-no_unresolved
-LINKVERSIONMAPFLAG= -Wl,-exports_file
-
-LINKFLAGSAPPGUI= $(THREADLIB)
-LINKFLAGSAPPCUI= $(THREADLIB)
-LINKFLAGSSHLGUI= $(THREADLIB)
-LINKFLAGSSHLCUI= $(THREADLIB)
-
-LINKFLAGSAPPGUI+= -Wl,-multigot
-LINKFLAGSAPPCUI+= -Wl,-multigot
-LINKFLAGSSHLGUI+= -shared
-LINKFLAGSSHLCUI+= -shared
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG= -g
-LINKFLAGSOPT=
-
-LINKFLAGSSHLGUI += -Wl,-Bsymbolic
-LINKFLAGSSHLCUI += -Wl,-Bsymbolic
-
-APPLINKSTATIC=-Bstatic
-APPLINKSHARED=-Bsymbolic
-
-SONAME_SWITCH = -Wl,-soname -Wl,
-
-# Sequence of libraries DOES matter!
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-STDLIBGUIMT=    $(THREADLIB) $(DYNAMIC) -lX11 -lm -lc
-STDLIBCUIMT=    $(THREADLIB) $(DYNAMIC) -lc -lm
-STDSHLGUIMT=    -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lm -lc
-STDSHLCUIMT=    -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lm -lc
-THREADLIB=              -lpthread
-
-#LIBSTLPORT=$(DYNAMIC) -lstlport_mipspro
-LIBSTLPORT=$(DYNAMIC)
-LIBSTLPORTST=
-#LIBSTLPORTST= -lstlport_mipspro
-
-LIBMGR=                 ar
-LIBFLAGS=               -r
-
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=                             irc
-RCFLAGS=                -fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPOSTFIX=             im
-DLLPRE=                 lib
-DLLPOST=                .so
-
-
-LDUMP=c++filt
-
-
diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk
index a79d3e47c6cf..b6c8f798a5f9 100644
--- a/solenv/inc/unxlng.mk
+++ b/solenv/inc/unxlng.mk
@@ -47,7 +47,7 @@ JAVAFLAGSDEBUG=-g
 #LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
 
 # _PTHREADS is needed for the stl
-CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
+CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
 
 # enable visibility define in "sal/types.h"
 .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
@@ -208,12 +208,14 @@ LINKFLAGS += -Wl,-zdynsort
 .ENDIF
 
 # libraries for linking applications
-STDLIBGUIMT+=-Wl,--as-needed -lX11 -ldl -lpthread -lm -Wl,--no-as-needed
+STDLIBGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
 STDLIBCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
 # libraries for linking shared libraries
-STDSHLGUIMT+=-Wl,--as-needed -lX11 -lXext -ldl -lpthread -lm -Wl,--no-as-needed
+STDSHLGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
 STDSHLCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
 
+X11LINK_DYNAMIC = -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed
+
 LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
 
 .IF "$(USE_STLP_DEBUG)" != ""
diff --git a/solenv/inc/unxlnga.mk b/solenv/inc/unxlnga.mk
index 6baf600fee35..2f18fe7b43c6 100644
--- a/solenv/inc/unxlnga.mk
+++ b/solenv/inc/unxlnga.mk
@@ -33,5 +33,5 @@
 
 .INCLUDE : unxlng.mk
 CFLAGS+=-DIA64
-CFLAGSCXX+=-fno-use-cxa-atexit
 DLLPOSTFIX=la
+BUILD64=1
diff --git a/solenv/inc/unxlnghppa.mk b/solenv/inc/unxlnghppa.mk
new file mode 100644
index 000000000000..240eef609365
--- /dev/null
+++ b/solenv/inc/unxlnghppa.mk
@@ -0,0 +1,39 @@
+#*************************************************************************
+#
+# 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: unxlnghppa.mk,v $
+#
+# $Revision: 1.2 $
+#
+# 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.
+#
+#*************************************************************************
+
+# mk file for Unix Linux HPPA using GCC, please make generic modifications to unxlng.mk
+PICSWITCH:=-fPIC
+.INCLUDE : unxlng.mk
+CDEFS+=-DHPPA
+CFLAGS+=
+CFLAGSCC+=
+CFLAGSCXX+=
+DLLPOSTFIX=lh
diff --git a/solenv/inc/unxlngm68k.mk b/solenv/inc/unxlngm68k.mk
index a206d61543b2..25d5118839e4 100644
--- a/solenv/inc/unxlngm68k.mk
+++ b/solenv/inc/unxlngm68k.mk
@@ -37,5 +37,5 @@ PICSWITCH:=-fPIC
 CDEFS+=-DM68K
 CFLAGS+=-fsigned-char -fno-omit-frame-pointer
 CFLAGSCC+=-fsigned-char
-CFLAGSCXX+=-fsigned-char -fno-use-cxa-atexit
+CFLAGSCXX+=-fsigned-char
 DLLPOSTFIX=lm
diff --git a/solenv/inc/unxlngr.mk b/solenv/inc/unxlngr.mk
index 8a82cefb0b14..b108888d190b 100644
--- a/solenv/inc/unxlngr.mk
+++ b/solenv/inc/unxlngr.mk
@@ -35,5 +35,4 @@ CDEFAULTOPT=-Os
 .INCLUDE : unxlng.mk
 CDEFS+=-DARM32
 CFLAGS+=-fno-omit-frame-pointer
-CFLAGSCXX+=-fno-use-cxa-atexit
 DLLPOSTFIX=lr
diff --git a/solenv/inc/unxlngx.mk b/solenv/inc/unxlngx.mk
index 5bb9f5b198b2..ba74a55cfdc3 100644
--- a/solenv/inc/unxlngx.mk
+++ b/solenv/inc/unxlngx.mk
@@ -33,7 +33,6 @@
 
 .INCLUDE : unxlng.mk
 CDEFS+=-DX86_64
-CFLAGSCXX+=-fno-use-cxa-atexit
 MODULES_WITH_WARNINGS+=\
     svx
 DLLPOSTFIX=lx
diff --git a/solenv/inc/unxmacxi.mk b/solenv/inc/unxmacxi.mk
index 6d27121366e5..09d5d424b690 100644
--- a/solenv/inc/unxmacxi.mk
+++ b/solenv/inc/unxmacxi.mk
@@ -55,7 +55,6 @@ CFLAGSENABLESYMBOLS=-g
 
 .IF "$(SNOW_LEOPARD_10_4)"!=""
 JAVACOMPILER+=-target 1.5
-DYLD_INSERT_LIBRARIES=/usr/lib/libsqlite3.dylib
 .EXPORT: DYLD_INSERT_LIBRARIES
 .ENDIF # "$(SNOW_LEOPARD_10_4)"!=""
 
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk
index afcea59a9971..c4c777376561 100644
--- a/solenv/inc/unxsoli4.mk
+++ b/solenv/inc/unxsoli4.mk
@@ -199,7 +199,7 @@ STDSHLCUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc
 # libdl.so - no really an GUI library but required in this context
 STDLIBGUIMT+=-ldl
 STDSHLGUIMT+=-ldl
-X11LINK_DYNAMIC = -lX11
+X11LINK_DYNAMIC = -lXext -lX11
 
 # @@@ interposer needed for -Bdirect @@@
 # LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk
index a28b097e13b4..67bafa3a1c14 100644
--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -205,7 +205,7 @@ STDSHLCUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc
 # libdl.so - no really an GUI library but required in this context
 STDLIBGUIMT+=-ldl
 STDSHLGUIMT+=-ldl
-X11LINK_DYNAMIC = -lX11
+X11LINK_DYNAMIC = -lXext -lX11
 
 # @@@ interposer needed for -Bdirect @@@
 # LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract
diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc
index 6de6b3c99763..048b59205e08 100644
--- a/solenv/inc/version.hrc
+++ b/solenv/inc/version.hrc
@@ -38,8 +38,8 @@
 #define VER_FINAL       0

 

 #define VER_DAY         1

-#define VER_MONTH       9

-#define VER_YEAR        2009

+#define VER_MONTH       1

+#define VER_YEAR        2010

 

 #ifndef VER_FIRSTYEAR

 #define VER_FIRSTYEAR   VER_YEAR

diff --git a/solenv/inc/version_so.hrc b/solenv/inc/version_so.hrc
index 6eb9a183d6bd..852af90168b0 100644
--- a/solenv/inc/version_so.hrc
+++ b/solenv/inc/version_so.hrc
@@ -38,8 +38,8 @@
 #define VER_FINAL       0

 

 #define VER_DAY         1

-#define VER_MONTH       9

-#define VER_YEAR        2009

+#define VER_MONTH       1

+#define VER_YEAR        2010

 

 #ifndef VER_FIRSTYEAR

 #define VER_FIRSTYEAR   VER_YEAR

diff --git a/soltools/adjustvisibility/makefile.mk b/soltools/adjustvisibility/makefile.mk
index a4963b2eb071..4c8f03942793 100644..100755
--- a/soltools/adjustvisibility/makefile.mk
+++ b/soltools/adjustvisibility/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # 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
@@ -53,6 +53,9 @@ DEPOBJFILES	=	$(APP1OBJ)
 APP1STDLIBS =   -lelf
 APP1RPATH   =   NONE
 
+#APP1STDLIBS+=-lstlport
+APP1STDLIBS+=-lCstd
+
 .ENDIF "$(OS)"=="SOLARIS"
 
 # --- Targets ------------------------------------------------------
diff --git a/soltools/mkdepend/collectdircontent.cxx b/soltools/mkdepend/collectdircontent.cxx
index 95cd3da8d857..691996d56cca 100755
--- a/soltools/mkdepend/collectdircontent.cxx
+++ b/soltools/mkdepend/collectdircontent.cxx
@@ -64,7 +64,7 @@ bool IncludesCollection::exists(string filePath) {
     } else {
         return true;
     };
-    return false;
+    //return false;
 };
 
 extern "C" {
diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c
index de5b66256d1e..a786f5a4d7f6 100644
--- a/soltools/mkdepend/main.c
+++ b/soltools/mkdepend/main.c
@@ -718,8 +718,9 @@ void redirect(line, makefile)
 #if defined(USGISH) || defined(_SEQUENT_) || defined(USE_CHMOD)
     chmod(makefile, st.st_mode);
 #else
-        fchmod(fileno(fdout), st.st_mode);
+    fchmod(fileno(fdout), st.st_mode);
 #endif /* USGISH */
+    fclose(fdin);
 }
 
 #if NeedVarargsPrototypes
diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk
index ca6f57ef1c7b..af4bae825601 100644..100755
--- a/soltools/mkdepend/makefile.mk
+++ b/soltools/mkdepend/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # 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
@@ -37,6 +37,7 @@ LIBTARGET=NO
 # noadjust here to have dependencies over there
 noadjust=TRUE
 nodep=true
+ENABLE_EXCEPTIONS=TRUE
 
 # "mkdepend" is written in K&R style C. Modern compilers will generate
 # lots of warning. There is no point in cleaning this up, so we just
@@ -49,7 +50,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
 LIBSALCPPRT=
 UWINAPILIB=
 
-CDEFS+=-DNO_X11 -DXP_PC -DHW_THREADS
+CDEFS+=-DNO_X11 -DXP_PC -DHW_THREADS  
 
 OBJFILES=  \
         $(OBJ)$/cppsetup.obj \
@@ -65,6 +66,21 @@ APP1TARGET=makedepend
 APP1OBJS=$(OBJFILES)
 APP1RPATH=NONE
 
+.IF "$(COM)"=="MSC"
+.IF "$(dbgutil)"==""
+APP1STDLIBS+=msvcprt.lib
+.ELSE
+APP1STDLIBS+=msvcprtd.lib
+CDEFS+=-D_DEBUG
+.ENDIF                        # "$(DBG_UTIL)"==""
+.ENDIF                        # "$(COM)"=="MSC"
+
+.IF "$(OS)"=="SOLARIS"
+#APP1STDLIBS+=-lstlport
+APP1STDLIBS+=-lCstd
+.ENDIF
+
+
 .INCLUDE : target.mk
 
 
diff --git a/soltools/prj/build.lst b/soltools/prj/build.lst
index 0a3ed598db0e..3c4e50eb0cda 100644
--- a/soltools/prj/build.lst
+++ b/soltools/prj/build.lst
@@ -1,4 +1,4 @@
-so  soltools :   stlport SUN:so_prereq NULL
+so  soltools :   SUN:so_prereq NULL
 so	soltools								usr1	-	all	so_usr1 NULL
 so	soltools\inc							get	-	all	so_inc NULL
 so	soltools\ldump							nmake	-	all	so_ldump so_mkdep NULL
diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk
index ad80f13bf8b9..a119dd844472 100644..100755
--- a/soltools/util/makefile.pmk
+++ b/soltools/util/makefile.pmk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # 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
@@ -34,3 +34,19 @@ MAKEDEPEND=$(AUGMENT_LIBRARY_PATH) $(BIN)$/makedepend
 
 # find 'adjustvisibility' in own output tree
 ADJUSTVISIBILITY=$(AUGMENT_LIBRARY_PATH) $(BIN)$/adjustvisibility
+
+# avoid STLPort
+NO_DEFAULT_STL=TRUE
+SOLARINC!:=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(SOLARINC))
+
+.IF "$(OS)"=="SOLARIS"
+# hack due to #i53089#
+.IF "$(COMPATH:+"x")" != "$(COMPATH:+"x":s/binx//)"
+HELP_COMPATH:=$(subst,/binx, $(COMPATH:+"x"))
+.ELSE			# "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx"
+HELP_COMPATH:=$(COMPATH)
+.ENDIF			# "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx"
+#SOLARINC+=-I$(HELP_COMPATH)/prod/include/CC/stlport4
+#SOLARLIB+=-L$(HELP_COMPATH)/prod/lib/stlport4
+SOLARINC+=-I$(HELP_COMPATH)/prod/include/CC/Cstd
+.ENDIF
diff --git a/splitbuild/base.lst b/splitbuild/base.lst
new file mode 100644
index 000000000000..cda4527f3496
--- /dev/null
+++ b/splitbuild/base.lst
@@ -0,0 +1 @@
+reportdesign dbaccess
diff --git a/splitbuild/binfilter.lst b/splitbuild/binfilter.lst
new file mode 100644
index 000000000000..1baa90b768cf
--- /dev/null
+++ b/splitbuild/binfilter.lst
@@ -0,0 +1 @@
+binfilter
diff --git a/splitbuild/bm b/splitbuild/bm
new file mode 100755
index 000000000000..16872f1413d5
--- /dev/null
+++ b/splitbuild/bm
@@ -0,0 +1,4 @@
+build --genconf --clear
+build --genconf --add `cat $1`
+build --all $2 $3 $4 
+
diff --git a/splitbuild/build.lst b/splitbuild/build.lst
new file mode 100644
index 000000000000..e19d9cebed73
--- /dev/null
+++ b/splitbuild/build.lst
@@ -0,0 +1 @@
+crashrep javainstaller2 packimages postprocess scp2 testtools instsetoo_native
diff --git a/splitbuild/calc.lst b/splitbuild/calc.lst
new file mode 100644
index 000000000000..2c13a4c6d503
--- /dev/null
+++ b/splitbuild/calc.lst
@@ -0,0 +1 @@
+scaddins sccomp sc
diff --git a/splitbuild/common.lst b/splitbuild/common.lst
new file mode 100644
index 000000000000..7b7214f0d227
--- /dev/null
+++ b/splitbuild/common.lst
@@ -0,0 +1 @@
+basebmp basegfx bean comphelper configmgr connectivity embedserv eventattacher fileaccess i18npool i18nutil linguistic lingucomponent o3tl officecfg oovbaapi package pyuno regexp rsc sax shell sot svl tools transex3 ucb ucbhelper unotools unoxml vos xmerge xmlhelp xmloff xmlscript wizards
diff --git a/splitbuild/content.lst b/splitbuild/content.lst
new file mode 100644
index 000000000000..dd8d40c75da7
--- /dev/null
+++ b/splitbuild/content.lst
@@ -0,0 +1 @@
+dictionaries extras helpcontent2
diff --git a/splitbuild/draw.lst b/splitbuild/draw.lst
new file mode 100644
index 000000000000..6f83eca0069d
--- /dev/null
+++ b/splitbuild/draw.lst
@@ -0,0 +1 @@
+animations sd slideshow
diff --git a/splitbuild/extensions.lst b/splitbuild/extensions.lst
new file mode 100644
index 000000000000..86fe24b8830d
--- /dev/null
+++ b/splitbuild/extensions.lst
@@ -0,0 +1 @@
+migrationanalysis reportbuilder sdext swext
diff --git a/splitbuild/extern.lst b/splitbuild/extern.lst
new file mode 100644
index 000000000000..334ad19a5b10
--- /dev/null
+++ b/splitbuild/extern.lst
@@ -0,0 +1 @@
+afms agg apache-commons apple_remote beanshell berkeleydb bitstream_vera_fonts boost cairo cppunit curl epm expat external fondu graphite hsqldb hunspell hyphen icc icu jfreereport jpeg libegg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD moz neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib 
diff --git a/splitbuild/filter.lst b/splitbuild/filter.lst
new file mode 100755
index 000000000000..9659e019d7cb
--- /dev/null
+++ b/splitbuild/filter.lst
@@ -0,0 +1 @@
+filter hwpfilter oox writerfilter writerperfect xmerge
\ No newline at end of file
diff --git a/splitbuild/framework.lst b/splitbuild/framework.lst
new file mode 100644
index 000000000000..89ed01c617d6
--- /dev/null
+++ b/splitbuild/framework.lst
@@ -0,0 +1 @@
+automation avmedia basic basctl cui desktop drawinglayer embeddedobj extensions forms formula framework idl scripting sfx2 svx xmlsecurity
diff --git a/splitbuild/gui.lst b/splitbuild/gui.lst
new file mode 100644
index 000000000000..55c2e7a20309
--- /dev/null
+++ b/splitbuild/gui.lst
@@ -0,0 +1 @@
+accessibility canvas cppcanvas dtrans fpicker goodies padmin psprint_config setup_native svtools sysui toolkit UnoControls uui vcl
diff --git a/splitbuild/prj/build.lst b/splitbuild/prj/build.lst
new file mode 100644
index 000000000000..24bc4e91e33c
--- /dev/null
+++ b/splitbuild/prj/build.lst
@@ -0,0 +1,2 @@
+spl      splitbuild     ::      reportdesign dbaccess packimages postprocess scp2 testtools instsetoo_native scaddins sccomp sc basebmp basegfx bean comphelper configmgr connectivity crashrep embedserv eventattacher fileaccess i18npool i18nutil javainstaller2 linguistic lingucomponent o3tl officecfg oovbaapi package pyuno regexp rsc sax shell sot svl tools transex3 ucb  ucbhelper unotools unoxml vos xmerge xmlhelp xmloff xmlscript wizards animations sd slideshow migrationanalysis reportbuilder sdext swext afms agg apache-commons apple_remote beanshell berkeleydb bitstream_vera_fonts boost cairo cppunit curl epm expat external fondu graphite hsqldb hunspell hyphen icc icu JFREEREPORT:jfreereport jpeg libegg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD moz neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib automation avmedia basic drawinglayer embeddedobj filter formula fpicker framework idl oox sfx2 svx uui accessibility canvas cppcanvas dtrans goodies padmin psprint_config setup_native svtools sysui toolkit UnoControls vcl binfilter dictionaries extras helpcontent2 soltools basctl chart2 cui desktop extensions forms scripting starmath xmlsecurity autodoc bridges cli_ure codemaker cosv cppu cppuhelper cpputools idlc io javaunohelper jurt jvmaccess jvmfwk odk offapi offuh qadevOOo rdbmaker readlicense_oo registry remotebridges ridljar sal salhelper stoc store testshl2 udkapi udm unodevtools unoil ure xml2cmp hwpfilter sw writerfilter writerperfect NULL
+
diff --git a/splitbuild/prj/d.lst b/splitbuild/prj/d.lst
new file mode 100644
index 000000000000..b87dd52c7da2
--- /dev/null
+++ b/splitbuild/prj/d.lst
@@ -0,0 +1 @@
+#dummy d.lst file
diff --git a/splitbuild/start.lst b/splitbuild/start.lst
new file mode 100644
index 000000000000..3838044a8c4a
--- /dev/null
+++ b/splitbuild/start.lst
@@ -0,0 +1 @@
+soltools
diff --git a/splitbuild/uno.lst b/splitbuild/uno.lst
new file mode 100644
index 000000000000..31ee787564de
--- /dev/null
+++ b/splitbuild/uno.lst
@@ -0,0 +1 @@
+autodoc bridges cli_ure codemaker cosv cppu cppuhelper cpputools idlc io javaunohelper jurt jvmaccess jvmfwk odk offapi offuh qadevOOo rdbmaker readlicense_oo registry remotebridges ridljar sal salhelper stoc store testshl2 udkapi udm unodevtools unoil ure xml2cmp
diff --git a/splitbuild/writer.lst b/splitbuild/writer.lst
new file mode 100644
index 000000000000..619d7c52d9c7
--- /dev/null
+++ b/splitbuild/writer.lst
@@ -0,0 +1 @@
+hwpfilter sw writerfilter writerperfect
diff --git a/stlport/makefile.mk b/stlport/makefile.mk
index ab4dfa244e72..bff4f60fd719 100644
--- a/stlport/makefile.mk
+++ b/stlport/makefile.mk
@@ -169,14 +169,6 @@ OUT2INC= \
     stlport$/SC5$/*.SUNWCCh
 .ENDIF
 
-.IF "$(OS)"=="IRIX"
-TARFILE_NAME=STLport-4.5
-PATCH_FILES=STLport-4.5.patch
-BUILD_ACTION=gmake
-BUILD_FLAGS=-f gcc-3.0.mak
-BUILD_FLAGS+= -j$(MAXPROCESS)
-.ENDIF
-
 OUTDIR2INC= \
     stlport