sb111: merged in DEV300_m72

561 files changed, 21453 insertions, 15949 deletions

diff --git a/configure b/configure
index 56f069032265..fcd3bddc2949 100755
--- a/configure
+++ b/configure
@@ -1,414 +1,82 @@
 #! /bin/sh
 # From configure.in Revision: 1.290  .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64.
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-# Foundation, Inc.
+# Generated by GNU Autoconf 2.59.
 #
+# 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. ##
-## -------------------- ##
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
 
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+# 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
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
+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
 
-# 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=';'
-  }
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
+# Work around bugs in pre-3.0 UWIN ksh.
+$as_unset ENV MAIL MAILPATH
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
-	   done;;
-       esac
-  as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
-      if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
   else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
-  fi
-  exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+    $as_unset $as_var
   fi
-  $as_echo "$as_me: error: $1" >&2
-  as_fn_exit $as_status
-} # as_fn_error
+done
 
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+# Required to use basename.
+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
 fi
 
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
 
-as_me=`$as_basename -- "$0" ||
+# Name of the executable.
+as_me=`$as_basename "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    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'`
+
 
+# PATH needs CR, and LINENO needs CR and PATH.
 # Avoid depending upon Character Ranges.
 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
 as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
@@ -416,107 +84,146 @@ 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
 
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
+       ;;
+  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=.
+  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$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 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
+  # 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; as_fn_exit 1; }
+  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
 }
 
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  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
 
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
 else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
+  as_expr=false
 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
+
+rm -f conf$$ conf$$.exe conf$$.file
+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='mkdir -p "$as_dir"'
+  as_mkdir_p=:
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_executable_p="test -f"
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -525,24 +232,38 @@ 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'"
 
 
-exec 7<&0 </dev/null 6>&1
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH
+
 
 # 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=
@@ -550,627 +271,50 @@ PACKAGE_TARNAME=
 PACKAGE_VERSION=
 PACKAGE_STRING=
 PACKAGE_BUGREPORT=
-PACKAGE_URL=
 
 # 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
-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_PRESENTER_EXTRA_UI
-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_URL
-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 ENABLE_MYSQLC MYSQLCONFIG SYSTEM_MYSQL MYSQL_INC MYSQL_LIB MYSQL_DEFINES LIBMYSQL_PATH SYSTEM_MYSQL_CPPCONN 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_PRESENTER_EXTRA_UI 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_mathmldtd
-enable_evolution2
-with_system_stdlibs
-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_presenter_extra_ui
-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
-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
@@ -1193,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 ;;
@@ -1256,59 +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_fn_error "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
-
-  -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_fn_error "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
+    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- \
@@ -1335,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 ;;
@@ -1365,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)
@@ -1439,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 ;;
@@ -1499,36 +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_fn_error "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
+    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_fn_error "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
+   { (exit 1); exit 1; }; }
+    ac_package=`echo $ac_package | sed 's/-/_/g'`
+    eval "with_$ac_package=no" ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1548,25 +623,26 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+  -*) { echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
-    esac
-    eval $ac_envvar=\$ac_optarg
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+   { (exit 1); exit 1; }; }
+    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}
     ;;
 
@@ -1575,36 +651,31 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
+  { echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
 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_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1618,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
@@ -1631,72 +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_fn_error "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
-
-
 # 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_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
-	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
+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; }; }
+  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.
@@ -1725,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
@@ -1739,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
@@ -1778,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
@@ -1928,6 +1008,10 @@ Optional Features:
   --disable-randr-link    disable linking with libXrandr, instead dynamically
                            open it at runtime
 
+  --enable-mysql-connector     enables the build of the MySQL Connector/OOo extension.
+                                This requires access to the MySQL Connector/C (aka libmysql) to be given, too, with
+                                either the --with-system-mysql or --with-libmysql-path option.
+
   --enable-presenter-extra-ui   enables extra functionality during slideshow,
                                  e.g. selecting pen color, erasing drawings etc.
 
@@ -2090,6 +1174,15 @@ Optional Packages:
 
   --with-lucene-core-jar=JARFILE   Specify path to jarfile manually
   --with-lucene-analyzers-jar=JARFILE   Specify path to jarfile manually
+  --with-system-mysql          Use MySQL libraries already on system, for building the MySQL Connector/OOo extension.
+                                Requires MYSQLCONFIG to point to the mysql_config executable.
+
+  --with-libmysql-path         Use Connector/C (libmysql) installation for building the MySQL Connector/OOo extension.
+
+                                Usage: --with-libmysql-path=<absolute path to your Connector/C installation>
+
+  --with-system-mysql-cppconn  Use MySQL C++ Connector libraries already on system
+
   --with-system-hsqldb    Use hsqldb already on system
 
   --with-hsqldb-jar=JARFILE   Specify path to jarfile manually
@@ -2356,938 +1449,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.
 
-Report bugs to the package provider.
 _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.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
     else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-configure
-generated by GNU Autoconf 2.64
-
-Copyright (C) 2009 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-    ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+# 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
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+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
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
-
-} # ac_fn_c_try_run
-
-# ac_fn_cxx_try_compile LINENO
-# ----------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+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
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
-
-} # ac_fn_cxx_try_compile
-
-# ac_fn_cxx_try_cpp LINENO
-# ------------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+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
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
-
-} # ac_fn_cxx_try_cpp
-
-# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
-# --------------------------------------------
-# Tries to find the compile-time value of EXPR in a program that includes
-# INCLUDES, setting VAR accordingly. Returns whether the value could be
-# computed
-ac_fn_c_compute_int ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if test "$cross_compiling" = yes; then
-    # Depending upon the size, compute the lo and hi bounds.
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_hi=$ac_mid; break
-else
-  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_lo=$ac_mid; break
-else
-  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    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
+      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi
+    cd $ac_popdir
   done
-else
-  ac_lo= ac_hi=
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_hi=$ac_mid
-else
-  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in #((
-?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
-'') ac_retval=1 ;;
-esac
-  else
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-static long int longval () { return $2; }
-static unsigned long int ulongval () { return $2; }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (($2) < 0)
-    {
-      long int i = longval ();
-      if (i != ($2))
-	return 1;
-      fprintf (f, "%ld", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ($2))
-	return 1;
-      fprintf (f, "%lu", i);
-    }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
-else
-  ac_retval=1
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-rm -f conftest.val
-
-  fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
-
-} # ac_fn_c_compute_int
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_header_compile
-
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_header_mongrel
-
-# ac_fn_cxx_try_link LINENO
-# -------------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
-
-} # ac_fn_cxx_try_link
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_func
-
-# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
-# ---------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_cxx_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
 
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_cxx_check_header_mongrel
-
-# ac_fn_cxx_try_run LINENO
-# ------------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_cxx_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
-
-} # ac_fn_cxx_try_run
+test -n "$ac_init_help" && exit 0
+if $ac_init_version; then
+  cat <<\_ACEOF
 
-# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
-# ----------------------------------------------------
-# Tries to find if the field MEMBER exists in type AGGR, after including
-# INCLUDES, setting cache variable VAR accordingly.
-ac_fn_c_check_member ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
-$as_echo_n "checking for $2.$3... " >&6; }
-if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$5
-int
-main ()
-{
-static $2 ac_aggr;
-if (ac_aggr.$3)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$4=yes"
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$5
-int
-main ()
-{
-static $2 ac_aggr;
-if (sizeof ac_aggr.$3)
-return 0;
-  ;
-  return 0;
-}
+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
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$4=yes"
-else
-  eval "$4=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
+  exit 0
 fi
-eval ac_res=\$$4
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_member
-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.64.  Invocation command line was
+generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
 
 _ACEOF
-exec 5>>config.log
 {
 cat <<_ASUNAME
 ## --------- ##
@@ -3306,7 +1590,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`
@@ -3318,9 +1602,8 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
-IFS=$as_save_IFS
+  echo "PATH: $as_dir"
+done
 
 } >&5
 
@@ -3342,6 +1625,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
@@ -3352,13 +1636,13 @@ 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) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
     2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
+      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
       if test $ac_must_keep_next = true; then
 	ac_must_keep_next=false # Got value, back to normal.
       else
@@ -3374,19 +1658,21 @@ do
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      as_fn_append 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
 done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
 # 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.
   {
@@ -3399,35 +1685,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:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; 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
@@ -3438,28 +1709,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
@@ -3471,26 +1736,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'; as_fn_exit 1' $ac_signal
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
+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.
 
@@ -3498,46 +1763,40 @@ cat >>confdefs.h <<_ACEOF
 #define PACKAGE_NAME "$PACKAGE_NAME"
 _ACEOF
 
+
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 _ACEOF
 
+
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION "$PACKAGE_VERSION"
 _ACEOF
 
+
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_STRING "$PACKAGE_STRING"
 _ACEOF
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
 
 cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _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:${as_lineno-$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
@@ -3547,79 +1806,69 @@ 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:${as_lineno-$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:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
+  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
+echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
 # 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:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
+echo "$as_me:   former value:  $ac_old_val" >&2;}
+	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
+echo "$as_me:   current value: $ac_new_val" >&2;}
+	ac_cache_corrupted=:
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+   { (exit 1); exit 1; }; }
 fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -3628,1026 +1877,1068 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 echo "$@" >config.parms
 
-# Check whether --with-gnu-patch was given.
-if test "${with_gnu_patch+set}" = set; then :
-  withval=$with_gnu_patch;
-fi
+# Check whether --with-gnu-patch or --without-gnu-patch was given.
+if test "${with_gnu_patch+set}" = set; then
+  withval="$with_gnu_patch"
+
+fi;
 
+# Check whether --with-agg or --without-agg was given.
+if test "${with_agg+set}" = set; then
+  withval="$with_agg"
 
-# Check whether --with-agg was given.
-if test "${with_agg+set}" = set; then :
-  withval=$with_agg;
 else
   with_agg=yes
-fi
+fi;
 
+# Check whether --with-gnu-cp or --without-gnu-cp was given.
+if test "${with_gnu_cp+set}" = set; then
+  withval="$with_gnu_cp"
 
-# Check whether --with-gnu-cp was given.
-if test "${with_gnu_cp+set}" = set; then :
-  withval=$with_gnu_cp;
-fi
+fi;
+# Check whether --enable-graphite or --disable-graphite was given.
+if test "${enable_graphite+set}" = set; then
+  enableval="$enable_graphite"
 
-# Check whether --enable-graphite was given.
-if test "${enable_graphite+set}" = set; then :
-  enableval=$enable_graphite;
-fi
+fi;
 
+# Check whether --with-system-graphite or --without-system-graphite was given.
+if test "${with_system_graphite+set}" = set; then
+  withval="$with_system_graphite"
 
-# Check whether --with-system-graphite was given.
-if test "${with_system_graphite+set}" = set; then :
-  withval=$with_system_graphite;
-fi
+fi;
+# Check whether --enable-ldap or --disable-ldap was given.
+if test "${enable_ldap+set}" = set; then
+  enableval="$enable_ldap"
 
-# Check whether --enable-ldap was given.
-if test "${enable_ldap+set}" = set; then :
-  enableval=$enable_ldap;
-fi
+fi;
 
+# Check whether --with-openldap or --without-openldap was given.
+if test "${with_openldap+set}" = set; then
+  withval="$with_openldap"
 
-# Check whether --with-openldap was given.
-if test "${with_openldap+set}" = set; then :
-  withval=$with_openldap;
-fi
+fi;
+# Check whether --enable-lockdown or --disable-lockdown was given.
+if test "${enable_lockdown+set}" = set; then
+  enableval="$enable_lockdown"
 
-# Check whether --enable-lockdown was given.
-if test "${enable_lockdown+set}" = set; then :
-  enableval=$enable_lockdown;
-fi
+fi;
+# Check whether --enable-vba or --disable-vba was given.
+if test "${enable_vba+set}" = set; then
+  enableval="$enable_vba"
 
-# Check whether --enable-vba was given.
-if test "${enable_vba+set}" = set; then :
-  enableval=$enable_vba;
-fi
+fi;
 
+# 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"
 
-# Check whether --with-vba-package-format was given.
-if test "${with_vba_package_format+set}" = set; then :
-  withval=$with_vba_package_format;
-fi
+fi;
+# Check whether --enable-pch or --disable-pch was given.
+if test "${enable_pch+set}" = set; then
+  enableval="$enable_pch"
 
-# Check whether --enable-pch was given.
-if test "${enable_pch+set}" = set; then :
-  enableval=$enable_pch;
-fi
+fi;
+# Check whether --enable-hids or --disable-hids was given.
+if test "${enable_hids+set}" = set; then
+  enableval="$enable_hids"
 
-# Check whether --enable-hids was given.
-if test "${enable_hids+set}" = set; then :
-  enableval=$enable_hids;
-fi
+fi;
+# Check whether --enable-mozilla or --disable-mozilla was given.
+if test "${enable_mozilla+set}" = set; then
+  enableval="$enable_mozilla"
 
-# Check whether --enable-mozilla was given.
-if test "${enable_mozilla+set}" = set; then :
-  enableval=$enable_mozilla;
 else
   enable_mozilla="yes"
-fi
+fi;
 
+# Check whether --with-fonts or --without-fonts was given.
+if test "${with_fonts+set}" = set; then
+  withval="$with_fonts"
 
-# Check whether --with-fonts was given.
-if test "${with_fonts+set}" = set; then :
-  withval=$with_fonts;
-fi
+fi;
 
+# Check whether --with-ppds or --without-ppds was given.
+if test "${with_ppds+set}" = set; then
+  withval="$with_ppds"
 
-# Check whether --with-ppds was given.
-if test "${with_ppds+set}" = set; then :
-  withval=$with_ppds;
-fi
+fi;
 
+# Check whether --with-afms or --without-afms was given.
+if test "${with_afms+set}" = set; then
+  withval="$with_afms"
 
-# Check whether --with-afms was given.
-if test "${with_afms+set}" = set; then :
-  withval=$with_afms;
-fi
+fi;
+# Check whether --enable-epm or --disable-epm was given.
+if test "${enable_epm+set}" = set; then
+  enableval="$enable_epm"
 
-# Check whether --enable-epm was given.
-if test "${enable_epm+set}" = set; then :
-  enableval=$enable_epm;
 else
   enable_epm="yes"
-fi
+fi;
 
+# Check whether --with-epm or --without-epm was given.
+if test "${with_epm+set}" = set; then
+  withval="$with_epm"
 
-# Check whether --with-epm was given.
-if test "${with_epm+set}" = set; then :
-  withval=$with_epm;
-fi
+fi;
 
+# Check whether --with-package-format or --without-package-format was given.
+if test "${with_package_format+set}" = set; then
+  withval="$with_package_format"
 
-# Check whether --with-package-format was given.
-if test "${with_package_format+set}" = set; then :
-  withval=$with_package_format;
-fi
+fi;
+# Check whether --enable-odk or --disable-odk was given.
+if test "${enable_odk+set}" = set; then
+  enableval="$enable_odk"
 
-# Check whether --enable-odk was given.
-if test "${enable_odk+set}" = set; then :
-  enableval=$enable_odk;
 else
   enable_odk="yes"
-fi
+fi;
+# Check whether --enable-qadevooo or --disable-qadevooo was given.
+if test "${enable_qadevooo+set}" = set; then
+  enableval="$enable_qadevooo"
 
-# Check whether --enable-qadevooo was given.
-if test "${enable_qadevooo+set}" = set; then :
-  enableval=$enable_qadevooo;
 else
   enable_qadevooo="yes"
-fi
+fi;
+# Check whether --enable-mathmldtd or --disable-mathmldtd was given.
+if test "${enable_mathmldtd+set}" = set; then
+  enableval="$enable_mathmldtd"
 
-# Check whether --enable-mathmldtd was given.
-if test "${enable_mathmldtd+set}" = set; then :
-  enableval=$enable_mathmldtd;
 else
   enable_mathmldtd="yes"
-fi
+fi;
+# Check whether --enable-evolution2 or --disable-evolution2 was given.
+if test "${enable_evolution2+set}" = set; then
+  enableval="$enable_evolution2"
 
-# Check whether --enable-evolution2 was given.
-if test "${enable_evolution2+set}" = set; then :
-  enableval=$enable_evolution2;
-fi
+fi;
 
+# Check whether --with-system-stdlibs or --without-system-stdlibs was given.
+if test "${with_system_stdlibs+set}" = set; then
+  withval="$with_system_stdlibs"
 
-# Check whether --with-system-stdlibs was given.
-if test "${with_system_stdlibs+set}" = set; then :
-  withval=$with_system_stdlibs;
 else
   checkforstdlibproblems=yes
-fi
+fi;
+# Check whether --enable-cups or --disable-cups was given.
+if test "${enable_cups+set}" = set; then
+  enableval="$enable_cups"
 
-# Check whether --enable-cups was given.
-if test "${enable_cups+set}" = set; then :
-  enableval=$enable_cups;
 else
   enable_cups=yes
-fi
+fi;
+# Check whether --enable-fontconfig or --disable-fontconfig was given.
+if test "${enable_fontconfig+set}" = set; then
+  enableval="$enable_fontconfig"
 
-# Check whether --enable-fontconfig was given.
-if test "${enable_fontconfig+set}" = set; then :
-  enableval=$enable_fontconfig;
 else
   enable_fontconfig=yes
-fi
+fi;
+# Check whether --enable-directx or --disable-directx was given.
+if test "${enable_directx+set}" = set; then
+  enableval="$enable_directx"
 
-# Check whether --enable-directx was given.
-if test "${enable_directx+set}" = set; then :
-  enableval=$enable_directx;
 else
   enable_directx=yes
-fi
+fi;
+# Check whether --enable-activex or --disable-activex was given.
+if test "${enable_activex+set}" = set; then
+  enableval="$enable_activex"
 
-# Check whether --enable-activex was given.
-if test "${enable_activex+set}" = set; then :
-  enableval=$enable_activex;
-fi
+fi;
 
+# Check whether --enable-atl or --disable-atl was given.
+if test "${enable_atl+set}" = set; then
+  enableval="$enable_atl"
 
-# Check whether --enable-atl was given.
-if test "${enable_atl+set}" = set; then :
-  enableval=$enable_atl;
-fi
+fi;
 
+# Check whether --enable-symbols or --disable-symbols was given.
+if test "${enable_symbols+set}" = set; then
+  enableval="$enable_symbols"
 
-# Check whether --enable-symbols was given.
-if test "${enable_symbols+set}" = set; then :
-  enableval=$enable_symbols;
-fi
+fi;
+# Check whether --enable-strip-solver or --disable-strip-solver was given.
+if test "${enable_strip_solver+set}" = set; then
+  enableval="$enable_strip_solver"
 
-# Check whether --enable-strip-solver was given.
-if test "${enable_strip_solver+set}" = set; then :
-  enableval=$enable_strip_solver;
-fi
+fi;
+# Check whether --enable-werror or --disable-werror was given.
+if test "${enable_werror+set}" = set; then
+  enableval="$enable_werror"
 
-# Check whether --enable-werror was given.
-if test "${enable_werror+set}" = set; then :
-  enableval=$enable_werror;
-fi
+fi;
+# Check whether --enable-debug or --disable-debug was given.
+if test "${enable_debug+set}" = set; then
+  enableval="$enable_debug"
 
-# Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then :
-  enableval=$enable_debug;
-fi
+fi;
+# Check whether --enable-dbgutil or --disable-dbgutil was given.
+if test "${enable_dbgutil+set}" = set; then
+  enableval="$enable_dbgutil"
 
-# Check whether --enable-dbgutil was given.
-if test "${enable_dbgutil+set}" = set; then :
-  enableval=$enable_dbgutil;
-fi
+fi;
+# Check whether --enable-crashdump or --disable-crashdump was given.
+if test "${enable_crashdump+set}" = set; then
+  enableval="$enable_crashdump"
 
-# Check whether --enable-crashdump was given.
-if test "${enable_crashdump+set}" = set; then :
-  enableval=$enable_crashdump;
 else
   enable_crashdump=no
-fi
+fi;
+# Check whether --enable-cl-standard or --disable-cl-standard was given.
+if test "${enable_cl_standard+set}" = set; then
+  enableval="$enable_cl_standard"
 
-# Check whether --enable-cl-standard was given.
-if test "${enable_cl_standard+set}" = set; then :
-  enableval=$enable_cl_standard;
-fi
+fi;
+# Check whether --enable-gtk or --disable-gtk was given.
+if test "${enable_gtk+set}" = set; then
+  enableval="$enable_gtk"
 
-# Check whether --enable-gtk was given.
-if test "${enable_gtk+set}" = set; then :
-  enableval=$enable_gtk;
 else
   enable_gtk=yes
-fi
+fi;
+# Check whether --enable-systray or --disable-systray was given.
+if test "${enable_systray+set}" = set; then
+  enableval="$enable_systray"
 
-# Check whether --enable-systray was given.
-if test "${enable_systray+set}" = set; then :
-  enableval=$enable_systray;
 else
   enable_systray=yes
-fi
+fi;
+# Check whether --enable-cairo or --disable-cairo was given.
+if test "${enable_cairo+set}" = set; then
+  enableval="$enable_cairo"
 
-# Check whether --enable-cairo was given.
-if test "${enable_cairo+set}" = set; then :
-  enableval=$enable_cairo;
 else
   enable_cairo=no
-fi
+fi;
 
+# Check whether --with-system-cairo or --without-system-cairo was given.
+if test "${with_system_cairo+set}" = set; then
+  withval="$with_system_cairo"
 
-# Check whether --with-system-cairo was given.
-if test "${with_system_cairo+set}" = set; then :
-  withval=$with_system_cairo;
-fi
+fi;
+# Check whether --enable-opengl or --disable-opengl was given.
+if test "${enable_opengl+set}" = set; then
+  enableval="$enable_opengl"
 
-# Check whether --enable-opengl was given.
-if test "${enable_opengl+set}" = set; then :
-  enableval=$enable_opengl;
 else
   enable_opengl=no
-fi
+fi;
+# Check whether --enable-dbus or --disable-dbus was given.
+if test "${enable_dbus+set}" = set; then
+  enableval="$enable_dbus"
 
-# Check whether --enable-dbus was given.
-if test "${enable_dbus+set}" = set; then :
-  enableval=$enable_dbus;
 else
   enable_dbus=no
-fi
+fi;
+# Check whether --enable-gconf or --disable-gconf was given.
+if test "${enable_gconf+set}" = set; then
+  enableval="$enable_gconf"
 
-# Check whether --enable-gconf was given.
-if test "${enable_gconf+set}" = set; then :
-  enableval=$enable_gconf;
 else
   enable_gconf=yes
-fi
+fi;
+# Check whether --enable-gnome-vfs or --disable-gnome-vfs was given.
+if test "${enable_gnome_vfs+set}" = set; then
+  enableval="$enable_gnome_vfs"
 
-# Check whether --enable-gnome-vfs was given.
-if test "${enable_gnome_vfs+set}" = set; then :
-  enableval=$enable_gnome_vfs;
 else
   enable_gnome_vfs=yes
-fi
+fi;
+# Check whether --enable-gio or --disable-gio was given.
+if test "${enable_gio+set}" = set; then
+  enableval="$enable_gio"
 
-# Check whether --enable-gio was given.
-if test "${enable_gio+set}" = set; then :
-  enableval=$enable_gio;
 else
   enable_gio=no
-fi
+fi;
+# Check whether --enable-static-gtk or --disable-static-gtk was given.
+if test "${enable_static_gtk+set}" = set; then
+  enableval="$enable_static_gtk"
 
-# Check whether --enable-static-gtk was given.
-if test "${enable_static_gtk+set}" = set; then :
-  enableval=$enable_static_gtk;
-fi
+fi;
+# Check whether --enable-layout or --disable-layout was given.
+if test "${enable_layout+set}" = set; then
+  enableval="$enable_layout"
 
-# Check whether --enable-layout was given.
-if test "${enable_layout+set}" = set; then :
-  enableval=$enable_layout;
-fi
+fi;
+# Check whether --enable-build-mozilla or --disable-build-mozilla was given.
+if test "${enable_build_mozilla+set}" = set; then
+  enableval="$enable_build_mozilla"
 
-# Check whether --enable-build-mozilla was given.
-if test "${enable_build_mozilla+set}" = set; then :
-  enableval=$enable_build_mozilla;
-fi
+fi;
 
+# Check whether --with-mozilla-version or --without-mozilla-version was given.
+if test "${with_mozilla_version+set}" = set; then
+  withval="$with_mozilla_version"
 
-# Check whether --with-mozilla-version was given.
-if test "${with_mozilla_version+set}" = set; then :
-  withval=$with_mozilla_version;
-fi
+fi;
 
+# Check whether --with-mozilla-toolkit or --without-mozilla-toolkit was given.
+if test "${with_mozilla_toolkit+set}" = set; then
+  withval="$with_mozilla_toolkit"
 
-# Check whether --with-mozilla-toolkit was given.
-if test "${with_mozilla_toolkit+set}" = set; then :
-  withval=$with_mozilla_toolkit;
-fi
+fi;
+# Check whether --enable-nss_module or --disable-nss_module was given.
+if test "${enable_nss_module+set}" = set; then
+  enableval="$enable_nss_module"
 
-# Check whether --enable-nss_module was given.
-if test "${enable_nss_module+set}" = set; then :
-  enableval=$enable_nss_module;
 else
   enable_nss_module=yes
-fi
+fi;
+# Check whether --enable-kde or --disable-kde was given.
+if test "${enable_kde+set}" = set; then
+  enableval="$enable_kde"
 
-# Check whether --enable-kde was given.
-if test "${enable_kde+set}" = set; then :
-  enableval=$enable_kde;
-fi
+fi;
+# Check whether --enable-kdeab or --disable-kdeab was given.
+if test "${enable_kdeab+set}" = set; then
+  enableval="$enable_kdeab"
 
-# Check whether --enable-kdeab was given.
-if test "${enable_kdeab+set}" = set; then :
-  enableval=$enable_kdeab;
 else
   if test "$enable_kde" = "yes"; then enable_kdeab=yes; fi
-fi
+fi;
+# Check whether --enable-kde4 or --disable-kde4 was given.
+if test "${enable_kde4+set}" = set; then
+  enableval="$enable_kde4"
 
-# Check whether --enable-kde4 was given.
-if test "${enable_kde4+set}" = set; then :
-  enableval=$enable_kde4;
-fi
+fi;
+# Check whether --enable-binfilter or --disable-binfilter was given.
+if test "${enable_binfilter+set}" = set; then
+  enableval="$enable_binfilter"
 
-# Check whether --enable-binfilter was given.
-if test "${enable_binfilter+set}" = set; then :
-  enableval=$enable_binfilter;
 else
   if ! test -d ./binfilter; then enable_binfilter=no; fi
-fi
+fi;
+# Check whether --enable-rpath or --disable-rpath was given.
+if test "${enable_rpath+set}" = set; then
+  enableval="$enable_rpath"
 
-# Check whether --enable-rpath was given.
-if test "${enable_rpath+set}" = set; then :
-  enableval=$enable_rpath;
-fi
+fi;
+# Check whether --enable-pam or --disable-pam was given.
+if test "${enable_pam+set}" = set; then
+  enableval="$enable_pam"
 
-# Check whether --enable-pam was given.
-if test "${enable_pam+set}" = set; then :
-  enableval=$enable_pam;
-fi
+fi;
+# Check whether --enable-pam-link or --disable-pam-link was given.
+if test "${enable_pam_link+set}" = set; then
+  enableval="$enable_pam_link"
 
-# Check whether --enable-pam-link was given.
-if test "${enable_pam_link+set}" = set; then :
-  enableval=$enable_pam_link;
-fi
+fi;
+# Check whether --enable-crypt-link or --disable-crypt-link was given.
+if test "${enable_crypt_link+set}" = set; then
+  enableval="$enable_crypt_link"
 
-# Check whether --enable-crypt-link was given.
-if test "${enable_crypt_link+set}" = set; then :
-  enableval=$enable_crypt_link;
 else
   enable_crypt_link=yes
-fi
+fi;
+# Check whether --enable-xrender-link or --disable-xrender-link was given.
+if test "${enable_xrender_link+set}" = set; then
+  enableval="$enable_xrender_link"
 
-# Check whether --enable-xrender-link was given.
-if test "${enable_xrender_link+set}" = set; then :
-  enableval=$enable_xrender_link;
-fi
+fi;
+# Check whether --enable-randr or --disable-randr was given.
+if test "${enable_randr+set}" = set; then
+  enableval="$enable_randr"
 
-# Check whether --enable-randr was given.
-if test "${enable_randr+set}" = set; then :
-  enableval=$enable_randr;
 else
   enable_randr=yes
-fi
+fi;
+# Check whether --enable-randr-link or --disable-randr-link was given.
+if test "${enable_randr_link+set}" = set; then
+  enableval="$enable_randr_link"
 
-# Check whether --enable-randr-link was given.
-if test "${enable_randr_link+set}" = set; then :
-  enableval=$enable_randr_link;
 else
   enable_randr_link=yes
-fi
-
-
-# Check whether --with-myspell-dicts was given.
-if test "${with_myspell_dicts+set}" = set; then :
-  withval=$with_myspell_dicts;
-fi
-
+fi;
 
-# Check whether --with-system-dicts was given.
-if test "${with_system_dicts+set}" = set; then :
-  withval=$with_system_dicts;
-fi
-
-
-# Check whether --with-external-dict-dir was given.
-if test "${with_external_dict_dir+set}" = set; then :
-  withval=$with_external_dict_dir;
-fi
+# Check whether --with-myspell-dicts or --without-myspell-dicts was given.
+if test "${with_myspell_dicts+set}" = set; then
+  withval="$with_myspell_dicts"
 
+fi;
 
-# Check whether --with-external-hyph-dir was given.
-if test "${with_external_hyph_dir+set}" = set; then :
-  withval=$with_external_hyph_dir;
-fi
-
-
-# Check whether --with-external-thes-dir was given.
-if test "${with_external_thes_dir+set}" = set; then :
-  withval=$with_external_thes_dir;
-fi
-
-
-# Check whether --with-system-libs was given.
-if test "${with_system_libs+set}" = set; then :
-  withval=$with_system_libs;
-fi
-
+# Check whether --with-system-dicts or --without-system-dicts was given.
+if test "${with_system_dicts+set}" = set; then
+  withval="$with_system_dicts"
 
-# Check whether --with-system-headers was given.
-if test "${with_system_headers+set}" = set; then :
-  withval=$with_system_headers;
-fi
+fi;
 
+# 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"
 
-# Check whether --with-system-jars was given.
-if test "${with_system_jars+set}" = set; then :
-  withval=$with_system_jars;
-fi
+fi;
 
+# 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"
 
-# Check whether --with-system-zlib was given.
-if test "${with_system_zlib+set}" = set; then :
-  withval=$with_system_zlib;
-fi
+fi;
 
+# 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"
 
-# Check whether --with-system-openssl was given.
-if test "${with_system_openssl+set}" = set; then :
-  withval=$with_system_openssl;
-fi
+fi;
 
+# Check whether --with-system-libs or --without-system-libs was given.
+if test "${with_system_libs+set}" = set; then
+  withval="$with_system_libs"
 
-# Check whether --with-system-jpeg was given.
-if test "${with_system_jpeg+set}" = set; then :
-  withval=$with_system_jpeg;
-fi
+fi;
 
+# Check whether --with-system-headers or --without-system-headers was given.
+if test "${with_system_headers+set}" = set; then
+  withval="$with_system_headers"
 
-# Check whether --with-system-expat was given.
-if test "${with_system_expat+set}" = set; then :
-  withval=$with_system_expat;
-fi
+fi;
 
+# Check whether --with-system-jars or --without-system-jars was given.
+if test "${with_system_jars+set}" = set; then
+  withval="$with_system_jars"
 
-# Check whether --with-system-libwpd was given.
-if test "${with_system_libwpd+set}" = set; then :
-  withval=$with_system_libwpd;
-fi
+fi;
 
+# Check whether --with-system-zlib or --without-system-zlib was given.
+if test "${with_system_zlib+set}" = set; then
+  withval="$with_system_zlib"
 
-# Check whether --with-system-libxml was given.
-if test "${with_system_libxml+set}" = set; then :
-  withval=$with_system_libxml;
-fi
+fi;
 
+# Check whether --with-system-openssl or --without-system-openssl was given.
+if test "${with_system_openssl+set}" = set; then
+  withval="$with_system_openssl"
 
-# Check whether --with-system-python was given.
-if test "${with_system_python+set}" = set; then :
-  withval=$with_system_python;
-fi
+fi;
 
+# Check whether --with-system-jpeg or --without-system-jpeg was given.
+if test "${with_system_jpeg+set}" = set; then
+  withval="$with_system_jpeg"
 
-# Check whether --with-system-icu was given.
-if test "${with_system_icu+set}" = set; then :
-  withval=$with_system_icu;
-fi
+fi;
 
+# Check whether --with-system-expat or --without-system-expat was given.
+if test "${with_system_expat+set}" = set; then
+  withval="$with_system_expat"
 
-# Check whether --with-system-poppler was given.
-if test "${with_system_poppler+set}" = set; then :
-  withval=$with_system_poppler;
-fi
+fi;
 
+# Check whether --with-system-libwpd or --without-system-libwpd was given.
+if test "${with_system_libwpd+set}" = set; then
+  withval="$with_system_libwpd"
 
-# Check whether --with-system-db was given.
-if test "${with_system_db+set}" = set; then :
-  withval=$with_system_db;
-fi
+fi;
 
+# Check whether --with-system-libxml or --without-system-libxml was given.
+if test "${with_system_libxml+set}" = set; then
+  withval="$with_system_libxml"
 
-# Check whether --with-system-lucene was given.
-if test "${with_system_lucene+set}" = set; then :
-  withval=$with_system_lucene;
-fi
+fi;
 
+# Check whether --with-system-python or --without-system-python was given.
+if test "${with_system_python+set}" = set; then
+  withval="$with_system_python"
 
-# Check whether --with-lucene-core-jar was given.
-if test "${with_lucene_core_jar+set}" = set; then :
-  withval=$with_lucene_core_jar;  LUCENE_CORE_JAR="$withval"
+fi;
 
-fi
+# Check whether --with-system-icu or --without-system-icu was given.
+if test "${with_system_icu+set}" = set; then
+  withval="$with_system_icu"
 
+fi;
 
-# Check whether --with-lucene-analyzers-jar was given.
-if test "${with_lucene_analyzers_jar+set}" = set; then :
-  withval=$with_lucene_analyzers_jar;  LUCENE_ANALYZERS_JAR="$withval"
+# Check whether --with-system-poppler or --without-system-poppler was given.
+if test "${with_system_poppler+set}" = set; then
+  withval="$with_system_poppler"
 
-fi
+fi;
 
+# Check whether --with-system-db or --without-system-db was given.
+if test "${with_system_db+set}" = set; then
+  withval="$with_system_db"
 
-# Check whether --with-system-hsqldb was given.
-if test "${with_system_hsqldb+set}" = set; then :
-  withval=$with_system_hsqldb;
-fi
+fi;
 
+# Check whether --with-system-lucene or --without-system-lucene was given.
+if test "${with_system_lucene+set}" = set; then
+  withval="$with_system_lucene"
 
-# Check whether --with-hsqldb-jar was given.
-if test "${with_hsqldb_jar+set}" = set; then :
-  withval=$with_hsqldb_jar;  HSQLDB_JAR="$withval"
+fi;
 
-fi
+# 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;
 
-# Check whether --with-system-beanshell was given.
-if test "${with_system_beanshell+set}" = set; then :
-  withval=$with_system_beanshell;
-fi
+# 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;
+# Check whether --enable-mysql-connector or --disable-mysql-connector was given.
+if test "${enable_mysql_connector+set}" = set; then
+  enableval="$enable_mysql_connector"
 
-# Check whether --with-beanshell-jar was given.
-if test "${with_beanshell_jar+set}" = set; then :
-  withval=$with_beanshell_jar;  BSH_JAR="$withval"
+fi;
 
-fi
+# Check whether --with-system-mysql or --without-system-mysql was given.
+if test "${with_system_mysql+set}" = set; then
+  withval="$with_system_mysql"
 
-# Check whether --enable-presenter-extra-ui was given.
-if test "${enable_presenter_extra_ui+set}" = set; then :
-  enableval=$enable_presenter_extra_ui;
 else
-  enable_presenter_extra_ui=no
-fi
-
-# Check whether --enable-minimizer was given.
-if test "${enable_minimizer+set}" = set; then :
-  enableval=$enable_minimizer;
-fi
-
-# Check whether --enable-presenter-console was given.
-if test "${enable_presenter_console+set}" = set; then :
-  enableval=$enable_presenter_console;
-fi
-
-# Check whether --enable-pdfimport was given.
-if test "${enable_pdfimport+set}" = set; then :
-  enableval=$enable_pdfimport;
-fi
+  with_system_mysql="no"
+fi;
 
-# Check whether --enable-wiki-publisher was given.
-if test "${enable_wiki_publisher+set}" = set; then :
-  enableval=$enable_wiki_publisher;
-fi
+# Check whether --with-libmysql-path or --without-libmysql-path was given.
+if test "${with_libmysql_path+set}" = set; then
+  withval="$with_libmysql_path"
 
+fi;
 
-# Check whether --with-commons-codec-jar was given.
-if test "${with_commons_codec_jar+set}" = set; then :
-  withval=$with_commons_codec_jar;  COMMONS_CODEC_JAR="$withval"
+# Check whether --with-system-mysql-cppconn or --without-system-mysql-cppconn was given.
+if test "${with_system_mysql_cppconn+set}" = set; then
+  withval="$with_system_mysql_cppconn"
 
-fi
+fi;
 
+# Check whether --with-system-hsqldb or --without-system-hsqldb was given.
+if test "${with_system_hsqldb+set}" = set; then
+  withval="$with_system_hsqldb"
 
-# Check whether --with-commons-lang-jar was given.
-if test "${with_commons_lang_jar+set}" = set; then :
-  withval=$with_commons_lang_jar;  COMMONS_LANG_JAR="$withval"
+fi;
 
-fi
+# 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;
 
-# Check whether --with-commons-httpclient-jar was given.
-if test "${with_commons_httpclient_jar+set}" = set; then :
-  withval=$with_commons_httpclient_jar;  COMMONS_HTTPCLIENT_JAR="$withval"
+# Check whether --with-system-beanshell or --without-system-beanshell was given.
+if test "${with_system_beanshell+set}" = set; then
+  withval="$with_system_beanshell"
 
-fi
+fi;
 
+# 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"
 
-# Check whether --with-commons-logging-jar was given.
-if test "${with_commons_logging_jar+set}" = set; then :
-  withval=$with_commons_logging_jar;  COMMONS_LOGGING_JAR="$withval"
+fi;
+# Check whether --enable-presenter-extra-ui or --disable-presenter-extra-ui was given.
+if test "${enable_presenter_extra_ui+set}" = set; then
+  enableval="$enable_presenter_extra_ui"
 
-fi
-
-
-# Check whether --with-servlet-api-jar was given.
-if test "${with_servlet_api_jar+set}" = set; then :
-  withval=$with_servlet_api_jar;  SERVLETAPI_JAR="$withval"
-
-fi
+else
+  enable_presenter_extra_ui=no
+fi;
+# Check whether --enable-minimizer or --disable-minimizer was given.
+if test "${enable_minimizer+set}" = set; then
+  enableval="$enable_minimizer"
 
-# Check whether --enable-report-builder was given.
-if test "${enable_report_builder+set}" = set; then :
-  enableval=$enable_report_builder;
-fi
+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;
+# Check whether --enable-pdfimport or --disable-pdfimport was given.
+if test "${enable_pdfimport+set}" = set; then
+  enableval="$enable_pdfimport"
 
-# Check whether --with-system-jfreereport was given.
-if test "${with_system_jfreereport+set}" = set; then :
-  withval=$with_system_jfreereport;
-fi
+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;
 
-# Check whether --with-sac-jar was given.
-if test "${with_sac_jar+set}" = set; then :
-  withval=$with_sac_jar;  SAC_JAR="$withval"
+# 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
+fi;
 
+# 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"
 
-# Check whether --with-libxml-jar was given.
-if test "${with_libxml_jar+set}" = set; then :
-  withval=$with_libxml_jar;  LIBXML_JAR="$withval"
+fi;
 
-fi
+# 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;
 
-# Check whether --with-flute-jar was given.
-if test "${with_flute_jar+set}" = set; then :
-  withval=$with_flute_jar;  FLUTE_JAR="$withval"
+# 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
+fi;
 
+# 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"
 
-# Check whether --with-jfreereport-jar was given.
-if test "${with_jfreereport_jar+set}" = set; then :
-  withval=$with_jfreereport_jar;  JFREEREPORT_JAR="$withval"
+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
+fi;
 
+# Check whether --with-system-jfreereport or --without-system-jfreereport was given.
+if test "${with_system_jfreereport+set}" = set; then
+  withval="$with_system_jfreereport"
 
-# Check whether --with-liblayout-jar was given.
-if test "${with_liblayout_jar+set}" = set; then :
-  withval=$with_liblayout_jar;  LIBLAYOUT_JAR="$withval"
+fi;
 
-fi
+# 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;
 
-# Check whether --with-libloader-jar was given.
-if test "${with_libloader_jar+set}" = set; then :
-  withval=$with_libloader_jar;  LIBLOADER_JAR="$withval"
+# 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
+fi;
 
+# 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"
 
-# Check whether --with-libloader-jar was given.
-if test "${with_libloader_jar+set}" = set; then :
-  withval=$with_libloader_jar;  LIBLOADER_JAR="$withval"
+fi;
 
-fi
+# 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;
 
-# Check whether --with-libformula-jar was given.
-if test "${with_libformula_jar+set}" = set; then :
-  withval=$with_libformula_jar;  LIBFORMULA_JAR="$withval"
+# 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
+fi;
 
+# 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"
 
-# Check whether --with-librepository-jar was given.
-if test "${with_librepository_jar+set}" = set; then :
-  withval=$with_librepository_jar;  LIBREPOSITORY_JAR="$withval"
+fi;
 
-fi
+# 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;
 
-# Check whether --with-libfonts-jar was given.
-if test "${with_libfonts_jar+set}" = set; then :
-  withval=$with_libfonts_jar;  LIBFONTS_JAR="$withval"
+# 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
+fi;
 
+# 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"
 
-# Check whether --with-libserializer-jar was given.
-if test "${with_libserializer_jar+set}" = set; then :
-  withval=$with_libserializer_jar;  LIBSERIALIZER_JAR="$withval"
+fi;
 
-fi
+# 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;
 
-# Check whether --with-libbase-jar was given.
-if test "${with_libbase_jar+set}" = set; then :
-  withval=$with_libbase_jar;  LIBBASE_JAR="$withval"
+# 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
+fi;
 
+# 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"
 
-# Check whether --with-system-saxon was given.
-if test "${with_system_saxon+set}" = set; then :
-  withval=$with_system_saxon;
-fi
+fi;
 
+# Check whether --with-system-saxon or --without-system-saxon was given.
+if test "${with_system_saxon+set}" = set; then
+  withval="$with_system_saxon"
 
-# Check whether --with-saxon-jar was given.
-if test "${with_saxon_jar+set}" = set; then :
-  withval=$with_saxon_jar;  SAXON_JAR="$withval"
+fi;
 
-fi
+# 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;
 
-# Check whether --with-system-libxslt was given.
-if test "${with_system_libxslt+set}" = set; then :
-  withval=$with_system_libxslt;
-fi
+# Check whether --with-system-libxslt or --without-system-libxslt was given.
+if test "${with_system_libxslt+set}" = set; then
+  withval="$with_system_libxslt"
 
+fi;
 
-# Check whether --with-system-odbc was given.
-if test "${with_system_odbc+set}" = set; then :
-  withval=$with_system_odbc;
-fi
+# Check whether --with-system-odbc or --without-system-odbc was given.
+if test "${with_system_odbc+set}" = set; then
+  withval="$with_system_odbc"
 
+fi;
 
-# Check whether --with-system-sane was given.
-if test "${with_system_sane+set}" = set; then :
-  withval=$with_system_sane;
-fi
+# Check whether --with-system-sane or --without-system-sane was given.
+if test "${with_system_sane+set}" = set; then
+  withval="$with_system_sane"
 
+fi;
 
-# Check whether --with-system-xrender was given.
-if test "${with_system_xrender+set}" = set; then :
-  withval=$with_system_xrender;
-fi
+# Check whether --with-system-xrender or --without-system-xrender was given.
+if test "${with_system_xrender+set}" = set; then
+  withval="$with_system_xrender"
 
+fi;
 
-# Check whether --with-system-curl was given.
-if test "${with_system_curl+set}" = set; then :
-  withval=$with_system_curl;
-fi
+# Check whether --with-system-curl or --without-system-curl was given.
+if test "${with_system_curl+set}" = set; then
+  withval="$with_system_curl"
 
+fi;
 
-# Check whether --with-system-boost was given.
-if test "${with_system_boost+set}" = set; then :
-  withval=$with_system_boost;
-fi
+# Check whether --with-system-boost or --without-system-boost was given.
+if test "${with_system_boost+set}" = set; then
+  withval="$with_system_boost"
 
+fi;
 
-# Check whether --with-system-vigra was given.
-if test "${with_system_vigra+set}" = set; then :
-  withval=$with_system_vigra;
-fi
+# Check whether --with-system-vigra or --without-system-vigra was given.
+if test "${with_system_vigra+set}" = set; then
+  withval="$with_system_vigra"
 
-# Check whether --enable-neon was given.
-if test "${enable_neon+set}" = set; then :
-  enableval=$enable_neon;
-fi
+fi;
+# Check whether --enable-neon or --disable-neon was given.
+if test "${enable_neon+set}" = set; then
+  enableval="$enable_neon"
 
-# Check whether --enable-Xaw was given.
-if test "${enable_Xaw+set}" = set; then :
-  enableval=$enable_Xaw;
-fi
+fi;
+# Check whether --enable-Xaw or --disable-Xaw was given.
+if test "${enable_Xaw+set}" = set; then
+  enableval="$enable_Xaw"
 
+fi;
 
-# Check whether --with-system-neon was given.
-if test "${with_system_neon+set}" = set; then :
-  withval=$with_system_neon;
-fi
+# Check whether --with-system-neon or --without-system-neon was given.
+if test "${with_system_neon+set}" = set; then
+  withval="$with_system_neon"
 
+fi;
 
-# Check whether --with-system-agg was given.
-if test "${with_system_agg+set}" = set; then :
-  withval=$with_system_agg;
-fi
+# Check whether --with-system-agg or --without-system-agg was given.
+if test "${with_system_agg+set}" = set; then
+  withval="$with_system_agg"
 
+fi;
 
-# Check whether --with-system-hunspell was given.
-if test "${with_system_hunspell+set}" = set; then :
-  withval=$with_system_hunspell;
-fi
+# Check whether --with-system-hunspell or --without-system-hunspell was given.
+if test "${with_system_hunspell+set}" = set; then
+  withval="$with_system_hunspell"
 
+fi;
 
-# Check whether --with-system-mythes was given.
-if test "${with_system_mythes+set}" = set; then :
-  withval=$with_system_mythes;
-fi
+# Check whether --with-system-mythes or --without-system-mythes was given.
+if test "${with_system_mythes+set}" = set; then
+  withval="$with_system_mythes"
 
+fi;
 
-# Check whether --with-system-altlinuxhyph was given.
-if test "${with_system_altlinuxhyph+set}" = set; then :
-  withval=$with_system_altlinuxhyph;
-fi
+# Check whether --with-system-altlinuxhyph or --without-system-altlinuxhyph was given.
+if test "${with_system_altlinuxhyph+set}" = set; then
+  withval="$with_system_altlinuxhyph"
 
+fi;
 
-# Check whether --with-system-lpsolve was given.
-if test "${with_system_lpsolve+set}" = set; then :
-  withval=$with_system_lpsolve;
-fi
+# Check whether --with-system-lpsolve or --without-system-lpsolve was given.
+if test "${with_system_lpsolve+set}" = set; then
+  withval="$with_system_lpsolve"
 
+fi;
 
-# Check whether --with-system-mozilla was given.
-if test "${with_system_mozilla+set}" = set; then :
-  withval=$with_system_mozilla; WITH_SYSTEM_MOZILLA=$withval
+# 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
 else
   WITH_SYSTEM_MOZILLA=no
-fi
-
+fi;
 
-# Check whether --with-stlport was given.
-if test "${with_stlport+set}" = set; then :
-  withval=$with_stlport; WITH_STLPORT=$withval
+# Check whether --with-stlport or --without-stlport was given.
+if test "${with_stlport+set}" = set; then
+  withval="$with_stlport"
+  WITH_STLPORT=$withval
 else
   WITH_STLPORT=auto
-fi
+fi;
 
+# Check whether --with-jdk-home or --without-jdk-home was given.
+if test "${with_jdk_home+set}" = set; then
+  withval="$with_jdk_home"
 
-# Check whether --with-jdk-home was given.
-if test "${with_jdk_home+set}" = set; then :
-  withval=$with_jdk_home;
-fi
+fi;
 
+# 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"
 
-# Check whether --with-gxx_include_path was given.
-if test "${with_gxx_include_path+set}" = set; then :
-  withval=$with_gxx_include_path;
-fi
+fi;
 
-
-# Check whether --with-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
+# 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
 else
   WITH_JAVA=java
-fi
-
-# Check whether --enable-gcjaot was given.
-if test "${enable_gcjaot+set}" = set; then :
-  enableval=$enable_gcjaot;
-fi
+fi;
+# Check whether --enable-gcjaot or --disable-gcjaot was given.
+if test "${enable_gcjaot+set}" = set; then
+  enableval="$enable_gcjaot"
 
+fi;
 
-# Check whether --with-ant-home was given.
-if test "${with_ant_home+set}" = set; then :
-  withval=$with_ant_home;
-fi
+# Check whether --with-ant-home or --without-ant-home was given.
+if test "${with_ant_home+set}" = set; then
+  withval="$with_ant_home"
 
+fi;
 
-# Check whether --with-perl-home was given.
-if test "${with_perl_home+set}" = set; then :
-  withval=$with_perl_home;
-fi
+# Check whether --with-perl-home or --without-perl-home was given.
+if test "${with_perl_home+set}" = set; then
+  withval="$with_perl_home"
 
+fi;
 
-# Check whether --with-cl-home was given.
-if test "${with_cl_home+set}" = set; then :
-  withval=$with_cl_home;
-fi
+# Check whether --with-cl-home or --without-cl-home was given.
+if test "${with_cl_home+set}" = set; then
+  withval="$with_cl_home"
 
+fi;
 
-# Check whether --with-mspdb-path was given.
-if test "${with_mspdb_path+set}" = set; then :
-  withval=$with_mspdb_path;
-fi
+# Check whether --with-mspdb-path or --without-mspdb-path was given.
+if test "${with_mspdb_path+set}" = set; then
+  withval="$with_mspdb_path"
 
+fi;
 
-# Check whether --with-midl-path was given.
-if test "${with_midl_path+set}" = set; then :
-  withval=$with_midl_path;
-fi
+# Check whether --with-midl-path or --without-midl-path was given.
+if test "${with_midl_path+set}" = set; then
+  withval="$with_midl_path"
 
+fi;
 
-# Check whether --with-csc-path was given.
-if test "${with_csc_path+set}" = set; then :
-  withval=$with_csc_path;
-fi
+# Check whether --with-csc-path or --without-csc-path was given.
+if test "${with_csc_path+set}" = set; then
+  withval="$with_csc_path"
 
+fi;
 
-# Check whether --with-nsis-path was given.
-if test "${with_nsis_path+set}" = set; then :
-  withval=$with_nsis_path;
-fi
+# Check whether --with-nsis-path or --without-nsis-path was given.
+if test "${with_nsis_path+set}" = set; then
+  withval="$with_nsis_path"
 
+fi;
 
-# Check whether --with-frame-home was given.
-if test "${with_frame_home+set}" = set; then :
-  withval=$with_frame_home;
-fi
+# Check whether --with-frame-home or --without-frame-home was given.
+if test "${with_frame_home+set}" = set; then
+  withval="$with_frame_home"
 
+fi;
 
-# Check whether --with-psdk-home was given.
-if test "${with_psdk_home+set}" = set; then :
-  withval=$with_psdk_home;
-fi
+# Check whether --with-psdk-home or --without-psdk-home was given.
+if test "${with_psdk_home+set}" = set; then
+  withval="$with_psdk_home"
 
+fi;
 
-# Check whether --with-directx-home was given.
-if test "${with_directx_home+set}" = set; then :
-  withval=$with_directx_home;
-fi
+# Check whether --with-directx-home or --without-directx-home was given.
+if test "${with_directx_home+set}" = set; then
+  withval="$with_directx_home"
 
+fi;
 
-# Check whether --with-mozilla-build was given.
-if test "${with_mozilla_build+set}" = set; then :
-  withval=$with_mozilla_build; MOZILLABUILD=$withval
-fi
+# 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;
 
+# Check whether --with-local-solenv or --without-local-solenv was given.
+if test "${with_local_solenv+set}" = set; then
+  withval="$with_local_solenv"
 
-# Check whether --with-local-solenv was given.
-if test "${with_local_solenv+set}" = set; then :
-  withval=$with_local_solenv;
-fi
+fi;
 
+# Check whether --with-local-solver or --without-local-solver was given.
+if test "${with_local_solver+set}" = set; then
+  withval="$with_local_solver"
 
-# Check whether --with-local-solver was given.
-if test "${with_local_solver+set}" = set; then :
-  withval=$with_local_solver;
-fi
+fi;
+# Check whether --enable-check-only or --disable-check-only was given.
+if test "${enable_check_only+set}" = set; then
+  enableval="$enable_check_only"
 
-# Check whether --enable-check-only was given.
-if test "${enable_check_only+set}" = set; then :
-  enableval=$enable_check_only;
-fi
+fi;
+# Check whether --enable-ccache-skip or --disable-ccache-skip was given.
+if test "${enable_ccache_skip+set}" = set; then
+  enableval="$enable_ccache_skip"
 
-# Check whether --enable-ccache-skip was given.
-if test "${enable_ccache_skip+set}" = set; then :
-  enableval=$enable_ccache_skip;
 else
   enable_ccache_skip=auto
-fi
+fi;
 
+# Check whether --with-lang or --without-lang was given.
+if test "${with_lang+set}" = set; then
+  withval="$with_lang"
 
-# Check whether --with-lang was given.
-if test "${with_lang+set}" = set; then :
-  withval=$with_lang;
-fi
+fi;
 
+# 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"
 
-# Check whether --with-poor-help-localizations was given.
-if test "${with_poor_help_localizations+set}" = set; then :
-  withval=$with_poor_help_localizations;
-fi
-
+fi;
 
-# Check whether --with-dict was given.
-if test "${with_dict+set}" = set; then :
-  withval=$with_dict;
-fi
+# Check whether --with-dict or --without-dict was given.
+if test "${with_dict+set}" = set; then
+  withval="$with_dict"
 
+fi;
 
-# Check whether --with-intro-bitmaps was given.
-if test "${with_intro_bitmaps+set}" = set; then :
-  withval=$with_intro_bitmaps;
-fi
+# Check whether --with-intro-bitmaps or --without-intro-bitmaps was given.
+if test "${with_intro_bitmaps+set}" = set; then
+  withval="$with_intro_bitmaps"
 
+fi;
 
-# Check whether --with-about-bitmaps was given.
-if test "${with_about_bitmaps+set}" = set; then :
-  withval=$with_about_bitmaps;
-fi
+# Check whether --with-about-bitmaps or --without-about-bitmaps was given.
+if test "${with_about_bitmaps+set}" = set; then
+  withval="$with_about_bitmaps"
 
+fi;
 
-# Check whether --with-vendor was given.
-if test "${with_vendor+set}" = set; then :
-  withval=$with_vendor;
-fi
+# Check whether --with-vendor or --without-vendor was given.
+if test "${with_vendor+set}" = set; then
+  withval="$with_vendor"
 
+fi;
 
-# Check whether --with-unix-wrapper was given.
-if test "${with_unix_wrapper+set}" = set; then :
-  withval=$with_unix_wrapper;
-fi
+# Check whether --with-unix-wrapper or --without-unix-wrapper was given.
+if test "${with_unix_wrapper+set}" = set; then
+  withval="$with_unix_wrapper"
 
+fi;
 
-# Check whether --with-asm-home was given.
-if test "${with_asm_home+set}" = set; then :
-  withval=$with_asm_home;
-fi
+# Check whether --with-asm-home or --without-asm-home was given.
+if test "${with_asm_home+set}" = set; then
+  withval="$with_asm_home"
 
+fi;
 
-# Check whether --with-os-version was given.
-if test "${with_os_version+set}" = set; then :
-  withval=$with_os_version;
-fi
+# Check whether --with-os-version or --without-os-version was given.
+if test "${with_os_version+set}" = set; then
+  withval="$with_os_version"
 
+fi;
 
-# Check whether --with-unzip-home was given.
-if test "${with_unzip_home+set}" = set; then :
-  withval=$with_unzip_home;
-fi
+# Check whether --with-unzip-home or --without-unzip-home was given.
+if test "${with_unzip_home+set}" = set; then
+  withval="$with_unzip_home"
 
+fi;
 
-# Check whether --with-zip-home was given.
-if test "${with_zip_home+set}" = set; then :
-  withval=$with_zip_home;
-fi
+# Check whether --with-zip-home or --without-zip-home was given.
+if test "${with_zip_home+set}" = set; then
+  withval="$with_zip_home"
 
+fi;
 
-# Check whether --with-mingwin was given.
-if test "${with_mingwin+set}" = set; then :
-  withval=$with_mingwin; WITH_MINGWIN=$withval
+# Check whether --with-mingwin or --without-mingwin was given.
+if test "${with_mingwin+set}" = set; then
+  withval="$with_mingwin"
+  WITH_MINGWIN=$withval
 else
   WITH_MINGWIN=0
-fi
-
+fi;
 
-# Check whether --with-use-shell was given.
-if test "${with_use_shell+set}" = set; then :
-  withval=$with_use_shell; with_use_shell=$withval
+# 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
 else
   with_use_shell="tcsh"
-fi
+fi;
 
+# 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 --with-build-version was given.
-if test "${with_build_version+set}" = set; then :
-  withval=$with_build_version; with_build_version=$withval
-fi
+# Check whether --with-alloc or --without-alloc was given.
+if test "${with_alloc+set}" = set; then
+  withval="$with_alloc"
 
+fi;
+# Check whether --enable-verbose or --disable-verbose was given.
+if test "${enable_verbose+set}" = set; then
+  enableval="$enable_verbose"
 
-# Check whether --with-alloc was given.
-if test "${with_alloc+set}" = set; then :
-  withval=$with_alloc;
-fi
-
-# Check whether --enable-verbose was given.
-if test "${enable_verbose+set}" = set; then :
-  enableval=$enable_verbose;
-fi
-
+fi;
 
 BUILD_TYPE="OOo"
 
@@ -4674,144 +2965,29 @@ echo "*                                                                  *"
 echo "********************************************************************"
 echo ""
 cat /dev/null > warn
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-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
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
+echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+if test "${ac_cv_prog_egrep+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+    then ac_cv_prog_egrep='grep -E'
+    else ac_cv_prog_egrep='egrep'
     fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-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
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AWK+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -4821,37 +2997,35 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
 fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_AWK+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_AWK+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $AWK in
   [\\/]* | ?:[\\/]*)
@@ -4863,41 +3037,42 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 AWK=$ac_cv_path_AWK
+
 if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
 if test -z "$AWK"; then
-   as_fn_error "install awk to run this script" "$LINENO" 5
+   { { 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
 
 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_SED+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $SED in
   [\\/]* | ?:[\\/]*)
@@ -4909,46 +3084,47 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 SED=$ac_cv_path_SED
+
 if test -n "$SED"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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_fn_error "install sed to run this script" "$LINENO" 5
+   { { 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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
 
 
@@ -4966,134 +3142,110 @@ if test -e $_solenv/inc/minor.mk; then
    SOURCEVERSION="`grep SOURCEVERSION= $_solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
 
 else
-   as_fn_error "$_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation..." "$LINENO" 5
+   { { 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
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
+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
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  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_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+   { (exit 1); exit 1; }; }
 fi
-
-# These three variables are undocumented and unsupported,
-# 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_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
-esac
+$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; }; }
+
+echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6
+if test "${ac_cv_build+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_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=`$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
+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
+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/'`
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
+echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6
+if test "${ac_cv_host+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
+  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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
-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
+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/'`
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
-$as_echo_n "checking target system type... " >&6; }
-if test "${ac_cv_target+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test "x$target_alias" = x; then
-  ac_cv_target=$ac_cv_host
-else
-  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
-fi
+  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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
-$as_echo "$ac_cv_target" >&6; }
-case $ac_cv_target in
-*-*-*) ;;
-*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
-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.
@@ -5102,22 +3254,23 @@ test -n "$target_alias" &&
   test "$program_prefix$program_suffix$program_transform_name" = \
     NONENONEs,x,x, &&
   program_prefix=${target_alias}-
-
 if test "$build" != "$host" -o "$build" != "$target" \
   -o "$host" != "$target"; then
-	{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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_fn_error "You need at least Cygwin V1.5.x" "$LINENO" 5
+      { { 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
    CygwinVer="false"
@@ -5134,10 +3287,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GNUTAR+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_GNUTAR+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $GNUTAR in
   [\\/]* | ?:[\\/]*)
@@ -5150,51 +3303,56 @@ for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GNUTAR="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 GNUTAR=$ac_cv_path_GNUTAR
+
 if test -n "$GNUTAR"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
 		if test -z "$GNUTAR"; then
-			as_fn_error "gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." "$LINENO" 5
+			{ { 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:${as_lineno-$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_fn_error "use solaris >= 6 to build OpenOffice.org" "$LINENO" 5
+      			{ { 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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_fn_error "only sparc and i386 processors are supported" "$LINENO" 5
+      			{ { 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
 		;;
 	linux-gnu*)
@@ -5225,8 +3383,8 @@ $as_echo "ok ($build_cpu)" >&6; }
 		test_freetype=no
 		_os=Darwin
       if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then
-         { $as_echo "$as_me:${as_lineno-$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
@@ -5247,17 +3405,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:${as_lineno-$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:${as_lineno-$LINENO}: result: found OSVERSION=$OSVERSION" >&5
-$as_echo "found OSVERSION=$OSVERSION" >&6; }
-		{ $as_echo "$as_me:${as_lineno-$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"
@@ -5268,8 +3426,8 @@ $as_echo_n "checking which thread library to use... " >&6; }
 			PTHREAD_CFLAGS=""
 			PTHREAD_LIBS="-pthread"
 		fi
-		{ $as_echo "$as_me:${as_lineno-$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)
@@ -5298,7 +3456,9 @@ $as_echo "$PTHREAD_LIBS" >&6; }
 		_os=AIX
 		;;
    *)
-   as_fn_error "$_os operating system is not suitable to build OpenOffice.org!" "$LINENO" 5
+   { { 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
 
@@ -5306,26 +3466,28 @@ esac
 
 
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	 echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
       else
-         as_fn_error "--enable-crashdump only accepts yes, no, TRUE or STATIC as parameter." "$LINENO" 5
+         { { 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
 fi
@@ -5336,88 +3498,90 @@ if test "$_os" = "WINNT"; then
 fi
 
 if test "$_os" = "WINNT"; then
-            { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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_fn_error "--enable-symbols only accepts yes, TRUE or SMALL as parameter." "$LINENO" 5
+			     { { 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=
 		     fi
@@ -5425,20 +3589,22 @@ $as_echo "yes, small ones" >&6; }
 	fi
 else
    ENABLE_SYMBOLS=
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+   echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "--disable-strip-solver only accepts yes or no as parameter." "$LINENO" 5
+           { { 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
 else
@@ -5450,151 +3616,151 @@ else
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: result: $DICT_SYSTEM_DIR" >&5
-$as_echo "$DICT_SYSTEM_DIR" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $HYPH_SYSTEM_DIR" >&5
-$as_echo "$HYPH_SYSTEM_DIR" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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
@@ -5603,16 +3769,22 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$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"; then
-      as_fn_error "only \"tcsh\" or \"bash\" are supported options" "$LINENO" 5
+      { { 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_fn_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
+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." "$LINENO" 5
+link, and copy the program to the name of the link." >&2;}
+   { (exit 1); exit 1; }; }
       fi
                   CC=`echo $CC | $SED "s/^guw.exe //"`
    CXX=`echo $CXX | $SED "s/^guw.exe //"`
@@ -5632,27 +3804,33 @@ link, and copy the program to the name of the link." "$LINENO" 5
    fi
 elif test $_os = "OS2"; then
    if test "$with_use_shell" != "tcsh"; then
-      as_fn_error "only \"tcsh\" is supported options" "$LINENO" 5
+      { { 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_fn_error "only \"tcsh\" or \"bash\" are supported options" "$LINENO" 5
+      { { 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:${as_lineno-$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" ; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cygwin gcc/g++" >&5
-$as_echo_n "checking for cygwin gcc/g++... " >&6; }
+   echo "$as_me:$LINENO: checking for cygwin gcc/g++" >&5
+echo $ECHO_N "checking for cygwin gcc/g++... $ECHO_C" >&6
    if which gcc > /dev/null && which g++ > /dev/null ; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
+      echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6
    else
-      as_fn_error "cygwin gcc and g++ are needed, please install them." "$LINENO" 5
+      { { 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
 
@@ -5660,10 +3838,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_SHELLPATH+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_SHELLPATH+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $SHELLPATH in
   [\\/]* | ?:[\\/]*)
@@ -5675,41 +3853,42 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 SHELLPATH=$ac_cv_path_SHELLPATH
+
 if test -n "$SHELLPATH"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
    if test -z "$SHELLPATH"; then
-      as_fn_error "tcsh not found in \$PATH" "$LINENO" 5
+      { { 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"`
    fi
 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_SHELLPATH+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_SHELLPATH+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $SHELLPATH in
   [\\/]* | ?:[\\/]*)
@@ -5721,50 +3900,51 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 SHELLPATH=$ac_cv_path_SHELLPATH
+
 if test -n "$SHELLPATH"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
    if test -z "$SHELLPATH"; then
-      as_fn_error "bash not found in \$PATH" "$LINENO" 5
+      { { 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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
@@ -5782,10 +3962,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -5795,37 +3975,35 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -5835,50 +4013,39 @@ 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
+  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="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -5888,37 +4055,77 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
+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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -5929,19 +4136,18 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.
@@ -5959,25 +4165,24 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -5987,41 +4192,39 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
     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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -6031,227 +4234,183 @@ 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
+  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="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   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:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
+  CC=$ac_ct_CC
 fi
 
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+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=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    rm -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
 
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdio.h>
+
 int
 main ()
 {
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
 
   ;
   return 0;
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+ac_clean_files="$ac_clean_files a.out a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking 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:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # 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 ''
+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=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # 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:${as_lineno-$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:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+See \`config.log' for more details." >&5
+echo "$as_me: error: C compiler cannot create executables
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }
 fi
+
 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
+  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:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
+	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
     fi
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.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:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
+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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -6259,31 +4418,38 @@ $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:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
+  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
 fi
+
 rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
+if test "${ac_cv_objext+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -6295,46 +4461,45 @@ 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:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  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:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
 fi
+
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -6348,49 +4513,55 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+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_compiler_gnu=yes
 else
-  ac_compiler_gnu=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
+echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -6401,34 +4572,39 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
+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_prog_cc_g=yes
 else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
+ac_cv_prog_cc_g=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
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -6444,14 +4620,18 @@ else
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $CC option to accept 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
@@ -6479,17 +4659,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);};
@@ -6504,37 +4679,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"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
+  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_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:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+    CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
 
+# 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'
@@ -6549,10 +4892,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_COMPATH+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_COMPATH+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $COMPATH in
   [\\/]* | ?:[\\/]*)
@@ -6564,29 +4907,28 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 COMPATH=$ac_cv_path_COMPATH
+
 if test -n "$COMPATH"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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
 
@@ -6596,44 +4938,54 @@ 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:${as_lineno-$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_fn_error "found version \"$_gcc_version\", use version 3+ of the gcc compiler" "$LINENO" 5
+      { { 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_fn_error "version \"$_gcc_version\" gives internal error with small." "$LINENO" 5
+           { { 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:${as_lineno-$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:${as_lineno-$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_fn_error "failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris" "$LINENO" 5
+          { { 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:${as_lineno-$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:${as_lineno-$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"
 
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
    #include <stdio.h>
@@ -6648,60 +5000,85 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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
@@ -6709,36 +5086,40 @@ for a in "$MAKE" $GNUMAKE make gmake gnumake; do
            break
       fi
 done
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "not found. install GNU make." "$LINENO" 5
+    { { 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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_fn_error "failed ($GNUMAKE $_make_version need 3.79.1+)" "$LINENO" 5
+       { { 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:${as_lineno-$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
@@ -6746,10 +5127,12 @@ for a in $GNUTAR gtar gnutar tar; do
            break
       fi
 done
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "not found. install GNU tar." "$LINENO" 5
+    { { 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
 
 
@@ -6760,10 +5143,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:${as_lineno-$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
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $_cc in
   [\\/]* | ?:[\\/]*)
@@ -6775,58 +5158,65 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 _cc=$ac_cv_path__cc
+
 if test -n "$_cc"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_cc" >&5
-$as_echo "$_cc" >&6; }
+  echo "$as_me:$LINENO: result: $_cc" >&5
+echo "${ECHO_T}$_cc" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   test -n "$_cc" && break
 done
 
       COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking the SunStudio C/C++ compiler version" >&5
-$as_echo_n "checking the SunStudio C/C++ compiler version... " >&6; }
+      echo "$as_me:$LINENO: checking the SunStudio C/C++ compiler version" >&5
+echo $ECHO_N "checking the SunStudio C/C++ compiler version... $ECHO_C" >&6
             _sunstudio_string=`$CC -V 2>&1 | grep '^cc' | sed -e 's/.* C //'`
       _sunstudio_version=`echo $_sunstudio_string | $AWK '{ print $1 }'`
       _sunstudio_major=`echo $_sunstudio_version | $AWK -F. '{ print $1 }'`
       if test "$_sunstudio_major" != "5"; then
-         as_fn_error "found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" "$LINENO" 5
+         { { 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_fn_error "found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" "$LINENO" 5
+            { { 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:${as_lineno-$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:${as_lineno-$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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
    #include <stdio.h>
@@ -6841,19 +5231,43 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  HAVE_LD_HASH_STYLE=FALSE
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+HAVE_LD_HASH_STYLE=FALSE
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+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:${as_lineno-$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:${as_lineno-$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
@@ -6865,10 +5279,10 @@ if test "$_os" = "OSF1"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$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
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $_cc in
   [\\/]* | ?:[\\/]*)
@@ -6880,44 +5294,45 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 _cc=$ac_cv_path__cc
+
 if test -n "$_cc"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_cc" >&5
-$as_echo "$_cc" >&6; }
+  echo "$as_me:$LINENO: result: $_cc" >&5
+echo "${ECHO_T}$_cc" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   test -n "$_cc" && break
 done
 
       COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ******* $_cc , $COMPATH" >&5
-$as_echo "$as_me: WARNING: ******* $_cc , $COMPATH" >&2;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking the Compaq C compiler version" >&5
-$as_echo_n "checking the Compaq C compiler version... " >&6; }
+      { echo "$as_me:$LINENO: WARNING: ******* $_cc , $COMPATH" >&5
+echo "$as_me: WARNING: ******* $_cc , $COMPATH" >&2;}
+      echo "$as_me:$LINENO: checking the Compaq C compiler version" >&5
+echo $ECHO_N "checking the Compaq C compiler version... $ECHO_C" >&6
             _compaqc_version=`$CC -V 2>&1 | $AWK '{ print $3 }'`
       _compaqc_major=`echo $_compaqc_version | $AWK -F. '{ print $1 }'`
       if test "$_compaqc_major" != "T6"; then
-         as_fn_error "found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" "$LINENO" 5
+         { { 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:${as_lineno-$LINENO}: result: checked" >&5
-$as_echo "checked" >&6; }
+                  echo "$as_me:$LINENO: result: checked" >&5
+echo "${ECHO_T}checked" >&6
       fi
    fi
 fi
@@ -6925,10 +5340,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PERL+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PERL+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PERL in
   [\\/]* | ?:[\\/]*)
@@ -6940,29 +5355,28 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 PERL=$ac_cv_path_PERL
+
 if test -n "$PERL"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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"`
@@ -6971,38 +5385,46 @@ else
    if test -x "$_perl_path"; then
       PERL=$_perl_path
    else
-      as_fn_error "$_perl_path not found" "$LINENO" 5
+      { { 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:${as_lineno-$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_fn_error "found Perl version \"$_perl_version\", use version 5 of Perl" "$LINENO" 5
+      { { 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:${as_lineno-$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_fn_error "Perl not found, install version 5 of Perl" "$LINENO" 5
+   { { 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:${as_lineno-$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:${as_lineno-$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_fn_error "Failed to find some modules" "$LINENO" 5
+	{ { 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:${as_lineno-$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`;
@@ -7012,8 +5434,8 @@ $as_echo_n "checking for friendly registry keys... " >&6; }
 		else
 			with_cl_home=`cygpath -u "$with_cl_home"`
 		fi
-		{ $as_echo "$as_me:${as_lineno-$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"`
@@ -7034,10 +5456,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSPDB_PATH+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_MSPDB_PATH+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $MSPDB_PATH in
   [\\/]* | ?:[\\/]*)
@@ -7049,35 +5471,34 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 MSPDB_PATH=$ac_cv_path_MSPDB_PATH
+
 if test -n "$MSPDB_PATH"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSPDB_PATH+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_MSPDB_PATH+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $MSPDB_PATH in
   [\\/]* | ?:[\\/]*)
@@ -7089,50 +5510,51 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 MSPDB_PATH=$ac_cv_path_MSPDB_PATH
+
 if test -n "$MSPDB_PATH"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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_fn_error "You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path" "$LINENO" 5
+			{ { 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:${as_lineno-$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:${as_lineno-$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
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $CC in
   [\\/]* | ?:[\\/]*)
@@ -7144,41 +5566,40 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 CC=$ac_cv_path_CC
+
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
    		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:${as_lineno-$LINENO}: result: found ($CC)" >&5
-$as_echo "found ($CC)" >&6; }
+			echo "$as_me:$LINENO: result: found ($CC)" >&5
+echo "${ECHO_T}found ($CC)" >&6
 			COMPATH=`echo $CC | $SED 's@\/[Bb][Ii][Nn]\/[cC][lL]\.[eE][xX][eE]@@'`
 			export INCLUDE=`cygpath -d "$COMPATH/Include"`
-						{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the Version of Microsoft C/C++ Compiler" >&5
-$as_echo_n "checking the Version of Microsoft C/C++ Compiler... " >&6; }
+						echo "$as_me:$LINENO: checking the Version of Microsoft C/C++ Compiler" >&5
+echo $ECHO_N "checking the Version of Microsoft C/C++ Compiler... $ECHO_C" >&6
 			CCNUMVER=`$CC 2>&1 | $AWK "/Microsoft/ && /..\\...\\...../ {
 							x = match( \\\$0, /..\\...\\...../ )
 							CCversion = substr( \\\$0, RSTART, RLENGTH)
@@ -7187,42 +5608,48 @@ $as_echo_n "checking the Version of Microsoft C/C++ Compiler... " >&6; }
 								printf (\"%04d\",vertoken[i] )
 							}
 							}"`
-			{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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_fn_error "Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler." "$LINENO" 5
+				{ { 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_fn_error "Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe." "$LINENO" 5
+			{ { 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:${as_lineno-$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:${as_lineno-$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_fn_error "Mingwin32 C++ Compiler not found." "$LINENO" 5
+			{ { 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
 fi
@@ -7234,10 +5661,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MIDL_PATH+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_MIDL_PATH+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $MIDL_PATH in
   [\\/]* | ?:[\\/]*)
@@ -7249,29 +5676,28 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 MIDL_PATH=$ac_cv_path_MIDL_PATH
+
 if test -n "$MIDL_PATH"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
 	if test -n "$MIDL_PATH";then
 		MIDL_PATH=`dirname "$MIDL_PATH"`
 	fi
@@ -7297,7 +5723,9 @@ fi
 		fi
 	fi
 	if test ! -x "$MIDL_PATH/midl.exe"; then
-		as_fn_error "midl.exe not found. Make sure it's in the path or use --with-midl-path" "$LINENO" 5
+		{ { 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 )
 	MIDL_PATH=`cygpath -d "$MIDL_PATH"`
@@ -7305,10 +5733,10 @@ fi
 
 		# 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CSC_PATH+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_CSC_PATH+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $CSC_PATH in
   [\\/]* | ?:[\\/]*)
@@ -7320,29 +5748,28 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 CSC_PATH=$ac_cv_path_CSC_PATH
+
 if test -n "$CSC_PATH"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
 	if test -n "$CSC_PATH";then
 		CSC_PATH=`dirname "$CSC_PATH"`
 	fi
@@ -7358,14 +5785,16 @@ fi
 	   fi
 	fi
 	if test ! -x "$CSC_PATH/csc.exe"; then
-		as_fn_error "csc.exe not found. Make sure it's in the path or use --with-csc-path" "$LINENO" 5
+		{ { 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:${as_lineno-$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
@@ -7387,10 +5816,12 @@ $as_echo_n "checking .NET Framework... " >&6; }
           fi
 	    fi
 	    if test ! -f "$FRAME_HOME/lib/mscoree.lib"; then
-		as_fn_error "mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home" "$LINENO" 5
+		{ { 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:${as_lineno-$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"`
@@ -7406,15 +5837,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:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
+echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # 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
+  if test "${ac_cv_prog_CPP+set}" = set; then
+  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"
@@ -7428,7 +5859,11 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -7437,24 +5872,68 @@ do
 #endif
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
+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
+  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
+  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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -7464,7 +5943,7 @@ rm -f conftest.err conftest.$ac_ext
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok; then
   break
 fi
 
@@ -7476,8 +5955,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ $as_echo "$as_me:${as_lineno-$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
@@ -7487,7 +5966,11 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -7496,24 +5979,68 @@ do
 #endif
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
+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
+  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
+  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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -7523,13 +6050,14 @@ rm -f conftest.err conftest.$ac_ext
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
+if $ac_preproc_ok; then
+  :
 else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 ac_ext=c
@@ -7539,12 +6067,16 @@ 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:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+if test "${ac_cv_header_stdc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -7559,23 +6091,51 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+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_header_stdc=yes
 else
-  ac_cv_header_stdc=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_header_stdc=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+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.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
+  $EGREP "memchr" >/dev/null 2>&1; then
+  :
 else
   ac_cv_header_stdc=no
 fi
@@ -7585,14 +6145,18 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
+  $EGREP "free" >/dev/null 2>&1; then
+  :
 else
   ac_cv_header_stdc=no
 fi
@@ -7602,13 +6166,16 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes; then
   :
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ctype.h>
-#include <stdlib.h>
 #if ((' ' & 0x0FF) == 0x020)
 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
@@ -7628,50 +6195,61 @@ 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
-if ac_fn_c_try_run "$LINENO"; then :
-
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./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
-  ac_cv_header_stdc=no
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_header_stdc=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
 
 fi
 
 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CXX+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -7681,41 +6259,39 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
 fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+  echo "$as_me:$LINENO: result: $CXX" >&5
+echo "${ECHO_T}$CXX" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
     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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -7725,77 +6301,64 @@ 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
+  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_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
 fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
+  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+echo "${ECHO_T}$ac_ct_CXX" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   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:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-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:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+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=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    rm -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -7809,34 +6372,55 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+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_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
-  ac_compiler_gnu=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GXX=yes
-else
-  GXX=
-fi
+echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
+GXX=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -7847,80 +6431,176 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+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_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
-  CXXFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+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
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
+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_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
-  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+  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
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-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
+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_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
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
+  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
+
 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:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
 if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+  if test "${ac_cv_prog_CXXCPP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
       # Double quotes because CXXCPP needs to be expanded
     for CXXCPP in "$CXX -E" "/lib/cpp"
@@ -7934,7 +6614,11 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -7943,24 +6627,68 @@ do
 #endif
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
+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
+  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
+  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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if { (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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -7970,7 +6698,7 @@ rm -f conftest.err conftest.$ac_ext
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok; then
   break
 fi
 
@@ -7982,8 +6710,8 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
+echo "$as_me:$LINENO: result: $CXXCPP" >&5
+echo "${ECHO_T}$CXXCPP" >&6
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
@@ -7993,7 +6721,11 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -8002,24 +6734,68 @@ do
 #endif
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
+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
+  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
+  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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if { (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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -8029,13 +6805,14 @@ rm -f conftest.err conftest.$ac_ext
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
+if $ac_preproc_ok; then
+  :
 else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details." >&5
+echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 ac_ext=c
@@ -8053,15 +6830,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:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
+echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # 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
+  if test "${ac_cv_prog_CPP+set}" = set; then
+  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"
@@ -8075,7 +6852,11 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -8084,24 +6865,68 @@ do
 #endif
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
+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
+  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
+  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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -8111,7 +6936,7 @@ rm -f conftest.err conftest.$ac_ext
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok; then
   break
 fi
 
@@ -8123,8 +6948,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ $as_echo "$as_me:${as_lineno-$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
@@ -8134,7 +6959,11 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -8143,24 +6972,68 @@ do
 #endif
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
+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
+  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
+  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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -8170,13 +7043,14 @@ rm -f conftest.err conftest.$ac_ext
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
+if $ac_preproc_ok; then
+  :
 else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 ac_ext=c
@@ -8189,16 +7063,70 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 fi
 
 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
+
+
+
+
+
+
+
+
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (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
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_Header=no"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+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
@@ -8206,288 +7134,678 @@ 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:${as_lineno-$LINENO}: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then :
-  $as_echo_n "(cached) " >&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
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+  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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (long)
-See \`config.log' for more details." "$LINENO" 5; }; }
-   else
-     ac_cv_sizeof_long=0
-   fi
-fi
+  # 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
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
+test_array [0] = 0
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
+  ;
+  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_lo=0 ac_mid=0
+  while :; do
+    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 ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
+test_array [0] = 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_hi=$ac_mid; break
+else
+  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`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
+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 ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
+test_array [0] = 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_hi=-1 ac_mid=-1
+  while :; do
+    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 ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
+test_array [0] = 0
 
-SIZEOF_LONG=$ac_cv_sizeof_long
+  ;
+  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_lo=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+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 conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
 else
-  ac_cv_c_bigendian=unknown
-    # See if we're dealing with a universal compiler.
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __APPLE_CC__
-	       not a universal capable compiler
-	     #endif
-	     typedef int dummy;
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-	# Check for potential -arch flags.  It is not universal unless
-	# there are at least two -arch flags with different values.
-	ac_arch=
-	ac_prev=
-	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
-	 if test -n "$ac_prev"; then
-	   case $ac_word in
-	     i?86 | x86_64 | ppc | ppc64)
-	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
-		 ac_arch=$ac_word
-	       else
-		 ac_cv_c_bigendian=universal
-		 break
-	       fi
-	       ;;
-	   esac
-	   ac_prev=
-	 elif test "x$ac_word" = "x-arch"; then
-	   ac_prev=arch
-	 fi
-       done
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo= ac_hi=
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 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 confdefs.h - <<_ACEOF >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`
+  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>
-
+$ac_includes_default
 int
 main ()
 {
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-		     && LITTLE_ENDIAN)
-	      bogus endian macros
-	     #endif
+static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
+test_array [0] = 0
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  # It does; now see whether it defined to BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-		#include <sys/param.h>
+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_hi=$ac_mid
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_long=$ac_lo;;
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (long), 77
+See \`config.log' for more details." >&2;}
+   { (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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+long longval () { return (long) (sizeof (long)); }
+unsigned long ulongval () { return (long) (sizeof (long)); }
+#include <stdio.h>
+#include <stdlib.h>
 int
 main ()
 {
-#if BYTE_ORDER != BIG_ENDIAN
-		 not big endian
-		#endif
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    exit (1);
+  if (((long) (sizeof (long))) < 0)
+    {
+      long i = longval ();
+      if (i != ((long) (sizeof (long))))
+	exit (1);
+      fprintf (f, "%ld\n", i);
+    }
+  else
+    {
+      unsigned long i = ulongval ();
+      if (i != ((long) (sizeof (long))))
+	exit (1);
+      fprintf (f, "%lu\n", i);
+    }
+  exit (ferror (f) || fclose (f) != 0);
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_bigendian=yes
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./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_sizeof_long=`cat conftest.val`
 else
-  ac_cv_c_bigendian=no
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (long), 77
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+fi
+rm -f conftest.val
+else
+  ac_cv_sizeof_long=0
+fi
+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
+
+
+SIZEOF_LONG=$ac_cv_sizeof_long
+
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  # 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 <limits.h>
+#include <sys/types.h>
+#include <sys/param.h>
 
 int
 main ()
 {
-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-	      bogus endian macros
-	     #endif
+#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+ bogus endian macros
+#endif
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  # It does; now see whether it defined to _BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+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
+  # 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>
+#include <sys/types.h>
+#include <sys/param.h>
 
 int
 main ()
 {
-#ifndef _BIG_ENDIAN
-		 not big endian
-		#endif
+#if BYTE_ORDER != BIG_ENDIAN
+ not big endian
+#endif
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+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_c_bigendian=yes
 else
-  ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  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
-    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 confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* 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;
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+# 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.  */
+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 ()
 {
-return use_ascii (foo) == use_ebcdic (foo);
+ _ascii (); _ebcdic ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; 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
+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
+  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
+  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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$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
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./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_c_bigendian=no
 else
-  ac_cv_c_bigendian=yes
+  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 -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam 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:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
- case $ac_cv_c_bigendian in #(
-   yes)
-     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
-;; #(
-   no)
-      ;; #(
-   universal)
-
-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+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)
 
-     ;; #(
-   *)
-     as_fn_error "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
- esac
+cat >>confdefs.h <<\_ACEOF
+#define WORDS_BIGENDIAN 1
+_ACEOF
+ ;;
+  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
 
 WORDS_BIGENDIAN=$ac_cv_c_bigendian
 
 
-# Check whether --enable-largefile was given.
-if test "${enable_largefile+set}" = set; then :
-  enableval=$enable_largefile;
-fi
+# Check whether --enable-largefile or --disable-largefile was given.
+if test "${enable_largefile+set}" = set; then
+  enableval="$enable_largefile"
 
+fi;
 if test "$enable_largefile" != no; then
 
-  { $as_echo "$as_me:${as_lineno-$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; }
-if test "${ac_cv_sys_largefile_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_sys_largefile_CC=no
      if test "$GCC" != yes; then
        ac_save_CC=$CC
        while :; do
-	 # IRIX 6.2 and later do not support large files by default,
-	 # so use the C compiler's -n32 option if that helps.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+     	 # 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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -8506,34 +7824,89 @@ main ()
   return 0;
 }
 _ACEOF
-	 if ac_fn_c_try_compile "$LINENO"; then :
+     	 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 core conftest.err conftest.$ac_objext
-	 CC="$CC -n32"
-	 if ac_fn_c_try_compile "$LINENO"; then :
+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
+  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
+  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:${as_lineno-$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:${as_lineno-$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; }
-if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  ac_cv_sys_file_offset_bits=no
+  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>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -8552,11 +7925,40 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_file_offset_bits=no; break
+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 core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+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.  */
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -8576,33 +7978,60 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+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_sys_file_offset_bits=64; 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
-  ac_cv_sys_file_offset_bits=unknown
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
-$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if test "${ac_cv_sys_large_files+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  ac_cv_sys_large_files=no
+  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>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -8621,11 +8050,40 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_large_files=no; break
+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 core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+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.  */
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -8645,26 +8103,48 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+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_sys_large_files=1; 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
-  ac_cv_sys_large_files=unknown
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-{ $as_echo "$as_me:${as_lineno-$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
@@ -8675,42 +8155,44 @@ if test -n "$ac_cv_sys_large_files" && test "$ac_cv_sys_large_files" != "no"; th
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: result: uno extension" >&5
-$as_echo "uno extension" >&6; }
-         { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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_fn_error "unknown packaging method" "$LINENO" 5
+            { { 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:${as_lineno-$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
@@ -8720,74 +8202,379 @@ fi
 
 
 if test "$test_cups" = "yes" -a "$ENABLE_CUPS" = "TRUE" ; then
-    ac_fn_c_check_header_mongrel "$LINENO" "cups/cups.h" "ac_cv_header_cups_cups_h" "$ac_includes_default"
-if test "x$ac_cv_header_cups_cups_h" = x""yes; then :
+    if test "${ac_cv_header_cups_cups_h+set}" = set; then
+  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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <cups/cups.h>
+_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_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <cups/cups.h>
+_ACEOF
+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
+  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
-  as_fn_error "cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?" "$LINENO" 5
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: cups/cups.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: cups/cups.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: cups/cups.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: cups/cups.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: cups/cups.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: cups/cups.h: 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
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_cups_cups_h=$ac_header_preproc
+fi
+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 $ac_cv_header_cups_cups_h = yes; then
+  :
+else
+  { { 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
 
 
 fi
 
 if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "GNU"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
     PAM=YES
-    ac_fn_c_check_header_mongrel "$LINENO" "security/pam_appl.h" "ac_cv_header_security_pam_appl_h" "$ac_includes_default"
-if test "x$ac_cv_header_security_pam_appl_h" = x""yes; then :
+    if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
+  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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <security/pam_appl.h>
+_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_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <security/pam_appl.h>
+_ACEOF
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the 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:* )
+    { 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
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_security_pam_appl_h=$ac_header_preproc
+fi
+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 $ac_cv_header_security_pam_appl_h = yes; then
+  :
 else
-  as_fn_error "pam_appl.h could not be found. libpam-dev or pam-devel missing?" "$LINENO" 5
+  { { 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5
-$as_echo_n "checking for pam_start in -lpam... " >&6; }
-if test "${ac_cv_lib_pam_pam_start+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpam  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_pam_pam_start=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_pam_pam_start=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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
@@ -8795,17 +8582,19 @@ _ACEOF
   LIBS="-lpam $LIBS"
 
 else
-  as_fn_error "libpam not found or functional" "$LINENO" 5
+  { { 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:${as_lineno-$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:${as_lineno-$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
 
@@ -8816,11 +8605,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:${as_lineno-$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
+    if test "${ac_cv_func_which_getspnam_r+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -8837,7 +8626,11 @@ ac_cv_func_which_getspnam_r=unknown
 # netdb.h is not declaring the function, and the compiler is thereby
 # assuming an implicit prototype. In which case, we're out of luck.
 #
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 	    #include <sys/types.h>
@@ -8854,10 +8647,35 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+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_func_which_getspnam_r=no
+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
 
 #
 # FIVE ARGUMENTS
@@ -8865,7 +8683,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test "$ac_cv_func_which_getspnam_r" = "unknown"; then
 
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 	    #include <sys/types.h>
@@ -8884,10 +8706,35 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+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_func_which_getspnam_r=five
+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
 
 fi
 
@@ -8897,7 +8744,11 @@ fi
 
 if test "$ac_cv_func_which_getspnam_r" = "unknown"; then
 
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 	    #include <sys/types.h>
@@ -8916,10 +8767,35 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+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_func_which_getspnam_r=four
+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
 
 fi
 
@@ -8930,28 +8806,30 @@ fi
 
 case "$ac_cv_func_which_getspnam_r" in
     five)
-    { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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_fn_error "internal error" "$LINENO" 5
+    { { echo "$as_me:$LINENO: error: internal error" >&5
+echo "$as_me: error: internal error" >&2;}
+   { (exit 1); exit 1; }; }
     ;;
 esac
 
@@ -8970,49 +8848,78 @@ fi
 
 
 if test "$_os" = "Linux"; then
-    { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
-$as_echo_n "checking for crypt in -lcrypt... " >&6; }
-if test "${ac_cv_lib_crypt_crypt+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_crypt_crypt=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_crypt_crypt=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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
@@ -9020,12 +8927,14 @@ _ACEOF
   LIBS="-lcrypt $LIBS"
 
 else
-  as_fn_error "libcrypt not found or functional" "$LINENO" 5
+  { { 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:${as_lineno-$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
@@ -9044,24 +8953,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CXX+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -9071,41 +8976,39 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
 fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+  echo "$as_me:$LINENO: result: $CXX" >&5
+echo "${ECHO_T}$CXX" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
     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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -9115,77 +9018,64 @@ 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
+  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_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
 fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
+  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+echo "${ECHO_T}$ac_ct_CXX" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   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:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-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:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+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=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    rm -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -9199,34 +9089,55 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+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_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
-  ac_compiler_gnu=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GXX=yes
-else
-  GXX=
-fi
+echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
+GXX=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -9237,64 +9148,160 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+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_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
-  CXXFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+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
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
+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_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
-  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+  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
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-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
+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_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
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
+  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
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -9304,27 +9311,32 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 fi
 
 if test "$GXX" = "yes"; then
-   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: checking whether $CXX has the enum bug" >&5
-$as_echo_n "checking whether $CXX has the enum bug... " >&6; }
-if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+         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
+  { { 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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 extern "C" void abort (void);
@@ -9349,16 +9361,31 @@ main (void)
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  as_fn_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." "$LINENO" 5
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./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
+  { { 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
+  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: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-
       fi
    fi
 fi
@@ -9366,8 +9393,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:${as_lineno-$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
@@ -9385,18 +9412,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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>
@@ -9414,16 +9441,16 @@ _ACEOF
    fi
    if test -z "$_mingw_lib_include_path"; then
       _mingw_lib_include_path="NO_LIB_INCLUDE"
-      { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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
@@ -9432,57 +9459,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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/bin && ls $MINGW_GCCDLL_pattern 2>/dev/null`
     if test -n "$MINGW_GCCDLL"; then
         MINGW_SHARED_GCCLIB=YES
-        { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
   fi
   if test -e "$MINGW_CLIB_DIR/libgcc_eh.a"; then
       MINGW_GCCLIB_EH=YES
   fi
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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/bin && ls $MINGW_GXXDLL_pattern 2>/dev/null`
     if test -n "$MINGW_GXXDLL"; then
         MINGW_SHARED_GXXLIB=YES
-        { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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`
 
@@ -9495,50 +9522,50 @@ fi
 
 if test "$_os" = "SunOS"; then
       if test "$CC" = "cc"; then
-   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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'
@@ -9546,7 +9573,11 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 if test "$WITH_MINGWIN" = "yes"; then
 
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <iostream>
 
@@ -9561,18 +9592,42 @@ _Unwind_SjLj_RaiseException()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  exceptions_type="dwarf2"
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+exceptions_type="dwarf2"
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 fi
 
-{ $as_echo "$as_me:${as_lineno-$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'
@@ -9585,8 +9640,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:${as_lineno-$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
@@ -9600,15 +9655,15 @@ $as_echo_n "checking for patch 106327-06 or greater... " >&6; }
         fi
       done
       if test "$_patch" = "found"; then
-         { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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
@@ -9622,17 +9677,17 @@ $as_echo_n "checking for patch 106950-11 or greater... " >&6; }
          fi
       done
       if test "$_patch" = "found"; then
-         { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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
@@ -9646,15 +9701,15 @@ $as_echo_n "checking for patch 105591-09 or greater... " >&6; }
            fi
          done
          if test "$_patch" = "found"; then
-            { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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
@@ -9668,19 +9723,19 @@ $as_echo_n "checking for patch 107733-08 or greater... " >&6; }
            fi
          done
          if test "$_patch" = "found"; then
-            { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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
 
-   { $as_echo "$as_me:${as_lineno-$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
@@ -9701,100 +9756,134 @@ $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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: WARNING: using system STL. Warning, breaks your ABI compatability!" >&5
-$as_echo "$as_me: WARNING: using system STL. Warning, breaks your ABI compatability!" >&2;}
+         { echo "$as_me:$LINENO: WARNING: using system STL. Warning, breaks your ABI compatability!" >&5
+echo "$as_me: WARNING: using system STL. Warning, breaks your ABI compatability!" >&2;}
          echo "using system STL. Warning, breaks your ABI compatability!" >>warn
       fi
    else
       STLPORT4=$WITH_STLPORT
       if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+         cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $STLPORT4/stlport/hash_map
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked." >&5
-$as_echo "checked." >&6; }
+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
+  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
-  as_fn_error "STLport headers not found." "$LINENO" 5
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  { { 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:${as_lineno-$LINENO}: result: checked." >&5
-$as_echo "checked." >&6; }
+            echo "$as_me:$LINENO: result: checked." >&5
+echo "${ECHO_T}checked." >&6
          else
-            as_fn_error "STLport headers not found." "$LINENO" 5
+            { { 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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_fn_error "STLport libraries not found" "$LINENO" 5
+			      { { 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:${as_lineno-$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:${as_lineno-$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_fn_error "STLport libraries not found" "$LINENO" 5
+			      { { echo "$as_me:$LINENO: error: STLport libraries not found" >&5
+echo "$as_me: error: STLport libraries not found" >&2;}
+   { (exit 1); exit 1; }; }
 		      fi
 		   else
 			   if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
-				   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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_fn_error "STLport libraries not found" "$LINENO" 5
+				   { { 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:${as_lineno-$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
@@ -9810,11 +9899,15 @@ fi
 
 
 if test "$GCC" = "yes"; then
-   { $as_echo "$as_me:${as_lineno-$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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -9825,47 +9918,72 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+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:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+      echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
    fi
 fi
 
 # ===================================================================
 # use --ccache-skip?
 # ===================================================================
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CCACHE+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_CCACHE+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $CCACHE in
   [\\/]* | ?:[\\/]*)
@@ -9877,44 +9995,43 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
    if test "$CCACHE" = "not_found" ; then
-      { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-         { $as_echo "$as_me:${as_lineno-$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'
@@ -9922,7 +10039,11 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
          save_CXXFLAGS=$CXXFLAGS
          CXXFLAGS="$CXXFLAGS --ccache-skip -O2"
-                  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+                  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -9933,20 +10054,44 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+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_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
-  use_ccache=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+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:${as_lineno-$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:${as_lineno-$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
@@ -9956,27 +10101,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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-         { $as_echo "$as_me:${as_lineno-$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_fn_error "invalid option to --enable-ccache-skip. Valid values are \"auto\", \"yes\" and \"no\"" "$LINENO" 5
+   { { 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:${as_lineno-$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'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ext/hash_map>
 using namespace __gnu_cxx;
@@ -9989,42 +10140,72 @@ hash_map<int, int> t; return 0;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+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_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
-  ac_cv_cxx_have_ext_hash_map=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+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_fn_error "Can't find hash_map. Try with --with-stlport" "$LINENO" 5
+      { { 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:${as_lineno-$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:${as_lineno-$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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <string>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "visibility push" >/dev/null 2>&1; then :
+  $EGREP "visibility push" >/dev/null 2>&1; then
   stlvisok=yes
 else
   stlvisok=no
 fi
 rm -f conftest*
 
-      { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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
@@ -10034,9 +10215,13 @@ $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:${as_lineno-$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; }
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+      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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sstream>
 using namespace std;
@@ -10049,19 +10234,43 @@ istringstream strm( "test" ); return 0;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  gccvisok=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+gccvisok=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gccvisok" >&5
-$as_echo "$gccvisok" >&6; }
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+      echo "$as_me:$LINENO: result: $gccvisok" >&5
+echo "${ECHO_T}$gccvisok" >&6
       if test "$gccvisok" = "no"; then
-         { $as_echo "$as_me:${as_lineno-$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
@@ -10070,8 +10279,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:${as_lineno-$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 {
@@ -10099,11 +10308,11 @@ _ACEOF
       fi
       rm -f visibility.s
 
-      { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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
@@ -10119,20 +10328,112 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: system" >&5
-$as_echo "system" >&6; }
+    echo "$as_me:$LINENO: result: system" >&5
+echo "${ECHO_T}system" >&6
     ALLOC="SYS_ALLOC";
-    for ac_func in malloc realloc calloc free
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+
+
+
+
+for ac_func in malloc realloc calloc free
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any 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)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+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
@@ -10140,48 +10441,79 @@ done
 
 fi
 if test "$with_alloc" = "tcmalloc"; then
-    { $as_echo "$as_me:${as_lineno-$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_fn_error "tcmalloc only available/usable on ix86" "$LINENO" 5
+        { { 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:${as_lineno-$LINENO}: checking for malloc in -ltcmalloc" >&5
-$as_echo_n "checking for malloc in -ltcmalloc... " >&6; }
-if test "${ac_cv_lib_tcmalloc_malloc+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltcmalloc  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_tcmalloc_malloc=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_tcmalloc_malloc=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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
@@ -10189,44 +10521,46 @@ _ACEOF
   LIBS="-ltcmalloc $LIBS"
 
 else
-  as_fn_error "tcmalloc not found or functional. Install the Google Profiling Tools" "$LINENO" 5
+  { { 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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
 
@@ -10253,10 +10587,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_JAVAINTERPRETER+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_JAVAINTERPRETER+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $JAVAINTERPRETER in
   [\\/]* | ?:[\\/]*)
@@ -10268,35 +10602,36 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 JAVAINTERPRETER=$ac_cv_path_JAVAINTERPRETER
+
 if test -n "$JAVAINTERPRETER"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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_fn_error "$_java_path not found set with_jdk_home" "$LINENO" 5
+         { { 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
    if test "$_os" = "WINNT"; then
@@ -10310,11 +10645,13 @@ fi
 
 if test "$SOLAR_JAVA" != ""; then
    _gij_longver=0
-   { $as_echo "$as_me:${as_lineno-$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_fn_error "No valid check available. Please check the block for your desired java in configure.in" "$LINENO" 5
+         { { 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/"`
 #        if test -z "$KAFFE_VER"; then
@@ -10334,13 +10671,15 @@ $as_echo_n "checking the installed JDK... " >&6; }
 #        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:${as_lineno-$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_fn_error "No valid check available. Please check the block for your desired java in configure.in" "$LINENO" 5
+         { { 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
 #
 #        dnl BEA JDK specific tests
@@ -10370,15 +10709,20 @@ $as_echo "checked (gcj)" >&6; }
         _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
 
         if test "$_jdk_ver" -lt 10500; then
-             as_fn_error "IBM JDK is too old, you need at least 1.5" "$LINENO" 5
+             { { 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:${as_lineno-$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_fn_error "In order to successfully build OpenOffice.org using the IBM JDK,
-you must use the \"--with-jdk-home\" configure option explicitly" "$LINENO" 5
+             { { 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
+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
 
         JAVA_HOME=$with_jdk_home
@@ -10390,10 +10734,12 @@ you must use the \"--with-jdk-home\" configure option explicitly" "$LINENO" 5
         _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
 
         if test "$_jdk_ver" -lt 10500; then
-             as_fn_error "JDK is too old, you need at least 1.5" "$LINENO" 5
+             { { 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:${as_lineno-$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]$,,"`
@@ -10403,7 +10749,9 @@ $as_echo "checked (JDK $_jdk)" >&6; }
         fi
       fi
    else
-      as_fn_error "JAVA not found. You need at least jdk-1.5, or gcj-4" "$LINENO" 5
+      { { 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
       JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME
@@ -10423,10 +10771,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_JAVACOMPILER+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_JAVACOMPILER+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $JAVACOMPILER in
   [\\/]* | ?:[\\/]*)
@@ -10438,29 +10786,28 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 JAVACOMPILER=$ac_cv_path_JAVACOMPILER
+
 if test -n "$JAVACOMPILER"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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
@@ -10468,7 +10815,9 @@ fi
         fi
     fi
     if test -z "$JAVACOMPILER"; then
-      as_fn_error "$javacompiler not found set with_jdk_home" "$LINENO" 5
+      { { 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
        if test x`echo "$JAVACOMPILER" | grep -i '\.exe$'` = x; then
@@ -10484,11 +10833,11 @@ fi
     fi
 
     if test `$JAVACOMPILER -version 2>&1 | grep -c "Eclipse Java Compiler"` -gt 0; then
-        { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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="40200"
@@ -10507,10 +10856,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_JAVADOC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_JAVADOC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $JAVADOC in
   [\\/]* | ?:[\\/]*)
@@ -10522,29 +10871,28 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 JAVADOC=$ac_cv_path_JAVADOC
+
 if test -n "$JAVADOC"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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
@@ -10557,10 +10905,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_JAVADOC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_JAVADOC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $JAVADOC in
   [\\/]* | ?:[\\/]*)
@@ -10572,33 +10920,34 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 JAVADOC=$ac_cv_path_JAVADOC
+
 if test -n "$JAVADOC"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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_fn_error "$_javadoc_path not found set with_jdk_home" "$LINENO" 5
+      { { 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
         if test x`echo "$JAVADOC" | grep -i '\.exe$'` = x; then
@@ -10630,33 +10979,37 @@ class findhome
     }
 }
 _ACEOF
-        { $as_echo "$as_me:${as_lineno-$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\":${as_lineno-$LINENO}: \"$javac_cmd\""; } >&5
+        { (eval echo "$as_me:$LINENO: \"$javac_cmd\"") >&5
   (eval $javac_cmd) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
         if test $? = 0 && test -f ./findhome.class ; then
-          { $as_echo "$as_me:${as_lineno-$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_fn_error "javac does not work - java projects will not build!" "$LINENO" 5
+          { { 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:${as_lineno-$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:${as_lineno-$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_fn_error "gij does not know its java.home - use --with-jdk-home" "$LINENO" 5
+          { { 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
         JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*$WITH_JAVA,,p"`
@@ -10678,10 +11031,10 @@ $as_echo "$JAVA_HOME" >&6; }
             JAVA_HOME=$(readlink $JAVACOMPILER)
          else
           # else warn
-          { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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
@@ -10703,12 +11056,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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
@@ -10721,59 +11074,225 @@ fi
 
 AWTLIB=
 if test "$SOLAR_JAVA" != ""; then
-   { $as_echo "$as_me:${as_lineno-$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
       CFLAGS="$CFLAGS -I$JAVA_HOME/include"
       LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
       exec 6>/dev/null # no output
-      ac_fn_c_check_header_mongrel "$LINENO" "jni.h" "ac_cv_header_jni_h" "$ac_includes_default"
-if test "x$ac_cv_header_jni_h" = x""yes; then :
+      if test "${ac_cv_header_jni_h+set}" = set; then
+  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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <jni.h>
+_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_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_header_compiler=no
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <jni.h>
+_ACEOF
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: jni.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: jni.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: jni.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: jni.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: jni.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: jni.h: 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
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  as_fn_error "jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?" "$LINENO" 5
+  ac_cv_header_jni_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5
+echo "${ECHO_T}$ac_cv_header_jni_h" >&6
+
+fi
+if test $ac_cv_header_jni_h = yes; then
+  :
+else
+  { { 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:${as_lineno-$LINENO}: checking for JAWT_GetAWT in -lgcjawt" >&5
-$as_echo_n "checking for JAWT_GetAWT in -lgcjawt... " >&6; }
-if test "${ac_cv_lib_gcjawt_JAWT_GetAWT+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgcjawt  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_gcjawt_JAWT_GetAWT=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_gcjawt_JAWT_GetAWT=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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
 
@@ -10792,93 +11311,287 @@ fi
       LD_LIBRARY_PATH=$JAVA_HOME/jre/bin:$JAVA_HOME/jre/bin/classic:$JAVA_HOME/jre/bin/xawt:$LD_LIBRARY_PATH
       export LD_LIBRARY_PATH
       exec 6>/dev/null # no output
-      ac_fn_c_check_header_mongrel "$LINENO" "jni.h" "ac_cv_header_jni_h" "$ac_includes_default"
-if test "x$ac_cv_header_jni_h" = x""yes; then :
+      if test "${ac_cv_header_jni_h+set}" = set; then
+  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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <jni.h>
+_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_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <jni.h>
+_ACEOF
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: jni.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: jni.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: jni.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: jni.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: jni.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: jni.h: 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
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_jni_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5
+echo "${ECHO_T}$ac_cv_header_jni_h" >&6
 
+fi
+if test $ac_cv_header_jni_h = yes; then
+  :
 else
-  as_fn_error "jni.h could not be found." "$LINENO" 5
+  { { 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:${as_lineno-$LINENO}: checking for JAWT_GetAWT in -ljawt" >&5
-$as_echo_n "checking for JAWT_GetAWT in -ljawt... " >&6; }
-if test "${ac_cv_lib_jawt_JAWT_GetAWT+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ljawt  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_jawt_JAWT_GetAWT=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_jawt_JAWT_GetAWT=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for JAWT_GetAWT in -lmawt" >&5
-$as_echo_n "checking for JAWT_GetAWT in -lmawt... " >&6; }
-if test "${ac_cv_lib_mawt_JAWT_GetAWT+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmawt  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_mawt_JAWT_GetAWT=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_mawt_JAWT_GetAWT=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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
 
@@ -10891,24 +11604,24 @@ fi
    if test -z "$AWTLIB"; then
       AWTLIB=-ljawt
    fi
-   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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
@@ -10918,10 +11631,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_JAVAAOTCOMPILER+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_JAVAAOTCOMPILER+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $JAVAAOTCOMPILER in
   [\\/]* | ?:[\\/]*)
@@ -10933,37 +11646,36 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 JAVAAOTCOMPILER=$ac_cv_path_JAVAAOTCOMPILER
+
 if test -n "$JAVAAOTCOMPILER"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+     echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
   fi
 fi
 
@@ -10979,10 +11691,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_DMAKE+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_DMAKE+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $DMAKE in
   [\\/]* | ?:[\\/]*)
@@ -10994,36 +11706,35 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
 if test "$DMAKE" = "no"; then
     BUILD_DMAKE=YES
     echo "dmake will be built on ./bootstrap"
 else
-    { $as_echo "$as_me:${as_lineno-$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
@@ -11032,48 +11743,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:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-       { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_EPM+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_EPM+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $EPM in
   [\\/]* | ?:[\\/]*)
@@ -11085,30 +11796,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$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:${as_lineno-$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."
@@ -11116,38 +11826,44 @@ fi
          BUILD_TYPE="$BUILD_TYPE EPM"
       else
          # Gentoo has some epm which is something different...
-         { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
          else
-            as_fn_error "no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm" "$LINENO" 5
+            { { 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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_fn_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)" "$LINENO" 5
+          		      { { 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:${as_lineno-$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_fn_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)" "$LINENO" 5
+			          { { 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:${as_lineno-$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"
@@ -11156,8 +11872,8 @@ $as_echo "too old. epm >= 3.7 is required." >&6; }
    fi
 
    # test which package format to use
-   { $as_echo "$as_me:${as_lineno-$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
@@ -11202,7 +11918,9 @@ $as_echo_n "checking which package format to use... " >&6; }
 	# we never should get here since we check the arciecture/os at the beginning,
 	# but go sure...
 	*)
-		as_fn_error "unknown system" "$LINENO" 5
+		{ { 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
 	for i in $with_package_format; do
@@ -11210,7 +11928,20 @@ $as_echo_n "checking which package format to use... " >&6; }
 			aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | portable)
 			;;
 		*)
-			as_fn_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
+deb - Debian software distribution
+inst or tardist - IRIX software distribution
+osx - MacOS X software distribution
+pkg - Solaris software distribution
+rpm - RedHat software distribution
+setld - Tru64 (setld) software distribution
+native - \"Native\" software distribution for the platform
+portable - Portable software distribution
+			" >&5
+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
@@ -11222,17 +11953,18 @@ rpm - RedHat software distribution
 setld - Tru64 (setld) software distribution
 native - \"Native\" software distribution for the platform
 portable - Portable software distribution
-			" "$LINENO" 5
+			" >&2;}
+   { (exit 1); exit 1; }; }
 			;;
 		esac
 	done
 	PKGFORMAT="$with_package_format"
    fi
-   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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
@@ -11247,20 +11979,22 @@ $as_echo_n "checking for rpm... " >&6; }
          fi
        done
        if test -z "$RPM" ; then
-          as_fn_error "not found" "$LINENO" 5
+          { { 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:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_DPKG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_DPKG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $DPKG in
   [\\/]* | ?:[\\/]*)
@@ -11272,76 +12006,81 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
       if test "$DPKG" = "no"; then
-         as_fn_error "dpkg needed for deb creation. Install dpkg." "$LINENO" 5
+         { { 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:${as_lineno-$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_fn_error "not installed. Please install Apples Dev Tools" "$LINENO" 5
+            { { 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:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
+            echo "$as_me:$LINENO: result: ok" >&5
+echo "${ECHO_T}ok" >&6
          fi
       else
-         as_fn_error "PackageMaker needed to build OSX packages and you are not on OSX..." "$LINENO" 5
+         { { 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
    if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null || \
       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:${as_lineno-$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:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+                  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
                else
-                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+                  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
                   if echo "$PKGFORMAT" | grep -q rpm; then
                       _pt="rpm"
-                      { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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;}
@@ -11352,10 +12091,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKGMK+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKGMK+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKGMK in
   [\\/]* | ?:[\\/]*)
@@ -11367,32 +12106,33 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
       if test "$PKGMK" = "no"; then
-         as_fn_error "pkgmk needed for Solaris pkg creation. Install it." "$LINENO" 5
+         { { 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
 
@@ -11401,18 +12141,18 @@ fi
 
 
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+   echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
    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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GPERF+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_GPERF+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $GPERF in
   [\\/]* | ?:[\\/]*)
@@ -11424,74 +12164,82 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 GPERF=$ac_cv_path_GPERF
+
 if test -n "$GPERF"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
 if test -z "$GPERF"; then
-	as_fn_error "gperf not found but needed. Install it." "$LINENO" 5
+	{ { 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:${as_lineno-$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:${as_lineno-$LINENO}: result: OK" >&5
-$as_echo "OK" >&6; }
+	echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6
 else
-	as_fn_error "too old, you need at least 3.0.0" "$LINENO" 5
+	{ { 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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_fn_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
+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" "$LINENO" 5
+         put it into external/unowinreg" >&2;}
+   { (exit 1); exit 1; }; }
       fi
       if echo "$WITH_MINGWIN" | $EGREP -q "/"; then
          if ! test -x "$WITH_MINGWIN"; then MINGWCXX=false; else MINGWCXX=`basename $WITH_MINGWIN`; fi
@@ -11499,10 +12247,10 @@ $as_echo "$as_me: WARNING: not found, will be cross-built using mingw32" >&2;}
          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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_MINGWCXX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_MINGWCXX+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$MINGWCXX"; then
   ac_cv_prog_MINGWCXX="$MINGWCXX" # Let the user override the test.
@@ -11512,37 +12260,35 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
 fi
 fi
 MINGWCXX=$ac_cv_prog_MINGWCXX
 if test -n "$MINGWCXX"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_MINGWCXX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_MINGWCXX+set}" = set; then
+  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.
@@ -11552,53 +12298,47 @@ 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
+  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_MINGWCXX="$WITH_MINGWIN"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
+  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:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-  if test "x$ac_ct_MINGWCXX" = x; then
-    MINGWCXX="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-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_fn_error "specified MinGW32 C++ cross-compiler not found. Install it or correct name." "$LINENO" 5
+         { { 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:${as_lineno-$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_fn_error "no" "$LINENO" 5
+         { { echo "$as_me:$LINENO: error: no" >&5
+echo "$as_me: error: no" >&2;}
+   { (exit 1); exit 1; }; }
       else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+         echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
       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
@@ -11606,10 +12346,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_MINGWSTRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_MINGWSTRIP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$MINGWSTRIP"; then
   ac_cv_prog_MINGWSTRIP="$MINGWSTRIP" # Let the user override the test.
@@ -11619,37 +12359,35 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
 fi
 fi
 MINGWSTRIP=$ac_cv_prog_MINGWSTRIP
 if test -n "$MINGWSTRIP"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_MINGWSTRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_MINGWSTRIP+set}" = set; then
+  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.
@@ -11659,47 +12397,39 @@ 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
+  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_MINGWSTRIP="`echo $WITH_MINGWIN | $SED -e s/g++/strip/`"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
+  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:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-  if test "x$ac_ct_MINGWSTRIP" = x; then
-    MINGWSTRIP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-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_fn_error "MinGW32 binutils needed. Install them." "$LINENO" 5
+         { { 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'
@@ -11717,37 +12447,66 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
       # do not make sense here (and 'd make the check fail)
       save_LIBS=$LIBS
       LIBS=""
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lkernel32" >&5
-$as_echo_n "checking for main in -lkernel32... " >&6; }
-if test "${ac_cv_lib_kernel32_main+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkernel32  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 
 int
 main ()
 {
-return main ();
+main ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_kernel32_main=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_kernel32_main=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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
@@ -11757,37 +12516,66 @@ _ACEOF
 fi
 ac_cv_lib_kernel32=ac_cv_lib_kernel32_main
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ladvapi32" >&5
-$as_echo_n "checking for main in -ladvapi32... " >&6; }
-if test "${ac_cv_lib_advapi32_main+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ladvapi32  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 
 int
 main ()
 {
-return main ();
+main ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_advapi32_main=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_advapi32_main=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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
@@ -11797,11 +12585,149 @@ _ACEOF
 fi
 ac_cv_lib_advapi32=ac_cv_lib_advapi32_main
 
-      ac_fn_cxx_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default"
-if test "x$ac_cv_header_windows_h" = x""yes; then :
+      if test "${ac_cv_header_windows_h+set}" = set; then
+  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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <windows.h>
+_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_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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_header_compiler=no
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <windows.h>
+_ACEOF
+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
+  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
-  as_fn_error "windows.h missing" "$LINENO" 5
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: 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:* )
+    { 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
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_windows_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5
+echo "${ECHO_T}$ac_cv_header_windows_h" >&6
+
+fi
+if test $ac_cv_header_windows_h = yes; then
+  :
+else
+  { { echo "$as_me:$LINENO: error: windows.h missing" >&5
+echo "$as_me: error: windows.h missing" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
@@ -11820,25 +12746,25 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
    fi
    BUILD_TYPE="$BUILD_TYPE ODK"
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+   echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
    BUILD_UNOWINREG=NO
 fi
 
 
 
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+   echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
 
@@ -11846,28 +12772,28 @@ if test "$_os" = "Linux" -a -z "$with_system_stdlibs" -a -z "$with_system_libs";
   if test -n "$checkforstdlibproblems"; then
     if test -f /etc/rpm/macros.prelink; then
       with_system_stdlibs=yes
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&5
-$as_echo "$as_me: WARNING: prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&2;}
+      { echo "$as_me:$LINENO: WARNING: prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&5
+echo "$as_me: WARNING: prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&2;}
       echo "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn
     elif test "$GCC" = "yes" -a ! -e `$CC -print-file-name=libgcc_s.so.1`; then
       with_system_stdlibs=yes
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: platform doesn't have a libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&5
-$as_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 "$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
    SYSTEM_STDLIBS=NO
 fi
 
@@ -11875,189 +12801,690 @@ fi
 if test "$_os" = "Darwin" && test "$with_system_zlib" != "no"; then
    with_system_zlib=yes
 fi
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
+    echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
     SYSTEM_ZLIB=YES
-    ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_zlib_h" = x""yes; then :
+    if test "${ac_cv_header_zlib_h+set}" = set; then
+  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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <zlib.h>
+_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_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <zlib.h>
+_ACEOF
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
 
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: zlib.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: zlib.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: zlib.h: 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
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_zlib_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
+
+fi
+if test $ac_cv_header_zlib_h = yes; then
+  :
 else
-  as_fn_error "zlib.h not found. install zlib" "$LINENO" 5
+  { { 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:${as_lineno-$LINENO}: checking for deflate in -lz" >&5
-$as_echo_n "checking for deflate in -lz... " >&6; }
-if test "${ac_cv_lib_z_deflate+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lz  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_z_deflate=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_z_deflate=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "zlib not found or functional" "$LINENO" 5
+  { { 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
+    echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
     SYSTEM_JPEG=YES
-    ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default"
-if test "x$ac_cv_header_jpeglib_h" = x""yes; then :
+    if test "${ac_cv_header_jpeglib_h+set}" = set; then
+  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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <jpeglib.h>
+_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_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <jpeglib.h>
+_ACEOF
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: jpeglib.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: jpeglib.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: jpeglib.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: jpeglib.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: jpeglib.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: jpeglib.h: 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
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_jpeglib_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
+echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6
 
+fi
+if test $ac_cv_header_jpeglib_h = yes; then
+  :
 else
-  as_fn_error "jpeg.h not found. install libjpeg" "$LINENO" 5
+  { { 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:${as_lineno-$LINENO}: checking for jpeg_resync_to_restart in -ljpeg" >&5
-$as_echo_n "checking for jpeg_resync_to_restart in -ljpeg... " >&6; }
-if test "${ac_cv_lib_jpeg_jpeg_resync_to_restart+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ljpeg  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_jpeg_jpeg_resync_to_restart=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_jpeg_jpeg_resync_to_restart=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
+    echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
     SYSTEM_EXPAT=YES
-    ac_fn_c_check_header_mongrel "$LINENO" "expat.h" "ac_cv_header_expat_h" "$ac_includes_default"
-if test "x$ac_cv_header_expat_h" = x""yes; then :
+    if test "${ac_cv_header_expat_h+set}" = set; then
+  echo "$as_me:$LINENO: checking for expat.h" >&5
+echo $ECHO_N "checking for expat.h... $ECHO_C" >&6
+if test "${ac_cv_header_expat_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
+echo "${ECHO_T}$ac_cv_header_expat_h" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking expat.h usability" >&5
+echo $ECHO_N "checking expat.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <expat.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (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_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+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?
+echo "$as_me:$LINENO: checking expat.h presence" >&5
+echo $ECHO_N "checking expat.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <expat.h>
+_ACEOF
+if { (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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: expat.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: expat.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: expat.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: expat.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: expat.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: expat.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: expat.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: expat.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: expat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: expat.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: expat.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for expat.h" >&5
+echo $ECHO_N "checking for expat.h... $ECHO_C" >&6
+if test "${ac_cv_header_expat_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_expat_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
+echo "${ECHO_T}$ac_cv_header_expat_h" >&6
 
+fi
+if test $ac_cv_header_expat_h = yes; then
+  :
 else
-  as_fn_error "expat.h not found. install expat" "$LINENO" 5
+  { { 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:${as_lineno-$LINENO}: checking for XML_ParserCreate in -lexpat" >&5
-$as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; }
-if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+
+echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
+echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6
+if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lexpat  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_expat_XML_ParserCreate=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_expat_XML_ParserCreate=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
-$as_echo "$ac_cv_lib_expat_XML_ParserCreate" >&6; }
-if test "x$ac_cv_lib_expat_XML_ParserCreate" = x""yes; then :
+echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
+echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6
+if test $ac_cv_lib_expat_XML_ParserCreate = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBEXPAT 1
 _ACEOF
@@ -12065,24 +13492,24 @@ _ACEOF
   LIBS="-lexpat $LIBS"
 
 else
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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
@@ -12090,10 +13517,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -12105,30 +13532,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -12139,25 +13565,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -12178,12 +13604,14 @@ $as_echo "$LIBWPD_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_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." "$LINENO" 5
+     { { 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:${as_lineno-$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
@@ -12192,18 +13620,18 @@ fi
 
 
 if test  "$test_freetype" = "yes"; then
-   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -12215,30 +13643,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -12249,25 +13676,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -12288,7 +13715,9 @@ $as_echo "$FREETYPE_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_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." "$LINENO" 5
+     { { 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
 
 fi
@@ -12301,43 +13730,71 @@ if test  "$test_freetype" = "yes"; then
     save_LIBS="$LIBS"
     CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
     LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_GlyphSlot_Embolden in -lfreetype" >&5
-$as_echo_n "checking for FT_GlyphSlot_Embolden in -lfreetype... " >&6; }
-if test "${ac_cv_lib_freetype_FT_GlyphSlot_Embolden+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfreetype  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_freetype_FT_GlyphSlot_Embolden=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_freetype_FT_GlyphSlot_Embolden=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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"
@@ -12370,26 +13827,26 @@ if test -n "$with_system_libxml" -o -n "$with_system_libs" && \
     fi
 fi
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: result: $LIBXSLT_CFLAGS" >&5
-$as_echo "$LIBXSLT_CFLAGS" >&6; }
-   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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
@@ -12399,10 +13856,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -12414,30 +13871,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -12448,25 +13904,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -12487,7 +13943,9 @@ $as_echo "$LIBXSLT_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_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." "$LINENO" 5
+     { { 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
 
  fi
@@ -12495,10 +13953,10 @@ $as_echo "$LIBXSLT_LIBS" >&6; }
 
       # 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XSLTPROC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_XSLTPROC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $XSLTPROC in
   [\\/]* | ?:[\\/]*)
@@ -12510,36 +13968,37 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
    if test "$XSLTPROC" = "no"; then
-      as_fn_error "xsltproc is required" "$LINENO" 5
+      { { 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:${as_lineno-$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
@@ -12548,25 +14007,25 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: result: $LIBXML_CFLAGS" >&5
-$as_echo "$LIBXML_CFLAGS" >&6; }
-   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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
@@ -12576,10 +14035,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -12591,30 +14050,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -12625,25 +14083,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -12664,15 +14122,17 @@ $as_echo "$LIBXML_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_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." "$LINENO" 5
+     { { 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
 
  fi
 
     BUILD_TYPE="$BUILD_TYPE LIBXMLSEC"
 else
-    { $as_echo "$as_me:${as_lineno-$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
@@ -12683,21 +14143,21 @@ fi
 if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then
    with_system_python=yes
 fi
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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.
@@ -12709,20 +14169,23 @@ sys.exit(sys.hexversion < minverhex)"
    ($PYTHON -c "$prog") >&5 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+   (exit $ac_status); }; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
-  as_fn_error "too old" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: too old" >&5
+echo "$as_me: error: too old" >&2;}
+   { (exit 1); exit 1; }; }
 fi
+
       am_display_PYTHON=$PYTHON
     else
       # Otherwise, try each interpreter until we find one that satisfies
       # VERSION.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.2" >&5
-$as_echo_n "checking for a Python interpreter with version >= 2.2... " >&6; }
-if test "${am_cv_pathless_PYTHON+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  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
@@ -12738,23 +14201,24 @@ sys.exit(sys.hexversion < minverhex)"
    ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then :
+   (exit $ac_status); }; then
   break
 fi
+
 	done
 fi
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PYTHON+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PYTHON+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PYTHON in
   [\\/]* | ?:[\\/]*)
@@ -12766,48 +14230,49 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 PYTHON=$ac_cv_path_PYTHON
+
 if test -n "$PYTHON"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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_fn_error "no suitable Python interpreter found" "$LINENO" 5
+      { { 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:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
-$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
-if test "${am_cv_python_version+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  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:${as_lineno-$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
 
 
@@ -12818,30 +14283,30 @@ $as_echo "$am_cv_python_version" >&6; }
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
-$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
-if test "${am_cv_python_platform+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`
 fi
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
-$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
-if test "${am_cv_python_pythondir+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  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:${as_lineno-$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
 
 
@@ -12849,16 +14314,16 @@ $as_echo "$am_cv_python_pythondir" >&6; }
   pkgpythondir=\${pythondir}/$PACKAGE
 
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
-$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
-if test "${am_cv_python_pyexecdir+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  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:${as_lineno-$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
 
 
@@ -12883,11 +14348,149 @@ $as_echo "$am_cv_python_pyexecdir" >&6; }
 
       save_CPPFLAGS="$CPPFLAGS"
    CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
-   ac_fn_c_check_header_mongrel "$LINENO" "Python.h" "ac_cv_header_Python_h" "$ac_includes_default"
-if test "x$ac_cv_header_Python_h" = x""yes; then :
+   if test "${ac_cv_header_Python_h+set}" = set; then
+  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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <Python.h>
+_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_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_header_compiler=no
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <Python.h>
+_ACEOF
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: Python.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: Python.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: Python.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: Python.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: Python.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: Python.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: Python.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: Python.h: 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
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  as_fn_error "Python headers not found" "$LINENO" 5
+  ac_cv_header_Python_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5
+echo "${ECHO_T}$ac_cv_header_Python_h" >&6
+
+fi
+if test $ac_cv_header_Python_h = yes; then
+  :
+else
+  { { echo "$as_me:$LINENO: error: Python headers not found" >&5
+echo "$as_me: error: Python headers not found" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
@@ -12895,8 +14498,8 @@ fi
 else
    SYSTEM_PYTHON=NO
    BUILD_TYPE="$BUILD_TYPE PYTHON"
-   { $as_echo "$as_me:${as_lineno-$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="";
@@ -12905,10 +14508,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_BZIP2+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_BZIP2+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $BZIP2 in
   [\\/]* | ?:[\\/]*)
@@ -12920,31 +14523,32 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 BZIP2=$ac_cv_path_BZIP2
+
 if test -n "$BZIP2"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
 	if test -z "$BZIP2"; then
-   		as_fn_error "the internal Python module has a .tar.bz2. You need bzip2" "$LINENO" 5
+   		{ { 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
 fi
@@ -12954,27 +14558,121 @@ fi
 HOME=`echo $HOME | sed 's:\\\\:/:g'`
 
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
-    ac_fn_c_check_header_compile "$LINENO" "db.h" "ac_cv_header_db_h" "
+    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
+  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.  */
+
+
+
+#include <db.h>
+_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_header_db_h=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-"
-if test "x$ac_cv_header_db_h" = x""yes; then :
+ac_cv_header_db_h=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+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
-             ac_fn_c_check_header_compile "$LINENO" "db4/db.h" "ac_cv_header_db4_db_h" "+
-"
-if test "x$ac_cv_header_db4_db_h" = x""yes; then :
+             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
+  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.  */
++
+
+#include <db4/db.h>
+_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_header_db4_db_h=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_header_db4_db_h=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+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_fn_error "no. install the db4 libraries" "$LINENO" 5
+   { { 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
 
 
@@ -12982,15 +14680,20 @@ fi
 fi
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether db is at least 4.1" >&5
-$as_echo_n "checking whether db is at least 4.1... " >&6; }
-    if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+    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
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <db.h>
@@ -13001,47 +14704,91 @@ int main(int argc, char **argv) {
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./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
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
-  as_fn_error "no. you need at least db 4.1" "$LINENO" 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 -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldb" >&5
-$as_echo_n "checking for main in -ldb... " >&6; }
-if test "${ac_cv_lib_db_main+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldb  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 
 int
 main ()
 {
-return main ();
+main ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_db_main=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_db_main=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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
@@ -13049,14 +14796,16 @@ _ACEOF
   LIBS="-ldb $LIBS"
 
 else
-  as_fn_error "db not installed or functional" "$LINENO" 5
+  { { 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:${as_lineno-$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
@@ -13065,52 +14814,58 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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; }
-if test "${ac_cv_file__usr_share_java_lucene_core_2_3_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/lucene-core-2.3.jar"; then
   ac_cv_file__usr_share_java_lucene_core_2_3_jar=yes
 else
   ac_cv_file__usr_share_java_lucene_core_2_3_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for /usr/share/java/lucene.jar" >&5
-$as_echo_n "checking for /usr/share/java/lucene.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_lucene_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/lucene.jar"; then
   ac_cv_file__usr_share_java_lucene_jar=yes
 else
   ac_cv_file__usr_share_java_lucene_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "lucene-core.jar replacement not found" "$LINENO" 5
+   { { 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
 
@@ -13119,71 +14874,79 @@ fi
 fi
 
         else
-          as_ac_File=`$as_echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$LUCENE_CORE_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   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_fn_error "lucene-core.jar not found." "$LINENO" 5
+  { { 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:${as_lineno-$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; }
-if test "${ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/lucene-analyzers-2.3.jar"; then
   ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar=yes
 else
   ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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; }
-if test "${ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/lucene-contrib/lucene-analyzers.jar"; then
   ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar=yes
 else
   ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "lucene-analyzers.jar replacement not found." "$LINENO" 5
+   { { 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
 
@@ -13192,34 +14955,36 @@ fi
 fi
 
         else
-          as_ac_File=`$as_echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$LUCENE_CORE_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   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_fn_error "lucene-analyzers.jar not found." "$LINENO" 5
+   { { 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:${as_lineno-$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
@@ -13227,42 +14992,505 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which hsqldb to use" >&5
-$as_echo_n "checking which hsqldb to use... " >&6; }
+echo "$as_me:$LINENO: checking whether to build the MySQL Connector extension" >&5
+echo $ECHO_N "checking whether to build the MySQL Connector extension... $ECHO_C" >&6
+if test -n "$enable_mysql_connector" -a "$enable_mysql_connector" != "no"; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+  ENABLE_MYSQLC=YES
+  echo "$as_me:$LINENO: checking for mysqlc module" >&5
+echo $ECHO_N "checking for mysqlc module... $ECHO_C" >&6
+  if test -d mysqlc; then
+   echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6
+  else
+   { { 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 MYSQLC"
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+  ENABLE_MYSQLC=NO
+fi
+
+
+if test "$ENABLE_MYSQLC" = "YES"; then
+echo "$as_me:$LINENO: checking for mysql pre-requisites" >&5
+echo $ECHO_N "checking for mysql pre-requisites... $ECHO_C" >&6
+if test -n "$with_system_mysql" -o -n "$with_system_libs" && \
+       test "$with_system_mysql" != "no" && test "$with_system_libs" != "no"; then
+	echo "$as_me:$LINENO: result: external MySQL" >&5
+echo "${ECHO_T}external MySQL" >&6
+	SYSTEM_MYSQL=YES
+	# Extract the first word of "mysql_config", so it can be a program name with args.
+set dummy mysql_config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_MYSQLCONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $MYSQLCONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_MYSQLCONFIG="$MYSQLCONFIG" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_MYSQLCONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+MYSQLCONFIG=$ac_cv_path_MYSQLCONFIG
+
+if test -n "$MYSQLCONFIG"; then
+  echo "$as_me:$LINENO: result: $MYSQLCONFIG" >&5
+echo "${ECHO_T}$MYSQLCONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+	echo "$as_me:$LINENO: checking MySQL version" >&5
+echo $ECHO_N "checking MySQL version... $ECHO_C" >&6
+	MYSQL_VERSION=`$MYSQLCONFIG --version`
+	MYSQL_MAJOR=`$MYSQLCONFIG --version | cut -d"." -f1`
+	if test "$MYSQL_MAJOR" -ge "5"; then
+		echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6
+	else
+		{ { echo "$as_me:$LINENO: error: too old, use 5.0.x or 5.1.x" >&5
+echo "$as_me: error: too old, use 5.0.x or 5.1.x" >&2;}
+   { (exit 1); exit 1; }; }
+	fi
+	echo "$as_me:$LINENO: checking for MySQL Client library" >&5
+echo $ECHO_N "checking for MySQL Client library... $ECHO_C" >&6
+	MYSQL_INC=`$MYSQLCONFIG --include`
+	MYSQL_LIB=`$MYSQLCONFIG --libs`
+	MYSQL_DEFINES=`$MYSQLCONFIG --cflags | sed -e s,$MYSQL_INC,,`
+	echo "$as_me:$LINENO: result: includes $MYSQL_INC, libraries $MYSQL_LIB" >&5
+echo "${ECHO_T}includes $MYSQL_INC, libraries $MYSQL_LIB" >&6
+else
+    SYSTEM_MYSQL=NO
+    if test -n "$with_libmysql_path"; then
+        echo "$as_me:$LINENO: result: external Connector/C (libmysql)" >&5
+echo "${ECHO_T}external Connector/C (libmysql)" >&6
+        LIBMYSQL=libmysql.so
+        if test "$_os" = "Darwin"; then
+            LIBMYSQL=libmysql.dylib
+        elif test "$_os" = "WINNT"; then
+            LIBMYSQL=libmysql.dll
+        fi
+        echo "$as_me:$LINENO: checking for $LIBMYSQL" >&5
+echo $ECHO_N "checking for $LIBMYSQL... $ECHO_C" >&6
+        if test -e "$with_libmysql_path/lib/$LIBMYSQL"; then
+            echo "$as_me:$LINENO: result: found." >&5
+echo "${ECHO_T}found." >&6
+            LIBMYSQL_PATH=$with_libmysql_path
+        else
+            { { echo "$as_me:$LINENO: error: not found. Please specify proper path in --with-libmysql-path." >&5
+echo "$as_me: error: not found. Please specify proper path in --with-libmysql-path." >&2;}
+   { (exit 1); exit 1; }; }
+        fi
+    else
+        { { echo "$as_me:$LINENO: error: not given. Please specify either --with-system-mysql or --with-libmysql-path" >&5
+echo "$as_me: error: not given. Please specify either --with-system-mysql or --with-libmysql-path" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+fi
+
+
+
+
+
+
+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
+
+# FIXME!
+# who thought this too-generic cppconn dir was a good idea?
+echo "$as_me:$LINENO: checking MySQL Connector/C++" >&5
+echo $ECHO_N "checking MySQL Connector/C++... $ECHO_C" >&6
+if test -n "$with_system_mysql_cppconn" -o -n "$with_system_libs" && \
+		test "$with_system_mysql_cppconn" != "no" && test "$with_system_libs" != "no"; then
+	echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
+	SYSTEM_MYSQL_CPPCONN=YES
+        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_mysql_driver_h+set}" = set; then
+  echo "$as_me:$LINENO: checking for mysql_driver.h" >&5
+echo $ECHO_N "checking for mysql_driver.h... $ECHO_C" >&6
+if test "${ac_cv_header_mysql_driver_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_mysql_driver_h" >&5
+echo "${ECHO_T}$ac_cv_header_mysql_driver_h" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking mysql_driver.h usability" >&5
+echo $ECHO_N "checking mysql_driver.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <mysql_driver.h>
+_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_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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+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?
+echo "$as_me:$LINENO: checking mysql_driver.h presence" >&5
+echo $ECHO_N "checking mysql_driver.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <mysql_driver.h>
+_ACEOF
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: mysql_driver.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: mysql_driver.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mysql_driver.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: mysql_driver.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: mysql_driver.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: mysql_driver.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mysql_driver.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: mysql_driver.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mysql_driver.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: mysql_driver.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mysql_driver.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: mysql_driver.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mysql_driver.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: mysql_driver.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mysql_driver.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: mysql_driver.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
+echo "$as_me:$LINENO: checking for mysql_driver.h" >&5
+echo $ECHO_N "checking for mysql_driver.h... $ECHO_C" >&6
+if test "${ac_cv_header_mysql_driver_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_mysql_driver_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_mysql_driver_h" >&5
+echo "${ECHO_T}$ac_cv_header_mysql_driver_h" >&6
+
+fi
+if test $ac_cv_header_mysql_driver_h = yes; then
+  :
+else
+  { { echo "$as_me:$LINENO: error: mysql_driver.h not found. install MySQL C++ Connectivity" >&5
+echo "$as_me: error: mysql_driver.h not found. install MySQL C++ Connectivity" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+
+echo "$as_me:$LINENO: checking for main in -lmysqlcppconn" >&5
+echo $ECHO_N "checking for main in -lmysqlcppconn... $ECHO_C" >&6
+if test "${ac_cv_lib_mysqlcppconn_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmysqlcppconn  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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_mysqlcppconn_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_mysqlcppconn_main=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlcppconn_main" >&5
+echo "${ECHO_T}$ac_cv_lib_mysqlcppconn_main" >&6
+if test $ac_cv_lib_mysqlcppconn_main = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBMYSQLCPPCONN 1
+_ACEOF
+
+  LIBS="-lmysqlcppconn $LIBS"
+
+else
+  { { echo "$as_me:$LINENO: error: MySQL C++ Connectivity lib not found or functional" >&5
+echo "$as_me: error: MySQL C++ Connectivity lib not found or functional" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+   echo "$as_me:$LINENO: checking version" >&5
+echo $ECHO_N "checking version... $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
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <mysql_driver.h>
+
+int main(int argc, char **argv) {
+	sql::Driver *driver;
+	driver = get_driver_instance();
+	if (driver->getMajorVersion() > 1 || \
+	   (driver->getMajorVersion() == 1 && driver->getMinorVersion() > 0) || \
+	   (driver->getMajorVersion() == 1 && driver->getMinorVersion() == 0 && driver->getPatchVersion() >= 6))
+        return 0;
+      else
+        return 1;
+}
+
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./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
+  echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6
+else
+  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: not suitable, we need >= 1.0.6" >&5
+echo "$as_me: error: not suitable, we need >= 1.0.6" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+        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
+
+
+	echo "$as_me:$LINENO: checking STL compatibility" >&5
+echo $ECHO_N "checking STL compatibility... $ECHO_C" >&6
+	if test "$WITH_STLPORT" != "no"; then
+		{ { echo "$as_me:$LINENO: error: to use system mysqlcppconn you need to use --without-stlport" >&5
+echo "$as_me: error: to use system mysqlcppconn you need to use --without-stlport" >&2;}
+   { (exit 1); exit 1; }; }
+	else
+		echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6
+	fi
+
+else
+	echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
+        echo "$as_me:$LINENO: checking for mysqlcppconn module" >&5
+echo $ECHO_N "checking for mysqlcppconn module... $ECHO_C" >&6
+        if test -d mysqlcppconn; then
+          echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6
+        else
+          { { 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 MYSQLCPPCONN"
+	SYSTEM_MYSQL_CPPCONN=NO
+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
+
+
+fi
+
+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:${as_lineno-$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:${as_lineno-$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_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$HSQLDB_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   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_fn_error "hsqldb.jar not found." "$LINENO" 5
+  { { 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:${as_lineno-$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'}";
@@ -13285,57 +15513,61 @@ $as_echo_n "checking whether hsqldb is >= 1.8.0.9... " >&6; }
 	    } else {
 	        exit 1;
             }'; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
          else
-            as_fn_error "no, hsqldb >= 1.8.0.9 is needed" "$LINENO" 5
+            { { 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$BSH_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   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_fn_error "bsh.jar not found." "$LINENO" 5
+  { { 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:${as_lineno-$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
@@ -13343,70 +15575,78 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: checking for /usr/share/java/saxon9.jar" >&5
-$as_echo_n "checking for /usr/share/java/saxon9.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_saxon9_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/saxon9.jar"; then
   ac_cv_file__usr_share_java_saxon9_jar=yes
 else
   ac_cv_file__usr_share_java_saxon9_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for /usr/share/java/saxon.jar" >&5
-$as_echo_n "checking for /usr/share/java/saxon.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_saxon_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/saxon.jar"; then
   ac_cv_file__usr_share_java_saxon_jar=yes
 else
   ac_cv_file__usr_share_java_saxon_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for /usr/share/java/saxon9.jar" >&5
-$as_echo_n "checking for /usr/share/java/saxon9.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_saxon9_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/saxon9.jar"; then
   ac_cv_file__usr_share_java_saxon9_jar=yes
 else
   ac_cv_file__usr_share_java_saxon9_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "saxon.jar replacement not found" "$LINENO" 5
+   { { 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
 
@@ -13419,61 +15659,65 @@ fi
 fi
 
         else
-          as_ac_File=`$as_echo "ac_cv_file_$SAXON_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$SAXON_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   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_fn_error "saxon.jar replacement not found." "$LINENO" 5
+  { { 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:${as_lineno-$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_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$SERIALIZER_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   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_fn_error "serializer.jar not found." "$LINENO" 5
+  { { 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:${as_lineno-$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
@@ -13487,20 +15731,20 @@ fi
 if test "$_os" = "Darwin" && test "$with_system_curl" != "no"; then
    with_system_curl=yes
 fi
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CURLCONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_CURLCONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $CURLCONFIG in
   [\\/]* | ?:[\\/]*)
@@ -13512,49 +15756,52 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 CURLCONFIG=$ac_cv_path_CURLCONFIG
+
 if test -n "$CURLCONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
    if test -z "$CURLCONFIG"; then
-      as_fn_error "install curl to run this script" "$LINENO" 5
+      { { 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:${as_lineno-$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.13.1" >&5
+echo $ECHO_N "checking whether curl is >= 7.13.1... $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_fn_error "no, you need at least curl 7.9,8" "$LINENO" 5
+	"`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $2 }'`" -gt "13" -a \
+	"`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $3 }'`" -gt "1"; then
+      { { echo "$as_me:$LINENO: error: no, you need at least curl 7.13,1" >&5
+echo "$as_me: error: no, you need at least curl 7.13,1" >&2;}
+   { (exit 1); exit 1; }; }
    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
    fi
    CURL_LIBS=`$CURLCONFIG --libs`
    CURL_CFLAGS=`$CURLCONFIG --cflags`
 else
-   { $as_echo "$as_me:${as_lineno-$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
@@ -13562,49 +15809,467 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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
 
-   ac_fn_cxx_check_header_mongrel "$LINENO" "boost/shared_ptr.hpp" "ac_cv_header_boost_shared_ptr_hpp" "$ac_includes_default"
-if test "x$ac_cv_header_boost_shared_ptr_hpp" = x""yes; then :
+   if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then
+  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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <boost/shared_ptr.hpp>
+_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_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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <boost/shared_ptr.hpp>
+_ACEOF
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: 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:* )
+    { 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
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_boost_shared_ptr_hpp=$ac_header_preproc
+fi
+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 $ac_cv_header_boost_shared_ptr_hpp = yes; then
+  :
+else
+  { { 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
+  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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <boost/spirit/include/classic_core.hpp>
+_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_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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <boost/spirit/include/classic_core.hpp>
+_ACEOF
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: 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:* )
+    { 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
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_boost_spirit_include_classic_core_hpp=$ac_header_preproc
+fi
+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 $ac_cv_header_boost_spirit_include_classic_core_hpp = yes; then
+  :
 else
-  as_fn_error "boost/shared_ptr.hpp not found. install boost" "$LINENO" 5
+  { { 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
 
 
-   ac_fn_cxx_check_header_mongrel "$LINENO" "boost/spirit/include/classic_core.hpp" "ac_cv_header_boost_spirit_include_classic_core_hpp" "$ac_includes_default"
-if test "x$ac_cv_header_boost_spirit_include_classic_core_hpp" = x""yes; then :
+   if test "${ac_cv_header_boost_function_hpp+set}" = set; then
+  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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <boost/function.hpp>
+_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_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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_header_compiler=no
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <boost/function.hpp>
+_ACEOF
+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
+  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
-  as_fn_error "boost/spirit/include/classic_core.hpp not found. install boost >= 1.38" "$LINENO" 5
+  ac_cpp_err=yes
 fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
 
-   ac_fn_cxx_check_header_mongrel "$LINENO" "boost/function.hpp" "ac_cv_header_boost_function_hpp" "$ac_includes_default"
-if test "x$ac_cv_header_boost_function_hpp" = x""yes; then :
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: 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:* )
+    { 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
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_boost_function_hpp=$ac_header_preproc
+fi
+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 $ac_cv_header_boost_function_hpp = yes; then
+  :
 else
-  as_fn_error "boost/function.hpp not found. install boost" "$LINENO" 5
+  { { 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
 
 
 
    save_CXXFLAGS=$CXXFLAGS
    CXXFLAGS="$CXXFLAGS -fno-exceptions"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether boost/function.hpp compiles with -fno-exceptions" >&5
-$as_echo_n "checking whether boost/function.hpp compiles with -fno-exceptions... " >&6; }
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+   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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <boost/function.hpp>
 
@@ -13616,18 +16281,44 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+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_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
-  ac_cv_cxx_boost_no_exceptons_broken=yes
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+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_fn_error "no, see https://bugzilla.redhat.com/show_bug.cgi?id=477131" "$LINENO" 5
+	{ { 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:${as_lineno-$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
@@ -13637,31 +16328,169 @@ 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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
 
-   ac_fn_cxx_check_header_mongrel "$LINENO" "vigra/copyimage.hxx" "ac_cv_header_vigra_copyimage_hxx" "$ac_includes_default"
-if test "x$ac_cv_header_vigra_copyimage_hxx" = x""yes; then :
+   if test "${ac_cv_header_vigra_copyimage_hxx+set}" = set; then
+  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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <vigra/copyimage.hxx>
+_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_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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_header_compiler=no
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <vigra/copyimage.hxx>
+_ACEOF
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: 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:* )
+    { 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
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  as_fn_error "vigra/copyimage.hxx not found. install vigra" "$LINENO" 5
+  ac_cv_header_vigra_copyimage_hxx=$ac_header_preproc
+fi
+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 $ac_cv_header_vigra_copyimage_hxx = yes; then
+  :
+else
+  { { 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
 
 
@@ -13672,150 +16501,457 @@ 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
+   echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
    SYSTEM_ODBC_HEADERS=YES
 
-   ac_fn_c_check_header_mongrel "$LINENO" "sqlext.h" "ac_cv_header_sqlext_h" "$ac_includes_default"
-if test "x$ac_cv_header_sqlext_h" = x""yes; then :
+   if test "${ac_cv_header_sqlext_h+set}" = set; then
+  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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <sqlext.h>
+_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_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sqlext.h>
+_ACEOF
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: sqlext.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: sqlext.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sqlext.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: sqlext.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: sqlext.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: sqlext.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sqlext.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: sqlext.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sqlext.h: 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
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_sqlext_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_sqlext_h" >&5
+echo "${ECHO_T}$ac_cv_header_sqlext_h" >&6
+
+fi
+if test $ac_cv_header_sqlext_h = yes; then
+  :
 else
-  as_fn_error "odbc not found. install odbc" "$LINENO" 5
+  { { 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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 :
-  ac_fn_c_check_header_mongrel "$LINENO" "ldap.h" "ac_cv_header_ldap_h" "$ac_includes_default"
-if test "x$ac_cv_header_ldap_h" = x""yes; then :
+
+for ac_header in ldap.h
+do
+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?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (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_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+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?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+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
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LDAP_H 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  as_fn_error "ldap.h not found. install openldap libs" "$LINENO" 5
+  { { 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:${as_lineno-$LINENO}: checking for ldap_simple_bind_s in -lldap" >&5
-$as_echo_n "checking for ldap_simple_bind_s in -lldap... " >&6; }
-if test "${ac_cv_lib_ldap_ldap_simple_bind_s+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lldap  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_ldap_ldap_simple_bind_s=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_ldap_ldap_simple_bind_s=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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
@@ -13823,48 +16959,79 @@ _ACEOF
   LIBS="-lldap $LIBS"
 
 else
-  as_fn_error "openldap lib not found or functional" "$LINENO" 5
+  { { 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:${as_lineno-$LINENO}: checking for ldap_set_option in -lldap" >&5
-$as_echo_n "checking for ldap_set_option in -lldap... " >&6; }
-if test "${ac_cv_lib_ldap_ldap_set_option+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lldap  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_ldap_ldap_set_option=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_ldap_ldap_set_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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
@@ -13872,12 +17039,14 @@ _ACEOF
   LIBS="-lldap $LIBS"
 
 else
-  as_fn_error "openldap lib not found or functional" "$LINENO" 5
+  { { 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:${as_lineno-$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
@@ -13886,16 +17055,16 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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
@@ -13910,8 +17079,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:${as_lineno-$LINENO}: result: $tmp" >&5
-$as_echo "$tmp" >&6; }
+    echo "$as_me:$LINENO: result: $tmp" >&5
+echo "${ECHO_T}$tmp" >&6
 
 
   succeeded=no
@@ -13919,10 +17088,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -13934,30 +17103,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -13968,25 +17136,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -14017,10 +17185,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -14032,30 +17200,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -14066,25 +17233,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -14105,7 +17272,9 @@ $as_echo "$MOZ_NSS_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_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." "$LINENO" 5
+     { { 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
 
     else
@@ -14120,10 +17289,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -14135,30 +17304,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -14169,25 +17337,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -14208,7 +17376,9 @@ $as_echo "$MOZ_NSPR_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_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." "$LINENO" 5
+     { { 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
 
       NSPR_LIB="-L`$PKG_CONFIG --variable=libdir nspr`"
@@ -14220,10 +17390,10 @@ $as_echo "$MOZ_NSPR_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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -14235,30 +17405,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -14269,25 +17438,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -14308,7 +17477,9 @@ $as_echo "$MOZ_NSPR_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_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." "$LINENO" 5
+     { { 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
 
     fi
@@ -14320,10 +17491,10 @@ $as_echo "$MOZ_NSPR_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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -14335,30 +17506,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -14369,25 +17539,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -14422,10 +17592,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -14437,30 +17607,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -14471,25 +17640,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -14510,7 +17679,9 @@ $as_echo "$MOZILLAXPCOM_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_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." "$LINENO" 5
+     { { 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
 
       MOZ_INC=`$PKG_CONFIG --variable=includedir libxul`
@@ -14528,43 +17699,72 @@ $as_echo "$MOZILLAXPCOM_LIBS" >&6; }
     save_LIBS="$LIBS"
     CPPFLAGS="$CPPFLAGS $MOZ_NSS_CFLAGS"
     LDFLAGS="$LDFLAGS $MOZ_NSS_LIBS"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PK11_GetCertFromPrivateKey in -lnss3" >&5
-$as_echo_n "checking for PK11_GetCertFromPrivateKey in -lnss3... " >&6; }
-if test "${ac_cv_lib_nss3_PK11_GetCertFromPrivateKey+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnss3  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_nss3_PK11_GetCertFromPrivateKey=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_nss3_PK11_GetCertFromPrivateKey=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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
@@ -14572,9 +17772,13 @@ _ACEOF
   LIBS="-lnss3 $LIBS"
 
 else
-  as_fn_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
+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)" "$LINENO" 5
+Fixed since nss 3.9.3 (contained by e.g. mozilla >= 1.7.5)" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
     LDFLAGS="$save_LDFLAGS"
@@ -14583,16 +17787,20 @@ fi
 
     MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS
     if test "$WITH_LDAP" != "NO" && test "$WITH_OPENLDAP" != "YES"; then
-      { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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_fn_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
+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." "$LINENO" 5
+Please recompile $tmp with --enable-ldap or use --with-openldap." >&2;}
+   { (exit 1); exit 1; }; }
       fi
     fi
 
@@ -14603,48 +17811,48 @@ Please recompile $tmp with --enable-ldap or use --with-openldap." "$LINENO" 5
     fi
 
 elif test "$enable_mozilla" = "no"; then
-    { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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
@@ -14661,55 +17869,63 @@ else
       enable_build_mozilla=
 fi
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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_fn_error "Mozilla build tooling not found.
+{ { 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" "$LINENO" 5
+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_fn_error "Mozilla build tooling incomplete!" "$LINENO" 5
+{ { 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:${as_lineno-$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_fn_error "Mozilla build tooling incomplete!" "$LINENO" 5
+{ { 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:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+   echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
 if test "$BUILD_MOZAB" = "TRUE"; then
@@ -14717,11 +17933,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_fn_error "Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only." "$LINENO" 5
+        { { 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:${as_lineno-$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
@@ -14731,48 +17949,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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_fn_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/" "$LINENO" 5
+ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/" >&5
+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:${as_lineno-$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_fn_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/)" "$LINENO" 5
+        { { 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
+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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -14784,30 +18010,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -14818,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -14855,10 +18080,12 @@ $as_echo "$MOZGTK2_LIBS" >&6; }
   fi
 
   if test $succeeded = yes; then
-     { $as_echo "$as_me:${as_lineno-$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_fn_error "Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages" "$LINENO" 5
+     { { 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
 
       else
@@ -14868,10 +18095,10 @@ $as_echo "$as_me: OK - can build mozilla" >&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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -14883,30 +18110,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -14917,25 +18143,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -14960,7 +18186,9 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; }
   fi
 
          if test -z "$MOZIDL"; then
-            as_fn_error "libIDL 0.6.3 or newer is needed to build mozilla with mac toolkit." "$LINENO" 5
+            { { 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
    else
@@ -14972,10 +18200,10 @@ $as_echo "$MOZLIBREQ_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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -14987,30 +18215,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -15021,25 +18248,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -15064,7 +18291,9 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; }
   fi
 
          if test -z "$MOZGTK"; then
-            as_fn_error "GTK2 is needed to build mozilla." "$LINENO" 5
+            { { 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
 
   succeeded=no
@@ -15072,10 +18301,10 @@ $as_echo "$MOZLIBREQ_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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -15087,30 +18316,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -15121,25 +18349,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -15164,7 +18392,9 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; }
   fi
 
          if test -z "$MOZIDL"; then
-            as_fn_error "libIDL >= 0.8.0 is needed when using GTK2 to build mozilla." "$LINENO" 5
+            { { 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
 
@@ -15173,10 +18403,10 @@ $as_echo "$MOZLIBREQ_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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -15188,30 +18418,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -15222,25 +18451,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -15265,7 +18494,9 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; }
   fi
 
          if test -z "$MOZGTK"; then
-            as_fn_error "gtk 1.2 is needed when not using GTK2 to build mozilla." "$LINENO" 5
+            { { 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
 
   succeeded=no
@@ -15273,10 +18504,10 @@ $as_echo "$MOZLIBREQ_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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -15288,30 +18519,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -15322,25 +18552,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -15365,7 +18595,9 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; }
   fi
 
          if test -z "$MOZIDL"; then
-            as_fn_error "libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." "$LINENO" 5
+            { { 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
    fi
@@ -15385,61 +18617,225 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
+   echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
    SYSTEM_SANE_HEADER=YES
-   ac_fn_c_check_header_mongrel "$LINENO" "sane/sane.h" "ac_cv_header_sane_sane_h" "$ac_includes_default"
-if test "x$ac_cv_header_sane_sane_h" = x""yes; then :
+   if test "${ac_cv_header_sane_sane_h+set}" = set; then
+  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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <sane/sane.h>
+_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_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sane/sane.h>
+_ACEOF
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: sane/sane.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: sane/sane.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sane/sane.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: sane/sane.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: sane/sane.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: sane/sane.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sane/sane.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: sane/sane.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sane/sane.h: 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
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_sane_sane_h=$ac_header_preproc
+fi
+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 $ac_cv_header_sane_sane_h = yes; then
+  :
 else
-  as_fn_error "sane not found. install sane" "$LINENO" 5
+  { { 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: checking for unicode/rbbi.h" >&5
-$as_echo_n "checking for unicode/rbbi.h... " >&6; }
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+   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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 unicode/rbbi.h
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked." >&5
-$as_echo "checked." >&6; }
+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
+  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
-  as_fn_error "icu headers not found." "$LINENO" 5
+  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
+
+  { { 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_SYSTEM_GENBRK+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_SYSTEM_GENBRK+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $SYSTEM_GENBRK in
   [\\/]* | ?:[\\/]*)
@@ -15452,38 +18848,39 @@ for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 SYSTEM_GENBRK=$ac_cv_path_SYSTEM_GENBRK
+
 if test -n "$SYSTEM_GENBRK"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
    if test -z "$SYSTEM_GENBRK"; then
-      as_fn_error "\\"genbrk\\" not found in \$PATH, install the icu development tool \\"genbrk\"\" "$LINENO" 5
+      { { 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_SYSTEM_GENCCODE+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_SYSTEM_GENCCODE+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $SYSTEM_GENCCODE in
   [\\/]* | ?:[\\/]*)
@@ -15496,38 +18893,39 @@ for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 SYSTEM_GENCCODE=$ac_cv_path_SYSTEM_GENCCODE
+
 if test -n "$SYSTEM_GENCCODE"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
    if test -z "$SYSTEM_GENCCODE"; then
-      as_fn_error "\\"genccode\\" not found in \$PATH, install the icu development tool \\"genccode\"\" "$LINENO" 5
+      { { 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_SYSTEM_GENCMN+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_SYSTEM_GENCMN+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $SYSTEM_GENCMN in
   [\\/]* | ?:[\\/]*)
@@ -15540,41 +18938,47 @@ for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 SYSTEM_GENCMN=$ac_cv_path_SYSTEM_GENCMN
+
 if test -n "$SYSTEM_GENCMN"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
    if test -z "$SYSTEM_GENCMN"; then
-      as_fn_error "\\"gencmn\\" not found in \$PATH, install the icu development tool \\"gencmn\"\" "$LINENO" 5
+      { { 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:${as_lineno-$LINENO}: checking ICU version" >&5
-$as_echo_n "checking ICU version... " >&6; }
-      if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+   echo "$as_me:$LINENO: checking ICU version" >&5
+echo $ECHO_N "checking ICU version... $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
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <unicode/uversion.h>
@@ -15587,16 +18991,31 @@ int main(int argc, char **argv) {
 }
 
 _ACEOF
-if ac_fn_cxx_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
-$as_echo "OK" >&6; }
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./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
+  echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6
 else
-  as_fn_error "not suitable, only >= 4.0 supported currently" "$LINENO" 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: 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 -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam 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'
@@ -15604,8 +19023,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:${as_lineno-$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
@@ -15615,18 +19034,18 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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
@@ -15634,10 +19053,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -15649,30 +19068,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -15683,25 +19101,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -15722,18 +19140,20 @@ $as_echo "$GRAPHITE_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_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." "$LINENO" 5
+     { { 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
 
     else
-        { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+   echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
 
@@ -15743,13 +19163,15 @@ fi
 
 if test  "$_os" = "Darwin"; then
    if test "x$with_x" = "xyes"; then
-      as_fn_error "X11 build is no longer supported on MacOSX, please use the native aqua build" "$LINENO" 5
+      { { 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:${as_lineno-$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:${as_lineno-$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
@@ -15757,7 +19179,9 @@ $as_echo "yes" >&6; }
          ENABLE_CUPS=""
 
       else
-         as_fn_error "No AppKit.framewrok found" "$LINENO" 5
+         { { 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
 fi
@@ -15769,47 +19193,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:${as_lineno-$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.
-if test "${with_x+set}" = set; then :
-  withval=$with_x;
-fi
+# Check whether --with-x or --without-x was given.
+if test "${with_x+set}" = set; then
+  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_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
-    *,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
@@ -15817,41 +19238,37 @@ _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.
 # Check X11 before X11Rn because it is often a symlink to the current release.
 ac_x_header_dirs='
 /usr/X11/include
-/usr/X11R7/include
 /usr/X11R6/include
 /usr/X11R5/include
 /usr/X11R4/include
 
 /usr/include/X11
-/usr/include/X11R7
 /usr/include/X11R6
 /usr/include/X11R5
 /usr/include/X11R4
 
 /usr/local/X11/include
-/usr/local/X11R7/include
 /usr/local/X11R6/include
 /usr/local/X11R5/include
 /usr/local/X11R4/include
 
 /usr/local/include/X11
-/usr/local/include/X11R7
 /usr/local/include/X11R6
 /usr/local/include/X11R5
 /usr/local/include/X11R4
@@ -15871,18 +19288,42 @@ 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+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
+  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
+  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
@@ -15896,76 +19337,102 @@ 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"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  LIBS=$ac_save_LIBS
-for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+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 -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+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:${as_lineno-$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:${as_lineno-$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
   # Not all programs may use this symbol, but it does not hurt to define it.
 
-$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define X_DISPLAY_MISSING 1
+_ACEOF
 
   X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
 else
@@ -15978,12 +19445,16 @@ 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:${as_lineno-$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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+    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
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -15994,13 +19465,48 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-       X_LIBS="$X_LIBS -R$x_libraries"
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  LIBS="$ac_xsave_LIBS -R $x_libraries"
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  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
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -16011,21 +19517,48 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	  X_LIBS="$X_LIBS -R $x_libraries"
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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:${as_lineno-$LINENO}: result: neither works" >&5
-$as_echo "neither works" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_R_space=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    ac_c_werror_flag=$ac_xsave_c_werror_flag
-    LIBS=$ac_xsave_LIBS
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+	if test $ac_R_space = yes; then
+	  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	  X_LIBS="$X_LIBS -R $x_libraries"
+	else
+	  echo "$as_me:$LINENO: result: neither works" >&5
+echo "${ECHO_T}neither works" >&6
+	fi
+      fi
+      LIBS=$ac_xsave_LIBS
+    esac
   fi
 
   # Check for system-dependent libraries X programs must link with.
@@ -16039,112 +19572,196 @@ rm -f core conftest.err conftest.$ac_objext \
     # libraries were built with DECnet support.  And Karl Berry says
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
-
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
-$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_dnet_dnet_ntoa=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dnet_dnet_ntoa=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
-$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_dnet_stub_dnet_ntoa=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dnet_stub_dnet_ntoa=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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 -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
     LIBS="$ac_xsave_LIBS"
 
     # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
@@ -16155,90 +19772,232 @@ rm -f core conftest.err conftest.$ac_objext \
     # 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.
-    ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-if test "x$ac_cv_func_gethostbyname" = x""yes; then :
+    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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define gethostbyname innocuous_gethostbyname
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char gethostbyname (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef gethostbyname
+
+/* Override any 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)
+choke me
+#else
+char (*f) () = gethostbyname;
+#endif
+#ifdef __cplusplus
+}
+#endif
 
+int
+main ()
+{
+return f != gethostbyname;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_gethostbyname=no
 fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+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:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
-$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_nsl_gethostbyname=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_nsl_gethostbyname=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
-$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_bsd_gethostbyname=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_bsd_gethostbyname=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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
 
@@ -16252,147 +20011,489 @@ 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.
-    ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-if test "x$ac_cv_func_connect" = x""yes; then :
+    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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define connect to an innocuous variant, in case <limits.h> declares connect.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define connect innocuous_connect
 
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char connect (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef connect
+
+/* Override any 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)
+choke me
+#else
+char (*f) () = connect;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != connect;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_connect=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 fi
+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:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
-$as_echo_n "checking for connect in -lsocket... " >&6; }
-if test "${ac_cv_lib_socket_connect+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_socket_connect=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_socket_connect=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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.
-    ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
-if test "x$ac_cv_func_remove" = x""yes; then :
+    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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define remove to an innocuous variant, in case <limits.h> declares remove.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define remove innocuous_remove
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char remove (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef remove
+
+/* Override any 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)
+choke me
+#else
+char (*f) () = remove;
+#endif
+#ifdef __cplusplus
+}
+#endif
 
+int
+main ()
+{
+return f != remove;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_remove=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 fi
+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:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
-$as_echo_n "checking for remove in -lposix... " >&6; }
-if test "${ac_cv_lib_posix_remove+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_posix_remove=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_posix_remove=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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.
-    ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
-if test "x$ac_cv_func_shmat" = x""yes; then :
+    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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define shmat innocuous_shmat
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char shmat (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef shmat
+
+/* Override any 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)
+choke me
+#else
+char (*f) () = shmat;
+#endif
+#ifdef __cplusplus
+}
+#endif
 
+int
+main ()
+{
+return f != shmat;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_shmat=no
 fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+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:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
-$as_echo_n "checking for shmat in -lipc... " >&6; }
-if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_ipc_shmat=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_ipc_shmat=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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
 
@@ -16408,43 +20509,71 @@ 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:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
-$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_ICE_IceConnectionNumber=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_ICE_IceConnectionNumber=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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
 
@@ -16461,92 +20590,154 @@ fi
      x_libraries="default_x_libraries"
    fi
       if test -z "$x_libraries"; then
-      as_fn_error "No X libraries found" "$LINENO" 5 # Exit
+      { { 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_fn_error "No X includes found" "$LINENO" 5 # Exit
+      { { 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:${as_lineno-$LINENO}: checking for XOpenDisplay in -lX11" >&5
-$as_echo_n "checking for XOpenDisplay in -lX11... " >&6; }
-if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_X11_XOpenDisplay=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_X11_XOpenDisplay=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "X Development libraries not found" "$LINENO" 5
+  { { 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:${as_lineno-$LINENO}: checking for XauDisposeAuth in -lXau" >&5
-$as_echo_n "checking for XauDisposeAuth in -lXau... " >&6; }
-if test "${ac_cv_lib_Xau_XauDisposeAuth+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXau  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_Xau_XauDisposeAuth=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_Xau_XauDisposeAuth=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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
 
@@ -16578,76 +20769,205 @@ fi
 
 
 if test "$_os" != "WINNT" -a "$_os" != "OS2" -a "$_os" != "Darwin"; then
-            { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-       for ac_header in X11/Composite.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "X11/Composite.h" "ac_cv_header_X11_Composite_h" "#include <X11/Intrinsic.h>
-"
-if test "x$ac_cv_header_X11_Composite_h" = x""yes; then :
+       echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+
+for ac_header in X11/Composite.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+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.  */
+#include <X11/Intrinsic.h>
+
+#include <$ac_header>
+_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
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_Header=no"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+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 HAVE_X11_COMPOSITE_H 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  as_fn_error "Xt include headers not found" "$LINENO" 5
+  { { 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:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-       for ac_header in X11/Xaw/Label.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "X11/Xaw/Label.h" "ac_cv_header_X11_Xaw_Label_h" "#include <X11/Intrinsic.h>
-"
-if test "x$ac_cv_header_X11_Xaw_Label_h" = x""yes; then :
+       echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+for ac_header in X11/Xaw/Label.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+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.  */
+#include <X11/Intrinsic.h>
+
+#include <$ac_header>
+_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
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_Header=no"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+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 HAVE_X11_XAW_LABEL_H 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  as_fn_error "Xaw include headers not found" "$LINENO" 5
+  { { 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:${as_lineno-$LINENO}: checking for main in -lXaw" >&5
-$as_echo_n "checking for main in -lXaw... " >&6; }
-if test "${ac_cv_lib_Xaw_main+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXaw  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 
 int
 main ()
 {
-return main ();
+main ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_Xaw_main=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_Xaw_main=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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
@@ -16655,7 +20975,9 @@ _ACEOF
   LIBS="-lXaw $LIBS"
 
 else
-  as_fn_error "Xaw library not found or functional" "$LINENO" 5
+  { { 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
 
    fi
@@ -16665,23 +20987,166 @@ fi
 
 
 if test "$ENABLE_FONTCONFIG" = "TRUE" ; then
-    ac_fn_c_check_header_mongrel "$LINENO" "fontconfig/fontconfig.h" "ac_cv_header_fontconfig_fontconfig_h" "$ac_includes_default"
-if test "x$ac_cv_header_fontconfig_fontconfig_h" = x""yes; then :
+    if test "${ac_cv_header_fontconfig_fontconfig_h+set}" = set; then
+  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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <fontconfig/fontconfig.h>
+_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_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <fontconfig/fontconfig.h>
+_ACEOF
+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
+  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
-  as_fn_error "fontconfig/fontconfig.h could not be found. libfontconfig1-dev or fontconfig???-devel missing?" "$LINENO" 5
+  ac_cpp_err=yes
 fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fontconfig is >= 2.2.0" >&5
-$as_echo_n "checking whether fontconfig is >= 2.2.0... " >&6; }
-    if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: fontconfig/fontconfig.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: fontconfig/fontconfig.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: fontconfig/fontconfig.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: fontconfig/fontconfig.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: 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
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  ac_cv_header_fontconfig_fontconfig_h=$ac_header_preproc
+fi
+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 $ac_cv_header_fontconfig_fontconfig_h = yes; then
+  :
+else
+  { { 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
+
+
+    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
+  { { 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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <fontconfig/fontconfig.h>
@@ -16692,89 +21157,271 @@ int main(int argc, char **argv) {
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./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
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
-  as_fn_error "no, fontconfig >= 2.2.0 needed" "$LINENO" 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, fontconfig >= 2.2.0 needed" >&5
+echo "$as_me: error: no, fontconfig >= 2.2.0 needed" >&2;}
+   { (exit 1); exit 1; }; }
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-
 fi
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
+   echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
    SYSTEM_XRENDER_HEADERS=YES
-   ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/Xrender.h" "ac_cv_header_X11_extensions_Xrender_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_extensions_Xrender_h" = x""yes; then :
+   if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
+  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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <X11/extensions/Xrender.h>
+_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_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <X11/extensions/Xrender.h>
+_ACEOF
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the 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:* )
+    { 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
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_X11_extensions_Xrender_h=$ac_header_preproc
+fi
+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 $ac_cv_header_X11_extensions_Xrender_h = yes; then
+  :
 else
-  as_fn_error "Xrender not found. install X" "$LINENO" 5
+  { { 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:${as_lineno-$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:${as_lineno-$LINENO}: checking for XRenderQueryVersion in -lXrender" >&5
-$as_echo_n "checking for XRenderQueryVersion in -lXrender... " >&6; }
-if test "${ac_cv_lib_Xrender_XRenderQueryVersion+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXrender  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_Xrender_XRenderQueryVersion=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_Xrender_XRenderQueryVersion=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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
@@ -16782,20 +21429,22 @@ _ACEOF
   LIBS="-lXrender $LIBS"
 
 else
-  as_fn_error "libXrender not found or functional" "$LINENO" 5
+  { { 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
 
 fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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"
 
@@ -16804,10 +21453,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -16819,30 +21468,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -16853,25 +21501,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -16896,52 +21544,219 @@ $as_echo "$XRANDR_LIBS" >&6; }
   fi
 
       if test "$ENABLE_RANDR" != "TRUE"; then
-         ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/Xrandr.h" "ac_cv_header_X11_extensions_Xrandr_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_extensions_Xrandr_h" = x""yes; then :
+         if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then
+  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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <X11/extensions/Xrandr.h>
+_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_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <X11/extensions/Xrandr.h>
+_ACEOF
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: X11/extensions/Xrandr.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: proceeding with the 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:* )
+    { 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
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_X11_extensions_Xrandr_h=$ac_header_preproc
+fi
+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 $ac_cv_header_X11_extensions_Xrandr_h = yes; then
+  :
 else
-  as_fn_error "X11/extensions/Xrandr.h could not be found. X11 dev missing?" "$LINENO" 5
+  { { 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:${as_lineno-$LINENO}: checking for XRRQueryExtension in -lXrandr" >&5
-$as_echo_n "checking for XRRQueryExtension in -lXrandr... " >&6; }
-if test "${ac_cv_lib_Xrandr_XRRQueryExtension+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXrandr  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_Xrandr_XRRQueryExtension=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_Xrandr_XRRQueryExtension=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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
@@ -16949,51 +21764,53 @@ _ACEOF
   LIBS="-lXrandr $LIBS"
 
 else
-   as_fn_error "libXrandr not found or functional" "$LINENO" 5
+   { { 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -17005,30 +21822,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -17039,25 +21855,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -17078,15 +21894,17 @@ $as_echo "$NEON_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error "you need neon >= 0.24.x for system-neon" "$LINENO" 5
+     { { 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
 
         NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
         NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
         SYSTEM_NEON=YES
 else
-    { $as_echo "$as_me:${as_lineno-$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=
@@ -17101,12 +21919,12 @@ fi
 if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then
    with_system_openssl=yes
 fi
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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
@@ -17119,10 +21937,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -17134,30 +21952,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -17168,25 +21985,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -17207,14 +22024,16 @@ $as_echo "$OPENSSL_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_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." "$LINENO" 5
+     { { 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:${as_lineno-$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
@@ -17222,33 +22041,33 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -17260,30 +22079,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -17294,25 +22112,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -17333,11 +22151,13 @@ $as_echo "$AGG_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_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." "$LINENO" 5
+     { { 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:${as_lineno-$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
@@ -17349,21 +22169,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:${as_lineno-$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:${as_lineno-$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_fn_error "only agg 2.3 and 2.4 are supported" "$LINENO" 5
+	    { { 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:${as_lineno-$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"
@@ -17372,12 +22194,12 @@ $as_echo "internal" >&6; }
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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
@@ -17385,10 +22207,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -17400,30 +22222,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -17434,25 +22255,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -17473,26 +22294,28 @@ $as_echo "$REDLAND_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_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." "$LINENO" 5
+     { { 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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'
@@ -17504,10 +22327,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -17519,30 +22342,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -17553,25 +22375,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -17596,16 +22418,290 @@ $as_echo "$HUNSPELL_LIBS" >&6; }
   fi
 
     if test "$HUNSPELL_PC" != "TRUE"; then
-      ac_fn_cxx_check_header_mongrel "$LINENO" "hunspell.hxx" "ac_cv_header_hunspell_hxx" "$ac_includes_default"
-if test "x$ac_cv_header_hunspell_hxx" = x""yes; then :
+      if test "${ac_cv_header_hunspell_hxx+set}" = set; then
+  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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <hunspell.hxx>
+_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_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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_header_compiler=no
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <hunspell.hxx>
+_ACEOF
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-      ac_fn_cxx_check_header_mongrel "$LINENO" "hunspell/hunspell.hxx" "ac_cv_header_hunspell_hunspell_hxx" "$ac_includes_default"
-if test "x$ac_cv_header_hunspell_hunspell_hxx" = x""yes; then :
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: 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:* )
+    { 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
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_hunspell_hxx=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hxx" >&5
+echo "${ECHO_T}$ac_cv_header_hunspell_hxx" >&6
+
+fi
+if test $ac_cv_header_hunspell_hxx = yes; then
+  :
+else
+
+      if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then
+  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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <hunspell/hunspell.hxx>
+_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_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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <hunspell/hunspell.hxx>
+_ACEOF
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: 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:* )
+    { 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
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_hunspell_hunspell_hxx=$ac_header_preproc
+fi
+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 $ac_cv_header_hunspell_hunspell_hxx = yes; then
    HUNSPELL_CFLAGS=-I/usr/include/hunspell
 else
-  as_fn_error "hunspell headers not found." "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: hunspell headers not found." >&5
+echo "$as_me: error: hunspell headers not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
@@ -17613,37 +22709,66 @@ fi
 fi
 
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lhunspell" >&5
-$as_echo_n "checking for main in -lhunspell... " >&6; }
-if test "${ac_cv_lib_hunspell_main+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lhunspell  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 
 int
 main ()
 {
-return main ();
+main ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_hunspell_main=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_hunspell_main=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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
@@ -17651,7 +22776,9 @@ _ACEOF
   LIBS="-lhunspell $LIBS"
 
 else
-   as_fn_error "hunspell library not found." "$LINENO" 5
+   { { echo "$as_me:$LINENO: error: hunspell library not found." >&5
+echo "$as_me: error: hunspell library not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
       HUNSPELL_LIBS=-lhunspell
@@ -17663,8 +22790,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:${as_lineno-$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
@@ -17672,213 +22799,711 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
+    echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
     SYSTEM_HYPH=YES
-    ac_fn_c_check_header_mongrel "$LINENO" "hyphen.h" "ac_cv_header_hyphen_h" "$ac_includes_default"
-if test "x$ac_cv_header_hyphen_h" = x""yes; then :
+    if test "${ac_cv_header_hyphen_h+set}" = set; then
+  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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <hyphen.h>
+_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_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_header_compiler=no
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <hyphen.h>
+_ACEOF
+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
+  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
-   as_fn_error "altlinuxhyph headers not found." "$LINENO" 5
+  ac_cpp_err=yes
 fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
 
-    ac_fn_c_check_member "$LINENO" "struct _HyphenDict" "cset" "ac_cv_member_struct__HyphenDict_cset" "#include <hyphen.h>
-"
-if test "x$ac_cv_member_struct__HyphenDict_cset" = x""yes; then :
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: hyphen.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: hyphen.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: hyphen.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: hyphen.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: hyphen.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: hyphen.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: hyphen.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: hyphen.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: hyphen.h: 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
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_hyphen_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_hyphen_h" >&5
+echo "${ECHO_T}$ac_cv_header_hyphen_h" >&6
 
+fi
+if test $ac_cv_header_hyphen_h = yes; then
+  :
 else
-   as_fn_error "no. You are sure you have altlinuyhyph headers?" "$LINENO" 5
+   { { 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:${as_lineno-$LINENO}: checking for hnj_hyphen_hyphenate2 in -lhyphen" >&5
-$as_echo_n "checking for hnj_hyphen_hyphenate2 in -lhyphen... " >&6; }
-if test "${ac_cv_lib_hyphen_hnj_hyphen_hyphenate2+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  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.  */
+#include <hyphen.h>
+
+int
+main ()
+{
+static struct _HyphenDict ac_aggr;
+if (ac_aggr.cset)
+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_member_struct__HyphenDict_cset=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <hyphen.h>
+
+int
+main ()
+{
+static struct _HyphenDict ac_aggr;
+if (sizeof ac_aggr.cset)
+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_member_struct__HyphenDict_cset=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_member_struct__HyphenDict_cset=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+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
+   { { 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
+
+    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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lhyphen  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "altlinuxhyph library not found or too old." "$LINENO" 5
+   { { 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:${as_lineno-$LINENO}: checking for hnj_hyphen_hyphenate2 in -lhyph" >&5
-$as_echo_n "checking for hnj_hyphen_hyphenate2 in -lhyph... " >&6; }
-if test "${ac_cv_lib_hyph_hnj_hyphen_hyphenate2+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lhyph  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_hyph_hnj_hyphen_hyphenate2=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_hyph_hnj_hyphen_hyphenate2=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "altlinuxhyph library not found or too old." "$LINENO" 5
+   { { 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:${as_lineno-$LINENO}: checking for hnj_hyphen_hyphenate2 in -lhnj" >&5
-$as_echo_n "checking for hnj_hyphen_hyphenate2 in -lhnj... " >&6; }
-if test "${ac_cv_lib_hnj_hnj_hyphen_hyphenate2+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lhnj  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_hnj_hnj_hyphen_hyphenate2=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_hnj_hnj_hyphen_hyphenate2=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "altlinuxhyph library not found or too old." "$LINENO" 5
+   { { 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:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
+    echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
     SYSTEM_HYPH=NO
     BUILD_TYPE="$BUILD_TYPE HYPHEN"
 fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
+    echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
     SYSTEM_MYTHES=YES
-    ac_fn_c_check_header_mongrel "$LINENO" "mythes.hxx" "ac_cv_header_mythes_hxx" "$ac_includes_default"
-if test "x$ac_cv_header_mythes_hxx" = x""yes; then :
+    if test "${ac_cv_header_mythes_hxx+set}" = set; then
+  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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <mythes.hxx>
+_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_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <mythes.hxx>
+_ACEOF
+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
+  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
-   as_fn_error "mythes.hxx headers not found." "$LINENO" 5
+  ac_cpp_err=yes
 fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lmythes" >&5
-$as_echo_n "checking for main in -lmythes... " >&6; }
-if test "${ac_cv_lib_mythes_main+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: mythes.hxx: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: mythes.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mythes.hxx: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: mythes.hxx: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: mythes.hxx: present but cannot be compiled" >&5
+echo "$as_me: WARNING: mythes.hxx: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mythes.hxx:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: mythes.hxx:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mythes.hxx: 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
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_mythes_hxx=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_mythes_hxx" >&5
+echo "${ECHO_T}$ac_cv_header_mythes_hxx" >&6
+
+fi
+if test $ac_cv_header_mythes_hxx = yes; then
+  :
+else
+   { { 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
+
+
+
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmythes  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 
 int
 main ()
 {
-return main ();
+main ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_mythes_main=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_mythes_main=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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
@@ -17886,68 +23511,237 @@ _ACEOF
   LIBS="-lmythes $LIBS"
 
 else
-   as_fn_error "mythes library not found." "$LINENO" 5
+   { { 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
+    echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
     SYSTEM_LPSOLVE=YES
-    ac_fn_c_check_header_mongrel "$LINENO" "lpsolve/lp_lib.h" "ac_cv_header_lpsolve_lp_lib_h" "$ac_includes_default"
-if test "x$ac_cv_header_lpsolve_lp_lib_h" = x""yes; then :
+    if test "${ac_cv_header_lpsolve_lp_lib_h+set}" = set; then
+  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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <lpsolve/lp_lib.h>
+_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_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <lpsolve/lp_lib.h>
+_ACEOF
+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
+  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
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: lpsolve/lp_lib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: proceeding with the 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:* )
+    { 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
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-   as_fn_error "lpsolve headers not found." "$LINENO" 5
+  ac_cv_header_lpsolve_lp_lib_h=$ac_header_preproc
 fi
+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 $ac_cv_header_lpsolve_lp_lib_h = yes; then
+  :
+else
+   { { 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:${as_lineno-$LINENO}: checking for make_lp in -llpsolve55" >&5
-$as_echo_n "checking for make_lp in -llpsolve55... " >&6; }
-if test "${ac_cv_lib_lpsolve55_make_lp+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-llpsolve55  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_lpsolve55_make_lp=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_lpsolve55_make_lp=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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
@@ -17955,73 +23749,105 @@ _ACEOF
   LIBS="-llpsolve55 $LIBS"
 
 else
-   as_fn_error "lpsolve library not found or too old." "$LINENO" 5
+   { { 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: checking for gnu_get_libc_version in -lc" >&5
-$as_echo_n "checking for gnu_get_libc_version in -lc... " >&6; }
-if test "${ac_cv_lib_c_gnu_get_libc_version+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_c_gnu_get_libc_version=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_c_gnu_get_libc_version=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
    else
-      as_fn_error "no, upgrade libc" "$LINENO" 5
+      { { 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:${as_lineno-$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`
@@ -18042,12 +23868,19 @@ $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_fn_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
+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.
 Remove/rename/backup that file and restart configure. Details about this
-problem can be found in issue 49856." "$LINENO" 5
+problem can be found in issue 49856." >&2;}
+   { (exit 1); exit 1; }; }
     fi
 # WIndows SDK has different headers
 	if test \( -f "$PSDK_HOME/Include/adoint.h" \) \
@@ -18063,36 +23896,41 @@ problem can be found in issue 49856." "$LINENO" 5
 		HAVE_PSDK_LIB="no"
 	fi
     if test "$HAVE_PSDK_H" = "no" -o "$HAVE_PSDK_LIB" = "no"; then
-        as_fn_error "Some (all?) PSDK files not found, please check if all needed Platform SDKs
-are installed or use --with-psdk-home ." "$LINENO" 5
+        { { 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
+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
     if test ! -x "$PSDK_HOME/bin/msiinfo.exe" \
          -o ! -x "$PSDK_HOME/bin/msidb.exe" \
          -o ! -x "$PSDK_HOME/bin/uuidgen.exe" \
          -o ! -x "$PSDK_HOME/bin/msitran.exe" ; then
-        as_fn_error "Some (all) files of the Windows Installer SDK are missing, please install." "$LINENO" 5
+        { { 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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"`
@@ -18124,15 +23962,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:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
+		    echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6
 	    else
-		    as_fn_error "DirectX SDK files not found, please use --with-directx-home or -disable-directx." "$LINENO" 5
+		    { { 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:${as_lineno-$LINENO}: result: disabled" >&5
-$as_echo "disabled" >&6; }
+		echo "$as_me:$LINENO: result: disabled" >&5
+echo "${ECHO_T}disabled" >&6
     fi
 fi
 
@@ -18140,14 +23980,14 @@ fi
 
 NSIS_PATH=""
 if test "$_os" = "WINNT" ; then
-    { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_NSIS_PATH+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_NSIS_PATH+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $NSIS_PATH in
   [\\/]* | ?:[\\/]*)
@@ -18159,29 +23999,28 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 NSIS_PATH=$ac_cv_path_NSIS_PATH
+
 if test -n "$NSIS_PATH"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
     if test -n "$NSIS_PATH"; then
         NSIS_PATH=`dirname "$NSIS_PATH"`
     fi
@@ -18196,24 +24035,24 @@ fi
         NSIS_PATH="$nsistest"
     fi
     if test -z "$NSIS_PATH"; then
-        { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_BISON+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_BISON+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $BISON in
   [\\/]* | ?:[\\/]*)
@@ -18225,56 +24064,59 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 BISON=$ac_cv_path_BISON
+
 if test -n "$BISON"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
 if test -z "$BISON"; then
-   as_fn_error "no bison found in \$PATH, install bison" "$LINENO" 5
+   { { 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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_fn_error "failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))" "$LINENO" 5
+       { { 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_FLEX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_FLEX+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $FLEX in
   [\\/]* | ?:[\\/]*)
@@ -18286,38 +24128,39 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 FLEX=$ac_cv_path_FLEX
+
 if test -n "$FLEX"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
 if test -z "$FLEX"; then
-   as_fn_error "no flex found in \$PATH, install flex" "$LINENO" 5
+   { { 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PATCH+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PATCH+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PATCH in
   [\\/]* | ?:[\\/]*)
@@ -18329,31 +24172,32 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 PATCH=$ac_cv_path_PATCH
+
 if test -n "$PATCH"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
 if test -z "$PATCH"; then
-   as_fn_error "\\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" "$LINENO" 5
+   { { 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
 
 if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then
@@ -18363,17 +24207,21 @@ if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then
       if test -x "$with_gnu_patch"; then
 	GNUPATCH=$with_gnu_patch
       else
-        as_fn_error "--with-gnu-patch did not point to an executable" "$LINENO" 5
+        { { 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:${as_lineno-$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:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+	echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
    else
-  	as_fn_error "no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" "$LINENO" 5
+  	{ { 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
 
 
@@ -18382,10 +24230,10 @@ $as_echo "yes" >&6; }
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GNUCP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_GNUCP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $GNUCP in
   [\\/]* | ?:[\\/]*)
@@ -18397,59 +24245,64 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 GNUCP=$ac_cv_path_GNUCP
+
 if test -n "$GNUCP"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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_fn_error "Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" "$LINENO" 5
+      { { 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_fn_error "--with-gnu-cp did not point to an executable" "$LINENO" 5
+      { { 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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_fn_error "no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" "$LINENO" 5
+         { { 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
   fi
@@ -18462,10 +24315,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CYGWIN_PATH+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_CYGWIN_PATH+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $CYGWIN_PATH in
   [\\/]* | ?:[\\/]*)
@@ -18477,29 +24330,28 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 CYGWIN_PATH=$ac_cv_path_CYGWIN_PATH
+
 if test -n "$CYGWIN_PATH"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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
@@ -18508,18 +24360,18 @@ fi
 
 
 if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ML_EXE+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_ML_EXE+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $ML_EXE in
   [\\/]* | ?:[\\/]*)
@@ -18531,36 +24383,37 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 ML_EXE=$ac_cv_path_ML_EXE
+
 if test -n "$ML_EXE"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
     if test -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:${as_lineno-$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_fn_error "Configure did not find ml.exe assembler." "$LINENO" 5
+        { { 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
        with_asm_home="ASM_IN_PATH"
@@ -18571,8 +24424,8 @@ else
 fi
 ASM_HOME="$with_asm_home"
 if test -n "$ASM_HOME"; then
-  { $as_echo "$as_me:${as_lineno-$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
 
 
@@ -18589,10 +24442,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ZIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_ZIP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $ZIP in
   [\\/]* | ?:[\\/]*)
@@ -18604,35 +24457,34 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 ZIP=$ac_cv_path_ZIP
+
 if test -n "$ZIP"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_UNZIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_UNZIP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $UNZIP in
   [\\/]* | ?:[\\/]*)
@@ -18644,69 +24496,84 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 UNZIP=$ac_cv_path_UNZIP
+
 if test -n "$UNZIP"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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_fn_error "Zip/Unzip are required to build, please install or use --with-zip-home" "$LINENO" 5
+    { { 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 -n "`$ZIP -h | grep -i WinNT`" ; then
-as_fn_error "$ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." "$LINENO" 5
+{ { 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
 
 
 if test "$_os" = "WINNT"; then
-   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
+      echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6
    else
-      as_fn_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>." "$LINENO" 5
+<http://download.microsoft.com/download/b/7/5/b75eace3-00e2-4aa0-9a6f-0b6882c71642/unicows.exe>." >&5
+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:
+<http://download.microsoft.com/download/b/7/5/b75eace3-00e2-4aa0-9a6f-0b6882c71642/unicows.exe>." >&2;}
+   { (exit 1); exit 1; }; }
    fi
 fi
 
 if test "$_os" = "WINNT"; then
-   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
+      echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6
    else
-      as_fn_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>." "$LINENO" 5
+<http://www.microsoft.com/downloads/release.asp?releaseid=30682>." >&5
+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:
+<http://www.microsoft.com/downloads/release.asp?releaseid=30682>." >&2;}
+   { (exit 1); exit 1; }; }
    fi
 fi
 
@@ -18714,21 +24581,28 @@ if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
        if ./oowintool --msvc-copy-dlls ./external/msvcp ; then
           :
        else
-          as_fn_error "oowintool failed to copy CRT" "$LINENO" 5
+          { { 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:${as_lineno-$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:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
+      echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6
    else
-      as_fn_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>." "$LINENO" 5
+<http://www.microsoft.com/downloads/details.aspx?familyid=6A63AB9C-DF12-4D41-933C-BE590FEAA05A&displaylang=en>." >&5
+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;}
+   { (exit 1); exit 1; }; }
    fi
 fi
 
@@ -18738,11 +24612,11 @@ fi
 
 if test "$_os" = "WINNT"; then
    if test  "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then
-   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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`
@@ -18751,21 +24625,27 @@ $as_echo "found" >&6; }
          cp "$MSIWPATH" ./external/msi/ && chmod +x ./external/msi/instmsiw.exe && MSIWCOPY="OK"
       fi
       if test -z "$MSIACOPY" -o -z "$MSIWCOPY"; then
-         as_fn_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/." "$LINENO" 5
+As the automatic detection fails please copy the files to external/msi/." >&5
+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:${as_lineno-$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:${as_lineno-$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"
@@ -18788,31 +24668,31 @@ fi
 
 
 if test -z "$R"; then
-	{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -18824,30 +24704,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -18858,25 +24737,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -18897,33 +24776,35 @@ $as_echo "$GCONF_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_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." "$LINENO" 5
+     { { 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -18935,30 +24816,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -18969,25 +24849,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -19008,7 +24888,9 @@ $as_echo "$GNOMEVFS_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_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." "$LINENO" 5
+     { { 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
 
     if test "$ENABLE_GCONF" != "TRUE"; then
@@ -19018,10 +24900,10 @@ $as_echo "$GNOMEVFS_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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -19033,30 +24915,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -19067,25 +24948,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -19106,13 +24987,15 @@ $as_echo "$GCONF_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_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." "$LINENO" 5
+     { { 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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
 
@@ -19130,10 +25013,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -19145,30 +25028,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -19179,25 +25061,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -19218,7 +25100,9 @@ $as_echo "$GTK_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error "requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages" "$LINENO" 5
+     { { 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
 
       BUILD_TYPE="$BUILD_TYPE GTK"
@@ -19228,22 +25112,22 @@ $as_echo "$GTK_LIBS" >&6; }
          BUILD_TYPE="$BUILD_TYPE SYSTRAY_GTK"
       fi
 
-      { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -19255,30 +25139,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -19289,25 +25172,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -19328,33 +25211,37 @@ $as_echo "$DBUS_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_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." "$LINENO" 5
+     { { 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:${as_lineno-$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:${as_lineno-$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_fn_error "please use --enable-gio only together with --disable-gnome-vfs." "$LINENO" 5
+             { { 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:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -19366,30 +25253,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -19400,25 +25286,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -19439,12 +25325,14 @@ $as_echo "$GIO_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_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." "$LINENO" 5
+     { { 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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+          echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
       fi
 
    fi
@@ -19463,18 +25351,18 @@ SYSTEM_CAIRO=""
 
 if test  "$test_cairo" = "yes"; then
 
-    { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-        { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
+           echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
            SYSTEM_CAIRO=YES
 
 
@@ -19483,10 +25371,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -19498,30 +25386,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -19532,25 +25419,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -19571,22 +25458,31 @@ $as_echo "$CAIRO_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_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." "$LINENO" 5
+     { { 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_fn_error "Cairo library requires fontconfig." "$LINENO" 5
+	      { { 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:${as_lineno-$LINENO}: checking whether Xrender.h defines PictStandardA8" >&5
-$as_echo_n "checking whether Xrender.h defines PictStandardA8... " >&6; }
-              if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+              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
+  { { 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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <X11/extensions/Xrender.h>
@@ -19600,28 +25496,43 @@ int main(int argc, char **argv) {
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./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
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
-  as_fn_error "no, X headers too old." "$LINENO" 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, X headers too old." >&5
+echo "$as_me: error: no, X headers too old." >&2;}
+   { (exit 1); exit 1; }; }
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core *.core 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:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	   echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
     fi
 fi
 
@@ -19632,52 +25543,219 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-   ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default"
-if test "x$ac_cv_header_GL_gl_h" = x""yes; then :
+   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+   if test "${ac_cv_header_GL_gl_h+set}" = set; then
+  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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <GL/gl.h>
+_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_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <GL/gl.h>
+_ACEOF
+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
+  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
-  as_fn_error "OpenGL headers not found" "$LINENO" 5
+  ac_cpp_err=yes
 fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: GL/gl.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: GL/gl.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: GL/gl.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: GL/gl.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: GL/gl.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: GL/gl.h: 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
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_GL_gl_h=$ac_header_preproc
+fi
+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 $ac_cv_header_GL_gl_h = yes; then
+  :
+else
+  { { 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:${as_lineno-$LINENO}: checking for main in -lGL" >&5
-$as_echo_n "checking for main in -lGL... " >&6; }
-if test "${ac_cv_lib_GL_main+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lGL  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 
 int
 main ()
 {
-return main ();
+main ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_GL_main=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_GL_main=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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
@@ -19685,40 +25763,71 @@ _ACEOF
   LIBS="-lGL $LIBS"
 
 else
-  as_fn_error "libGL not installed or functional" "$LINENO" 5
+  { { 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:${as_lineno-$LINENO}: checking for main in -lGLU" >&5
-$as_echo_n "checking for main in -lGLU... " >&6; }
-if test "${ac_cv_lib_GLU_main+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lGLU  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 
 int
 main ()
 {
-return main ();
+main ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_GLU_main=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_GLU_main=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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
@@ -19726,69 +25835,71 @@ _ACEOF
   LIBS="-lGLU $LIBS"
 
 else
-  as_fn_error "libGLU not installed or functional" "$LINENO" 5
+  { { 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:${as_lineno-$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:${as_lineno-$LINENO}: checking whether to build extra presenter ui" >&5
-$as_echo_n "checking whether to build extra presenter ui... " >&6; }
+echo "$as_me:$LINENO: checking whether to build extra presenter ui" >&5
+echo $ECHO_N "checking whether to build extra presenter ui... $ECHO_C" >&6
 if test -n "$enable_presenter_extra_ui" -a "$enable_presenter_extra_ui" != "no"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
    ENABLE_PRESENTER_EXTRA_UI=YES
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+   echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
    ENABLE_PRESENTER_EXTRA_UI=NO
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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
@@ -19796,10 +25907,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -19811,30 +25922,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -19845,25 +25955,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -19884,26 +25994,30 @@ $as_echo "$POPPLER_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_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." "$LINENO" 5
+     { { 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: result: OK" >&5
-$as_echo "OK" >&6; }
+       echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6
       else
-        as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
+        { { 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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+   echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
    ENABLE_PDFIMPORT=NO
 fi
 
@@ -19912,76 +26026,82 @@ fi
 
 
 if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: OK" >&5
-$as_echo "OK" >&6; }
+   echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6
   else
-   as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
+   { { 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:${as_lineno-$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:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: OK" >&5
-$as_echo "OK" >&6; }
+   echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6
   else
-   as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
+   { { 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$SERVLETAPI_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   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_fn_error "servlet-api.jar not found." "$LINENO" 5
+  { { 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:${as_lineno-$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
@@ -19989,93 +26109,103 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: result: OK" >&5
-$as_echo "OK" >&6; }
+    echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6
   else
-    as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
+    { { 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$SAC_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   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_fn_error "sac.jar not found." "$LINENO" 5
+  { { 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:${as_lineno-$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; }
-if test "${ac_cv_file__usr_share_java_libxml_1_0_0_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libxml-1.0.0.jar"; then
   ac_cv_file__usr_share_java_libxml_1_0_0_jar=yes
 else
   ac_cv_file__usr_share_java_libxml_1_0_0_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for /usr/share/java/libxml.jar" >&5
-$as_echo_n "checking for /usr/share/java/libxml.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_libxml_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libxml.jar"; then
   ac_cv_file__usr_share_java_libxml_jar=yes
 else
   ac_cv_file__usr_share_java_libxml_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "libxml.jar replacement not found." "$LINENO" 5
+  { { 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
 
@@ -20084,71 +26214,79 @@ fi
 fi
 
       else
-        as_ac_File=`$as_echo "ac_cv_file_$LIBXML_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$LIBXML_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   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_fn_error "libxml.jar not found." "$LINENO" 5
+  { { 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:${as_lineno-$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; }
-if test "${ac_cv_file__usr_share_java_flute_1_3_0_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/flute-1.3.0.jar"; then
   ac_cv_file__usr_share_java_flute_1_3_0_jar=yes
 else
   ac_cv_file__usr_share_java_flute_1_3_0_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for /usr/share/java/flute.jar" >&5
-$as_echo_n "checking for /usr/share/java/flute.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_flute_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/flute.jar"; then
   ac_cv_file__usr_share_java_flute_jar=yes
 else
   ac_cv_file__usr_share_java_flute_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "flute-1.3.0.jar replacement not found." "$LINENO" 5
+   { { 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
 
@@ -20157,71 +26295,79 @@ fi
 fi
 
       else
-        as_ac_File=`$as_echo "ac_cv_file_$FLUTE_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$FLUTE_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   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_fn_error "flute-1.3.0.jar not found." "$LINENO" 5
+  { { 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:${as_lineno-$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; }
-if test "${ac_cv_file__usr_share_java_flow_engine_0_9_2_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/flow-engine-0.9.2.jar"; then
   ac_cv_file__usr_share_java_flow_engine_0_9_2_jar=yes
 else
   ac_cv_file__usr_share_java_flow_engine_0_9_2_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for /usr/share/java/flow-engine.jar" >&5
-$as_echo_n "checking for /usr/share/java/flow-engine.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_flow_engine_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/flow-engine.jar"; then
   ac_cv_file__usr_share_java_flow_engine_jar=yes
 else
   ac_cv_file__usr_share_java_flow_engine_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "jfreereport.jar replacement not found." "$LINENO" 5
+  { { 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
 
@@ -20230,71 +26376,79 @@ fi
 fi
 
       else
-        as_ac_File=`$as_echo "ac_cv_file_$JFREEREPORT_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$JFREEREPORT_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   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_fn_error "jfreereport.jar not found." "$LINENO" 5
+  { { 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:${as_lineno-$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; }
-if test "${ac_cv_file__usr_share_java_liblayout_0_2_9_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/liblayout-0.2.9.jar"; then
   ac_cv_file__usr_share_java_liblayout_0_2_9_jar=yes
 else
   ac_cv_file__usr_share_java_liblayout_0_2_9_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for /usr/share/java/liblayout.jar" >&5
-$as_echo_n "checking for /usr/share/java/liblayout.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_liblayout_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/liblayout.jar"; then
   ac_cv_file__usr_share_java_liblayout_jar=yes
 else
   ac_cv_file__usr_share_java_liblayout_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "liblayout.jar replacement not found." "$LINENO" 5
+  { { 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
 
@@ -20303,71 +26457,79 @@ fi
 fi
 
       else
-        as_ac_File=`$as_echo "ac_cv_file_$LIBLAYOUT_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$LIBLAYOUT_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   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_fn_error "liblayout.jar not found." "$LINENO" 5
+  { { 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:${as_lineno-$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; }
-if test "${ac_cv_file__usr_share_java_libloader_1_0_0_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libloader-1.0.0.jar"; then
   ac_cv_file__usr_share_java_libloader_1_0_0_jar=yes
 else
   ac_cv_file__usr_share_java_libloader_1_0_0_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for /usr/share/java/libloader.jar" >&5
-$as_echo_n "checking for /usr/share/java/libloader.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_libloader_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libloader.jar"; then
   ac_cv_file__usr_share_java_libloader_jar=yes
 else
   ac_cv_file__usr_share_java_libloader_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "libloader.jar replacement not found." "$LINENO" 5
+  { { 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
 
@@ -20376,71 +26538,79 @@ fi
 fi
 
       else
-        as_ac_File=`$as_echo "ac_cv_file_$LIBLOADER_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$LIBLOADER_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   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_fn_error "libloader.jar not found." "$LINENO" 5
+  { { 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:${as_lineno-$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; }
-if test "${ac_cv_file__usr_share_java_libformula_0_2_0_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libformula-0.2.0.jar"; then
   ac_cv_file__usr_share_java_libformula_0_2_0_jar=yes
 else
   ac_cv_file__usr_share_java_libformula_0_2_0_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for /usr/share/java/libformula.jar" >&5
-$as_echo_n "checking for /usr/share/java/libformula.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_libformula_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libformula.jar"; then
   ac_cv_file__usr_share_java_libformula_jar=yes
 else
   ac_cv_file__usr_share_java_libformula_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "libformula.jar replacement not found." "$LINENO" 5
+  { { 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
 
@@ -20449,71 +26619,79 @@ fi
 fi
 
       else
-        as_ac_File=`$as_echo "ac_cv_file_$LIBFORMULA_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$LIBFORMULA_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   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_fn_error "libformula.jar not found." "$LINENO" 5
+  { { 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:${as_lineno-$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; }
-if test "${ac_cv_file__usr_share_java_librepository_1_0_0_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/librepository-1.0.0.jar"; then
   ac_cv_file__usr_share_java_librepository_1_0_0_jar=yes
 else
   ac_cv_file__usr_share_java_librepository_1_0_0_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for /usr/share/java/librepository.jar" >&5
-$as_echo_n "checking for /usr/share/java/librepository.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_librepository_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/librepository.jar"; then
   ac_cv_file__usr_share_java_librepository_jar=yes
 else
   ac_cv_file__usr_share_java_librepository_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "librepository.jar replacement not found." "$LINENO" 5
+  { { 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
 
@@ -20522,71 +26700,79 @@ fi
 fi
 
       else
-        as_ac_File=`$as_echo "ac_cv_file_$LIBREPOSITORY_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$LIBREPOSITORY_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   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_fn_error "librepository.jar not found." "$LINENO" 5
+  { { 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:${as_lineno-$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; }
-if test "${ac_cv_file__usr_share_java_libfonts_1_0_0_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libfonts-1.0.0.jar"; then
   ac_cv_file__usr_share_java_libfonts_1_0_0_jar=yes
 else
   ac_cv_file__usr_share_java_libfonts_1_0_0_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for /usr/share/java/libfonts.jar" >&5
-$as_echo_n "checking for /usr/share/java/libfonts.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_libfonts_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libfonts.jar"; then
   ac_cv_file__usr_share_java_libfonts_jar=yes
 else
   ac_cv_file__usr_share_java_libfonts_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "libfonts.jar replacement not found." "$LINENO" 5
+  { { 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
 
@@ -20595,71 +26781,79 @@ fi
 fi
 
       else
-        as_ac_File=`$as_echo "ac_cv_file_$LIBFONTS_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$LIBFONTS_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   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_fn_error "libfonts.jar not found." "$LINENO" 5
+  { { 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:${as_lineno-$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; }
-if test "${ac_cv_file__usr_share_java_libserializer_1_0_0_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libserializer-1.0.0.jar"; then
   ac_cv_file__usr_share_java_libserializer_1_0_0_jar=yes
 else
   ac_cv_file__usr_share_java_libserializer_1_0_0_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for /usr/share/java/libserializer.jar" >&5
-$as_echo_n "checking for /usr/share/java/libserializer.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_libserializer_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libserializer.jar"; then
   ac_cv_file__usr_share_java_libserializer_jar=yes
 else
   ac_cv_file__usr_share_java_libserializer_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "libserializer.jar replacement not found." "$LINENO" 5
+  { { 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
 
@@ -20668,72 +26862,80 @@ fi
 fi
 
       else
-        as_ac_File=`$as_echo "ac_cv_file_$LIBSERIALIZER_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$LIBSERIALIZER_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   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_fn_error "libserializer.jar not found." "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: libserializer.jar not found." >&5
+echo "$as_me: error: libserializer.jar not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
       fi
 
 
       if test -z $LIBBASE_JAR; then
-        { $as_echo "$as_me:${as_lineno-$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; }
-if test "${ac_cv_file__usr_share_java_libbase_1_0_0_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libbase-1.0.0.jar"; then
   ac_cv_file__usr_share_java_libbase_1_0_0_jar=yes
 else
   ac_cv_file__usr_share_java_libbase_1_0_0_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for /usr/share/java/libbase.jar" >&5
-$as_echo_n "checking for /usr/share/java/libbase.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_libbase_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libbase.jar"; then
   ac_cv_file__usr_share_java_libbase_jar=yes
 else
   ac_cv_file__usr_share_java_libbase_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "libbase.jar replacement not found." "$LINENO" 5
+  { { 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
 
@@ -20742,50 +26944,54 @@ fi
 fi
 
       else
-        as_ac_File=`$as_echo "ac_cv_file_$LIBBASE_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$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_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$LIBBASE_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   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_fn_error "libbase.jar not found." "$LINENO" 5
+  { { 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:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
-     { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: OK" >&5
-$as_echo "OK" >&6; }
+      echo "$as_me:$LINENO: result: OK" >&5
+echo "${ECHO_T}OK" >&6
      else
-      as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
+      { { 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
      BUILD_TYPE="$BUILD_TYPE JFREEREPORT"
   fi
   BUILD_TYPE="$BUILD_TYPE REPORTBUILDER"
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
   ENABLE_REPORTBUILDER=NO
   SYSTEM_JFREEREPORT=NO
 fi
@@ -20806,52 +27012,58 @@ 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:${as_lineno-$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:${as_lineno-$LINENO}: result: external" >&5
-$as_echo "external" >&6; }
+    echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
     if test "$ENABLE_MEDIAWIKI" = "YES"; then
       if test -z $COMMONS_CODEC_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-codec-1.3.jar" >&5
-$as_echo_n "checking for /usr/share/java/commons-codec-1.3.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_commons_codec_1_3_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+        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 &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_codec_1_3_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_commons_codec_1_3_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_commons_codec_1_3_jar" = x""yes; then :
+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
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-codec.jar" >&5
-$as_echo_n "checking for /usr/share/java/commons-codec.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_commons_codec_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+            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 &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_codec_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_commons_codec_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_commons_codec_jar" = x""yes; then :
+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
-  as_fn_error "commons-codec.jar replacement not found." "$LINENO" 5
+  { { 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
 
@@ -20860,71 +27072,79 @@ fi
 fi
 
       else
-        as_ac_File=`$as_echo "ac_cv_file_$COMMONS_CODEC_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $COMMONS_CODEC_JAR" >&5
-$as_echo_n "checking for $COMMONS_CODEC_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
+        as_ac_File=`echo "ac_cv_file_$COMMONS_CODEC_JAR" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $COMMONS_CODEC_JAR" >&5
+echo $ECHO_N "checking for $COMMONS_CODEC_JAR... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$COMMONS_CODEC_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   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_fn_error "commons-codec.jar not found." "$LINENO" 5
+  { { 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
 
       fi
 
       if test -z $COMMONS_LANG_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-lang-2.3.jar" >&5
-$as_echo_n "checking for /usr/share/java/commons-lang-2.3.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_commons_lang_2_3_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+        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 &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_lang_2_3_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_commons_lang_2_3_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_commons_lang_2_3_jar" = x""yes; then :
+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
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-lang.jar" >&5
-$as_echo_n "checking for /usr/share/java/commons-lang.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_commons_lang_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+            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 &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_lang_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_commons_lang_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_commons_lang_jar" = x""yes; then :
+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
-  as_fn_error "commons-lang.jar replacement not found." "$LINENO" 5
+  { { 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
 
@@ -20933,71 +27153,79 @@ fi
 fi
 
       else
-        as_ac_File=`$as_echo "ac_cv_file_$COMMONS_LANG_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $COMMONS_LANG_JAR" >&5
-$as_echo_n "checking for $COMMONS_LANG_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
+        as_ac_File=`echo "ac_cv_file_$COMMONS_LANG_JAR" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $COMMONS_LANG_JAR" >&5
+echo $ECHO_N "checking for $COMMONS_LANG_JAR... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$COMMONS_LANG_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   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_fn_error "commons-lang.jar not found." "$LINENO" 5
+  { { 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
 
       fi
 
       if test -z $COMMONS_HTTPCLIENT_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-httpclient-3.1.jar" >&5
-$as_echo_n "checking for /usr/share/java/commons-httpclient-3.1.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_commons_httpclient_3_1_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+        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 &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_httpclient_3_1_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_commons_httpclient_3_1_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_commons_httpclient_3_1_jar" = x""yes; then :
+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
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-httpclient.jar" >&5
-$as_echo_n "checking for /usr/share/java/commons-httpclient.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_commons_httpclient_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+            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 &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_httpclient_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_commons_httpclient_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_commons_httpclient_jar" = x""yes; then :
+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
-  as_fn_error "commons-httpclient.jar replacement not found." "$LINENO" 5
+  { { 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
 
@@ -21006,72 +27234,80 @@ fi
 fi
 
       else
-        as_ac_File=`$as_echo "ac_cv_file_$COMMONS_HTTPCLIENT_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $COMMONS_HTTPCLIENT_JAR" >&5
-$as_echo_n "checking for $COMMONS_HTTPCLIENT_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
+        as_ac_File=`echo "ac_cv_file_$COMMONS_HTTPCLIENT_JAR" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $COMMONS_HTTPCLIENT_JAR" >&5
+echo $ECHO_N "checking for $COMMONS_HTTPCLIENT_JAR... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$COMMONS_HTTPCLIENT_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   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_fn_error "commons-httpclient.jar not found." "$LINENO" 5
+  { { 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
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-logging-1.1.1.jar" >&5
-$as_echo_n "checking for /usr/share/java/commons-logging-1.1.1.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_commons_logging_1_1_1_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+        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 &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" = x""yes; then :
+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
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-logging.jar" >&5
-$as_echo_n "checking for /usr/share/java/commons-logging.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_commons_logging_jar+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+            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 &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_logging_jar" >&5
-$as_echo "$ac_cv_file__usr_share_java_commons_logging_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_commons_logging_jar" = x""yes; then :
+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
-  as_fn_error "commons-logging.jar replacement not found." "$LINENO" 5
+  { { 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
 
@@ -21080,35 +27316,37 @@ fi
 fi
 
       else
-        as_ac_File=`$as_echo "ac_cv_file_$COMMONS_LOGGING_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$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
+        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_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$COMMONS_LOGGING_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   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_fn_error "commons-logging.jar not found." "$LINENO" 5
+  { { 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:${as_lineno-$LINENO}: result: internal" >&5
-$as_echo "internal" >&6; }
+    echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
     SYSTEM_APACHE_COMMONS=NO
     BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
   fi
@@ -21160,8 +27398,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:${as_lineno-$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
@@ -21169,15 +27407,18 @@ $as_echo_n "checking for Qt headers... " >&6; }
             break
         fi
     done
-    { $as_echo "$as_me:${as_lineno-$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_fn_error "Qt headers not found.  Please specify the root of
-your Qt installation by exporting QTDIR before running \"configure\"." "$LINENO" 5
+        { { echo "$as_me:$LINENO: error: Qt headers not found.  Please specify the root of
+your Qt installation by exporting QTDIR before running \"configure\"." >&5
+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:${as_lineno-$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
@@ -21185,19 +27426,22 @@ $as_echo_n "checking for Qt libraries... " >&6; }
             break
         fi
     done
-    { $as_echo "$as_me:${as_lineno-$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_fn_error "Qt libraries not found.  Please specify the root of
-your Qt installation by exporting QTDIR before running \"configure\"." "$LINENO" 5
+        { { echo "$as_me:$LINENO: error: Qt libraries not found.  Please specify the root of
+your Qt installation by exporting QTDIR before running \"configure\"." >&5
+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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MOC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_MOC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $MOC in
   [\\/]* | ?:[\\/]*)
@@ -21210,37 +27454,39 @@ for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
     if test "$MOC" = "no" ; then
-        as_fn_error "Qt Meta Object Compiler not found.  Please specify
-the root of your Qt installation by exporting QTDIR before running \"configure\"." "$LINENO" 5
+        { { 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
+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:${as_lineno-$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
@@ -21248,15 +27494,18 @@ $as_echo_n "checking for KDE headers... " >&6; }
             break
         fi
     done
-    { $as_echo "$as_me:${as_lineno-$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_fn_error "KDE headers not found.  Please specify the root of
-your KDE installation by exporting KDEDIR before running \"configure\"." "$LINENO" 5
+        { { echo "$as_me:$LINENO: error: KDE headers not found.  Please specify the root of
+your KDE installation by exporting KDEDIR before running \"configure\"." >&5
+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:${as_lineno-$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
@@ -21264,11 +27513,14 @@ $as_echo_n "checking for KDE libraries... " >&6; }
             break
         fi
     done
-    { $as_echo "$as_me:${as_lineno-$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_fn_error "KDE libraries not found.  Please specify the root of
-your KDE installation by exporting KDEDIR before running \"configure\"." "$LINENO" 5
+        { { echo "$as_me:$LINENO: error: KDE libraries not found.  Please specify the root of
+your KDE installation by exporting KDEDIR before running \"configure\"." >&5
+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
 
         KDE_CFLAGS="-I$qt_incdir -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
@@ -21308,8 +27560,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:${as_lineno-$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
@@ -21318,14 +27570,16 @@ $as_echo_n "checking for Qt4 headers... " >&6; }
       fi
    done
 
-   { $as_echo "$as_me:${as_lineno-$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_fn_error "Qt4 headers not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." "$LINENO" 5
+      { { 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:${as_lineno-$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
@@ -21334,19 +27588,21 @@ $as_echo_n "checking for Qt4 libraries... " >&6; }
       fi
    done
 
-   { $as_echo "$as_me:${as_lineno-$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_fn_error "Qt4 libraries not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." "$LINENO" 5
+      { { 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MOC4+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_MOC4+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $MOC4 in
   [\\/]* | ?:[\\/]*)
@@ -21359,37 +27615,39 @@ for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
    if test "$MOC4" = "no" ; then
-      as_fn_error "Qt Meta Object Compiler not found.  Please specify
-the root of your Qt installation by exporting QT4DIR before running \"configure\"." "$LINENO" 5
+      { { 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
+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:${as_lineno-$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
@@ -21397,14 +27655,16 @@ $as_echo_n "checking for KDE4 headers... " >&6; }
          break
       fi
    done
-   { $as_echo "$as_me:${as_lineno-$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_fn_error "KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." "$LINENO" 5
+      { { 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:${as_lineno-$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
@@ -21413,10 +27673,12 @@ $as_echo_n "checking for KDE4 libraries... " >&6; }
       fi
    done
 
-   { $as_echo "$as_me:${as_lineno-$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_fn_error "KDE4 libraries not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." "$LINENO" 5
+      { { 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
 
    KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
@@ -21426,34 +27688,34 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -21465,30 +27727,29 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   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:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -21499,25 +27760,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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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=""
@@ -21538,25 +27799,27 @@ $as_echo "$GOBJECT_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_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." "$LINENO" 5
+     { { 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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'
@@ -21564,15 +27827,20 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
    save_CXXFLAGS=$CXXFLAGS
    CXXFLAGS="$CXXFLAGS $KDE_CFLAGS"
-   { $as_echo "$as_me:${as_lineno-$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; }
-       if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+   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
+  { { 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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <kdeversion.h>
@@ -21583,16 +27851,31 @@ int main(int argc, char **argv) {
 }
 
 _ACEOF
-if ac_fn_cxx_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./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
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
-  as_fn_error "KDE version too old or too recent, please use another version of KDE or disable KDE address book support" "$LINENO" 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: 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 -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam 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'
@@ -21602,66 +27885,66 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
    ENABLE_KAB=TRUE
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+   echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
    ENABLE_KAB=
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
   WITHOUT_PPDS=YES
   SCPDEFS="$SCPDEFS -DWITHOUT_PPDS"
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
   WITHOUT_AFMS=YES
   SCPDEFS="$SCPDEFS -DWITHOUT_AFMS"
 fi
@@ -21669,13 +27952,13 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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
@@ -21705,13 +27988,151 @@ elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
       XINERAMA_LINK=none
    fi
    if test "$USE_XINERAMA" = "YES"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, with $XINERAMA_LINK linking" >&5
-$as_echo "yes, with $XINERAMA_LINK linking" >&6; }
-      ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/Xinerama.h" "ac_cv_header_X11_extensions_Xinerama_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_extensions_Xinerama_h" = x""yes; then :
+      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
+  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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <X11/extensions/Xinerama.h>
+_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_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_header_compiler=no
+fi
+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?
+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
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <X11/extensions/Xinerama.h>
+_ACEOF
+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
+  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
-  as_fn_error "Xinerama header not found." "$LINENO" 5
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: X11/extensions/Xinerama.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: proceeding with the 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:* )
+    { 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
+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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_X11_extensions_Xinerama_h=$ac_header_preproc
+fi
+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 $ac_cv_header_X11_extensions_Xinerama_h = yes; then
+  :
+else
+  { { echo "$as_me:$LINENO: error: Xinerama header not found." >&5
+echo "$as_me: error: Xinerama header not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
@@ -21722,43 +28143,72 @@ fi
       if test "$_os" = "Linux"; then
           XINERAMA_EXTRA_LIBS="$XINERAMA_EXTRA_LIBS -ldl"
       fi
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XineramaIsActive in -lXinerama" >&5
-$as_echo_n "checking for XineramaIsActive in -lXinerama... " >&6; }
-if test "${ac_cv_lib_Xinerama_XineramaIsActive+set}" = set; then :
-  $as_echo_n "(cached) " >&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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXinerama $XINERAMA_EXTRA_LIBS $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   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
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+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
+  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
-  ac_cv_lib_Xinerama_XineramaIsActive=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_Xinerama_XineramaIsActive=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$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
@@ -21766,16 +28216,18 @@ _ACEOF
   LIBS="-lXinerama $LIBS"
 
 else
-  as_fn_error "Xinerama not functional?" "$LINENO" 5
+  { { 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:${as_lineno-$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:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+   echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
 
@@ -21789,10 +28241,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ANT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_ANT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $ANT in
   [\\/]* | ?:[\\/]*)
@@ -21804,29 +28256,28 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 ANT=$ac_cv_path_ANT
+
 if test -n "$ANT"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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
 
@@ -21838,10 +28289,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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ANT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_ANT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $ANT in
   [\\/]* | ?:[\\/]*)
@@ -21854,29 +28305,28 @@ for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
   ;;
 esac
 fi
 ANT=$ac_cv_path_ANT
+
 if test -n "$ANT"; then
-  { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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
 
@@ -21885,7 +28335,9 @@ done
 fi
 
 if test -z "$ANT"; then
-  as_fn_error "Ant not found - Make sure it's in the path or use --with-ant-home" "$LINENO" 5
+  { { 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
   while test -h "$ANT"; do
@@ -21910,8 +28362,8 @@ else
   fi
   ant_minminor1=`echo $ant_minver | cut -d"." -f2`
 
-  { $as_echo "$as_me:${as_lineno-$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`
@@ -21919,16 +28371,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:${as_lineno-$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:${as_lineno-$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_fn_error "no, you need at least ant >= $ant_minver" "$LINENO" 5
+  	{ { 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:${as_lineno-$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) {
@@ -21952,14 +28406,14 @@ EOF
   else
     ant_cmd="$ANT -buildfile conftest.xml 1>&2"
   fi
-  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ant_cmd\""; } >&5
+  { (eval echo "$as_me:$LINENO: \"$ant_cmd\"") >&5
   (eval $ant_cmd) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
   if test $? = 0 && test -f ./conftest.class ; then
-    { $as_echo "$as_me:${as_lineno-$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
@@ -21972,8 +28426,8 @@ $as_echo "Ant works" >&6; }
     echo "configure: Ant test failed" >&5
     cat conftest.java >&5
     cat conftest.xml >&5
-    { $as_echo "$as_me:${as_lineno-$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
@@ -21986,8 +28440,8 @@ fi
 
 
 if test "$ANT_HOME" != "NO_ANT_HOME"; then
-   { $as_echo "$as_me:${as_lineno-$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
@@ -22003,21 +28457,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_fn_error "Ant libraries not found!" "$LINENO" 5
+                    { { 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:${as_lineno-$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:${as_lineno-$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
@@ -22049,179 +28505,181 @@ EOF
   else
     ant_cmd="$ANT -buildfile conftest.xml 1>&2"
   fi
-  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ant_cmd\""; } >&5
+  { (eval echo "$as_me:$LINENO: \"$ant_cmd\"") >&5
   (eval $ant_cmd) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
   if test $? = 0 && test -f ./conftest.class ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
     rm -rf confdir
   else
     echo "configure: Ant test failed" >&5
     cat conftest.java >&5
     cat conftest.xml >&5
     rm -rf confdir
-    as_fn_error "no. Did you install ant-apache-regexp?" "$LINENO" 5
+    { { 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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
 
 
@@ -22232,20 +28690,22 @@ echo "*                                                                  *"
 echo "********************************************************************"
 
 if test -z "$COMPATH"; then
-   as_fn_error "No compiler found." "$LINENO" 5
+   { { 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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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
 
 
@@ -22254,8 +28714,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
@@ -22274,59 +28733,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:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
+{
   (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
+    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:${as_lineno-$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:${as_lineno-$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
@@ -22335,54 +28774,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.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append 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
 
@@ -22390,15 +28838,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:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -22408,252 +28853,81 @@ cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
-
 SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
+# 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
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
+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
 
-# 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=';'
-  }
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
+# Work around bugs in pre-3.0 UWIN ksh.
+$as_unset ENV MAIL MAILPATH
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+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
-  $as_echo "$as_me: error: $1" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
+done
 
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+# Required to use basename.
+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
 fi
 
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
 
-as_me=`$as_basename -- "$0" ||
+# Name of the executable.
+as_me=`$as_basename "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    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'`
 
+
+# PATH needs CR, and LINENO needs CR and PATH.
 # Avoid depending upon Character Ranges.
 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
 as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
@@ -22661,123 +28935,148 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
+# 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$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 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
+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+  sed '=' <$as_myself |
+    sed '
+      N
+      s,$,-,
+      : loop
+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      t loop
+      s,-$,,
+      s,^['$as_cr_digits']*\n,,
+    ' >$as_me.lineno &&
+  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 sensible to this).
+  . ./$as_me.lineno
+  # Exit status is that of the last command.
+  exit
+}
+
+
+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
 
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
 else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
+  as_expr=false
 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
+
+rm -f conf$$ conf$$.exe conf$$.file
+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
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-
+rm -f conf$$ conf$$.exe conf$$.file
 
-} # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
+  as_mkdir_p=:
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 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'"
@@ -22786,20 +29085,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
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
+
+# 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.64.  Invocation command line was
+generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -22807,107 +29117,124 @@ generated by GNU Autoconf 2.64.  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 and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
+\`$as_me' instantiates files from templates according to the
+current configuration.
 
-Usage: $0 [OPTION]... [TAG]...
+Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-  -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 the package provider."
-
+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.64,
-  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) 2009 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
-    as_fn_append 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_fn_error "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
+  -*) { { 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; }; } ;;
 
-  *) as_fn_append ac_config_targets " $1"
-     ac_need_defaults=false ;;
+  *) ac_config_targets="$ac_config_targets $1" ;;
 
   esac
   shift
@@ -22921,45 +29248,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_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  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
@@ -22969,403 +29282,677 @@ 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 'as_fn_exit 1' 1 2 13 15
+  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")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
-
-# 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=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
-_ACEOF
-
-
+  tmp=./confstat$$-$RANDOM
+  (umask 077 && mkdir $tmp)
+} ||
 {
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-
-  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_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-  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//
+   echo "$me: cannot create a temporary directory in ." >&2
+   { (exit 1); exit 1; }
 }
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
 
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
+cat >>$CONFIG_STATUS <<_ACEOF
 
+#
+# CONFIG_FILES section.
+#
 
-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_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
-  :[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
+# 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,@ENABLE_MYSQLC@,$ENABLE_MYSQLC,;t t
+s,@MYSQLCONFIG@,$MYSQLCONFIG,;t t
+s,@SYSTEM_MYSQL@,$SYSTEM_MYSQL,;t t
+s,@MYSQL_INC@,$MYSQL_INC,;t t
+s,@MYSQL_LIB@,$MYSQL_LIB,;t t
+s,@MYSQL_DEFINES@,$MYSQL_DEFINES,;t t
+s,@LIBMYSQL_PATH@,$LIBMYSQL_PATH,;t t
+s,@SYSTEM_MYSQL_CPPCONN@,$SYSTEM_MYSQL_CPPCONN,;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_PRESENTER_EXTRA_UI@,$ENABLE_PRESENTER_EXTRA_UI,;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
 
-  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_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
-    done
+_ACEOF
 
-    # 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:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
+  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_fn_error "could not create $ac_file" "$LINENO" 5 ;;
-    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"; as_fn_mkdir_p
+	 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 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 ||
+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 ! -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
 
+# 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
 
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
 
-_ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_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_fn_error "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-  esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
- ;;
-
-
-
-  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
 
-as_fn_exit 0
+{ (exit 0); exit 0; }
 _ACEOF
+chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
-test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -23385,11 +29972,7 @@ if test "$no_create" != yes; then
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  $ac_cs_success || { (exit 1); exit 1; }
 fi
 
 
diff --git a/configure.in b/configure.in
index abf5176b095d..be384fb3adc3 100644
--- a/configure.in
+++ b/configure.in
@@ -368,6 +368,23 @@ AC_ARG_WITH(lucene-analyzers-jar,
 [  --with-lucene-analyzers-jar=JARFILE   Specify path to jarfile manually ],
 [ LUCENE_ANALYZERS_JAR="$withval"
 ])
+AC_ARG_ENABLE(mysql-connector,
+[  --enable-mysql-connector     enables the build of the MySQL Connector/OOo extension.
+                                This requires access to the MySQL Connector/C (aka libmysql) to be given, too, with
+                                either the --with-system-mysql or --with-libmysql-path option.
+],,)
+AC_ARG_WITH(system-mysql,
+[  --with-system-mysql          Use MySQL libraries already on system, for building the MySQL Connector/OOo extension.
+                                Requires MYSQLCONFIG to point to the mysql_config executable.
+],,with_system_mysql="no")
+AC_ARG_WITH(libmysql-path,
+[  --with-libmysql-path         Use Connector/C (libmysql) installation for building the MySQL Connector/OOo extension.
+
+                                Usage: --with-libmysql-path=<absolute path to your Connector/C installation>
+],,)
+AC_ARG_WITH(system-mysql-cppconn,
+[  --with-system-mysql-cppconn  Use MySQL C++ Connector libraries already on system
+],,)
 AC_ARG_WITH(system-hsqldb,
 [  --with-system-hsqldb    Use hsqldb already on system
 ],,)
@@ -3835,6 +3852,128 @@ AC_SUBST(SYSTEM_LUCENE)
 AC_SUBST(LUCENE_CORE_JAR)
 AC_SUBST(LUCENE_ANALYZERS_JAR)
 
+AC_MSG_CHECKING([whether to build the MySQL Connector extension])
+if test -n "$enable_mysql_connector" -a "$enable_mysql_connector" != "no"; then
+  AC_MSG_RESULT([yes])
+  ENABLE_MYSQLC=YES
+  AC_MSG_CHECKING([for mysqlc module])
+  if test -d mysqlc; then
+   AC_MSG_RESULT([OK])
+  else
+   AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
+  fi
+  BUILD_TYPE="$BUILD_TYPE MYSQLC"
+else
+  AC_MSG_RESULT([no])
+  ENABLE_MYSQLC=NO
+fi
+AC_SUBST(ENABLE_MYSQLC)
+
+if test "$ENABLE_MYSQLC" = "YES"; then
+dnl ===================================================================
+dnl Check for system MySQL
+dnl ===================================================================
+AC_MSG_CHECKING([for mysql pre-requisites])
+if test -n "$with_system_mysql" -o -n "$with_system_libs" && \
+       test "$with_system_mysql" != "no" && test "$with_system_libs" != "no"; then
+	AC_MSG_RESULT([external MySQL])
+	SYSTEM_MYSQL=YES
+	AC_PATH_PROG( MYSQLCONFIG, mysql_config)
+	AC_MSG_CHECKING([MySQL version])
+	MYSQL_VERSION=`$MYSQLCONFIG --version` 
+	MYSQL_MAJOR=`$MYSQLCONFIG --version | cut -d"." -f1`
+	if test "$MYSQL_MAJOR" -ge "5"; then
+		AC_MSG_RESULT([OK])
+	else
+		AC_MSG_ERROR([too old, use 5.0.x or 5.1.x])
+	fi
+	AC_MSG_CHECKING([for MySQL Client library])
+	MYSQL_INC=`$MYSQLCONFIG --include` 
+	MYSQL_LIB=`$MYSQLCONFIG --libs`
+	MYSQL_DEFINES=`$MYSQLCONFIG --cflags | sed -e s,$MYSQL_INC,,`
+	AC_MSG_RESULT([includes $MYSQL_INC, libraries $MYSQL_LIB])
+else
+    SYSTEM_MYSQL=NO
+    if test -n "$with_libmysql_path"; then
+        AC_MSG_RESULT([external Connector/C (libmysql)])
+        LIBMYSQL=libmysql.so
+        if test "$_os" = "Darwin"; then
+            LIBMYSQL=libmysql.dylib
+        elif test "$_os" = "WINNT"; then
+            LIBMYSQL=libmysql.dll
+        fi
+        AC_MSG_CHECKING([for $LIBMYSQL])
+        if test -e "$with_libmysql_path/lib/$LIBMYSQL"; then
+            AC_MSG_RESULT([found.])
+            LIBMYSQL_PATH=$with_libmysql_path
+        else
+            AC_MSG_ERROR([not found. Please specify proper path in --with-libmysql-path.])
+        fi
+    else
+        AC_MSG_ERROR([not given. Please specify either --with-system-mysql or --with-libmysql-path])
+    fi
+fi
+AC_SUBST(SYSTEM_MYSQL)
+AC_SUBST(MYSQL_INC)
+AC_SUBST(MYSQL_LIB)
+AC_SUBST(MYSQL_DEFINES)
+AC_SUBST(LIBMYSQL_PATH)
+
+AC_LANG_PUSH([C++])
+dnl ===================================================================
+dnl Check for system MySQL C++ Connector
+dnl ===================================================================
+# FIXME!
+# who thought this too-generic cppconn dir was a good idea?
+AC_MSG_CHECKING([MySQL Connector/C++])
+if test -n "$with_system_mysql_cppconn" -o -n "$with_system_libs" && \
+		test "$with_system_mysql_cppconn" != "no" && test "$with_system_libs" != "no"; then
+	AC_MSG_RESULT([external])
+	SYSTEM_MYSQL_CPPCONN=YES
+        AC_LANG_PUSH([C++])
+	AC_CHECK_HEADER(mysql_driver.h, [],
+					[AC_MSG_ERROR(mysql_driver.h not found. install MySQL C++ Connectivity)], [])
+	AC_CHECK_LIB(mysqlcppconn, main, [],
+					[AC_MSG_ERROR(MySQL C++ Connectivity lib not found or functional)], [])
+   AC_MSG_CHECKING([version])
+      AC_TRY_RUN([
+#include <mysql_driver.h>
+
+int main(int argc, char **argv) {
+	sql::Driver *driver;
+	driver = get_driver_instance();
+	if (driver->getMajorVersion() > 1 || \
+	   (driver->getMajorVersion() == 1 && driver->getMinorVersion() > 0) || \
+	   (driver->getMajorVersion() == 1 && driver->getMinorVersion() == 0 && driver->getPatchVersion() >= 6)) 
+        return 0;
+      else
+        return 1;
+}
+      ], [AC_MSG_RESULT(OK)], [AC_MSG_ERROR([not suitable, we need >= 1.0.6])])
+        AC_LANG_POP([C++])
+
+	AC_MSG_CHECKING([STL compatibility])
+	if test "$WITH_STLPORT" != "no"; then
+		AC_MSG_ERROR([to use system mysqlcppconn you need to use --without-stlport])
+	else
+		AC_MSG_RESULT([OK])	
+	fi
+
+else
+	AC_MSG_RESULT([internal])
+        AC_MSG_CHECKING([for mysqlcppconn module])
+        if test -d mysqlcppconn; then
+          AC_MSG_RESULT([OK])
+        else
+          AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
+        fi
+	BUILD_TYPE="$BUILD_TYPE MYSQLCPPCONN"
+	SYSTEM_MYSQL_CPPCONN=NO
+fi
+AC_LANG_POP([C++])
+AC_SUBST(SYSTEM_MYSQL_CPPCONN)
+fi
+
 dnl ===================================================================
 dnl Check for system hsqldb
 dnl ===================================================================
@@ -3966,11 +4105,11 @@ if test -n "$with_system_curl" -o -n "$with_system_libs" && \
    fi
 
    # check curl version
-   AC_MSG_CHECKING([whether curl is >= 7.9.8])
+   AC_MSG_CHECKING([whether curl is >= 7.13.1])
    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 
-      AC_MSG_ERROR([no, you need at least curl 7.9,8])
+	"`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $2 }'`" -gt "13" -a \
+	"`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $3 }'`" -gt "1"; then 
+      AC_MSG_ERROR([no, you need at least curl 7.13,1])
    else
       AC_MSG_RESULT([yes])
    fi
diff --git a/dmake/Makefile.am b/dmake/Makefile.am
index 672f688c9ff0..801ee2967c47 100755
--- a/dmake/Makefile.am
+++ b/dmake/Makefile.am
@@ -1,35 +1,27 @@
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $RCSfile: Makefile.am,v $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   $Revision: 1.12 $
+# This file is part of OpenOffice.org.
 #
-#   last change: $Author: kz $ $Date: 2008-03-05 18:26:19 $
+# 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.
 #
-#   The Contents of this file are made available subject to
-#   the terms of GNU Lesser General Public License Version 2.1.
+# 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).
 #
-#
-#     GNU Lesser General Public License Version 2.1
-#     =============================================
-#     Copyright 2005 by Sun Microsystems, Inc.
-#     901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-#     This library is free software; you can redistribute it and/or
-#     modify it under the terms of the GNU Lesser General Public
-#     License version 2.1, as published by the Free Software Foundation.
-#
-#     This library 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 for more details.
-#
-#     You should have received a copy of the GNU Lesser General Public
-#     License along with this library; if not, write to the Free Software
-#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#     MA  02111-1307  USA
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
 #
 #*************************************************************************
 
diff --git a/dmake/Makefile.in b/dmake/Makefile.in
index ed78925f6bfc..c25cc18ef247 100755
--- a/dmake/Makefile.in
+++ b/dmake/Makefile.in
@@ -16,36 +16,28 @@
 
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $RCSfile: Makefile.in,v $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   $Revision: 1.15 $
+# This file is part of OpenOffice.org.
 #
-#   last change: $Author: kz $ $Date: 2008-03-05 18:26:33 $
+# 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.
 #
-#   The Contents of this file are made available subject to
-#   the terms of GNU Lesser General Public License Version 2.1.
+# 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).
 #
-#
-#     GNU Lesser General Public License Version 2.1
-#     =============================================
-#     Copyright 2005 by Sun Microsystems, Inc.
-#     901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-#     This library is free software; you can redistribute it and/or
-#     modify it under the terms of the GNU Lesser General Public
-#     License version 2.1, as published by the Free Software Foundation.
-#
-#     This library 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 for more details.
-#
-#     You should have received a copy of the GNU Lesser General Public
-#     License along with this library; if not, write to the Free Software
-#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#     MA  02111-1307  USA
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
 #
 #*************************************************************************
 
diff --git a/guw/guw.cc b/guw/guw.cc
index e7748a908ff1..ea7c84d5cf4e 100644
--- a/guw/guw.cc
+++ b/guw/guw.cc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: guw.cc,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/instsetoo_native/inc_openoffice/unix/makefile.mk b/instsetoo_native/inc_openoffice/unix/makefile.mk
index af3ecd87f62e..3dec2ab1a09e 100644
--- a/instsetoo_native/inc_openoffice/unix/makefile.mk
+++ b/instsetoo_native/inc_openoffice/unix/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk b/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk
index 48c18bf9bc38..df3cd544890e 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/instsetoo_native/macosx/application/PostInstall.applescript b/instsetoo_native/macosx/application/PostInstall.applescript
index eecd968e0003..3c302ab2daad 100644
--- a/instsetoo_native/macosx/application/PostInstall.applescript
+++ b/instsetoo_native/macosx/application/PostInstall.applescript
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PostInstall.applescript,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/instsetoo_native/macosx/application/main.applescript b/instsetoo_native/macosx/application/main.applescript
index b85021ed98f1..c5c100004ac8 100644
--- a/instsetoo_native/macosx/application/main.applescript
+++ b/instsetoo_native/macosx/application/main.applescript
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main.applescript,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/instsetoo_native/macosx/make_versioned.sh b/instsetoo_native/macosx/make_versioned.sh
index 4d9c0e9c29ec..04dbfb062d58 100755
--- a/instsetoo_native/macosx/make_versioned.sh
+++ b/instsetoo_native/macosx/make_versioned.sh
@@ -4,14 +4,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: make_versioned.sh,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/instsetoo_native/macosx/makefile.mk b/instsetoo_native/macosx/makefile.mk
index 0fc0a1329c62..66b558d1038e 100644
--- a/instsetoo_native/macosx/makefile.mk
+++ b/instsetoo_native/macosx/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index e9347074b73f..2ef67e564fd5 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.91 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/makefile.rc b/makefile.rc
index 46206795dd5b..ebe41042d92f 100644
--- a/makefile.rc
+++ b/makefile.rc
@@ -2,13 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.rc,v $
-# $Revision: 1.54 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 27ef93479d36..4d8f0b3903be 100644..100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -520,6 +520,19 @@ End
 
 // ---------------------------------------
 
+#define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) \
+    RegistryItem CONCAT2(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension) \
+        ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
+        ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; \
+        ComponentCondition = "VersionNT >= 600"; \
+        Styles = (X64); \
+        Subkey = STRING(CONCAT2(SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers\.,extension)); \
+        Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \
+        Val64 = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \
+    End
+
+// ---------------------------------------
+
 #if defined WNT
 #define SCP2_URE_DL_DIR gid_Dir_Ure_Bin
 #define SCP2_URE_DL_NORMAL(n) n ".dll"
diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl
index 91089c901cef..d9d1420bdc73 100644
--- a/scp2/macros/macro.pl
+++ b/scp2/macros/macro.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: macro.pl,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/macros/makefile.mk b/scp2/macros/makefile.mk
index c9930631755e..d36f25efabd3 100644
--- a/scp2/macros/makefile.mk
+++ b/scp2/macros/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.13 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/activex/file_activex.scp b/scp2/source/activex/file_activex.scp
index 5f257af2e1b8..574657b5b441 100644
--- a/scp2/source/activex/file_activex.scp
+++ b/scp2/source/activex/file_activex.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_activex.scp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/activex/makefile.mk b/scp2/source/activex/makefile.mk
index 86097032f455..fb4342e4a891 100644
--- a/scp2/source/activex/makefile.mk
+++ b/scp2/source/activex/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/activex/module_activex.scp b/scp2/source/activex/module_activex.scp
index 4d39208f5d14..808afa874992 100644
--- a/scp2/source/activex/module_activex.scp
+++ b/scp2/source/activex/module_activex.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_activex.scp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/activex/module_activex.ulf b/scp2/source/activex/module_activex.ulf
index 60af356828d9..fb7e101da95d 100644
--- a/scp2/source/activex/module_activex.ulf
+++ b/scp2/source/activex/module_activex.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_activex.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index 4506962806b7..3d209912479c 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_base.scp,v $
- * $Revision: 1.28 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp
index ca7a012009bb..c678e7424cd7 100644
--- a/scp2/source/base/folderitem_base.scp
+++ b/scp2/source/base/folderitem_base.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_base.scp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/base/folderitem_base.ulf b/scp2/source/base/folderitem_base.ulf
index 495c3f747353..3bea2fd724dc 100644
--- a/scp2/source/base/folderitem_base.ulf
+++ b/scp2/source/base/folderitem_base.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_base.ulf,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/base/makefile.mk b/scp2/source/base/makefile.mk
index 53d1f0a89666..ead15b19776c 100644
--- a/scp2/source/base/makefile.mk
+++ b/scp2/source/base/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp
index d8b9d5f124a2..dc4d76fcf5d1 100644
--- a/scp2/source/base/module_base.scp
+++ b/scp2/source/base/module_base.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_base.scp,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/base/module_base.ulf b/scp2/source/base/module_base.ulf
index b2b9e4718ff1..1cd8b2e77a80 100644
--- a/scp2/source/base/module_base.ulf
+++ b/scp2/source/base/module_base.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_base.ulf,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/base/registryitem_base.scp b/scp2/source/base/registryitem_base.scp
index 616084e9b967..833ed3905241 100644..100755
--- a/scp2/source/base/registryitem_base.scp
+++ b/scp2/source/base/registryitem_base.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_base.scp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -97,6 +94,14 @@ RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,13";
 End
 
+RegistryItem gid_Regitem_odb_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.DatabaseDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.DatabaseDocument.1\shell";
@@ -152,3 +157,7 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Sbas
     Name = "Path";
     Value = "<progpath>";
 End
+
+// registering the property handler for the supported file types
+
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odb )
diff --git a/scp2/source/base/registryitem_base.ulf b/scp2/source/base/registryitem_base.ulf
index bf18083e8566..bf6942ecf261 100644
--- a/scp2/source/base/registryitem_base.ulf
+++ b/scp2/source/base/registryitem_base.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_base.ulf,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/binfilter/file_binfilter.scp b/scp2/source/binfilter/file_binfilter.scp
index be7a0bf46613..be66b907a25d 100644
--- a/scp2/source/binfilter/file_binfilter.scp
+++ b/scp2/source/binfilter/file_binfilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_binfilter.scp,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/binfilter/makefile.mk b/scp2/source/binfilter/makefile.mk
index 09d88c4690c8..f7882a3041b1 100644
--- a/scp2/source/binfilter/makefile.mk
+++ b/scp2/source/binfilter/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/binfilter/module_binfilter.scp b/scp2/source/binfilter/module_binfilter.scp
index a889527c8f52..d7cba78f6101 100644
--- a/scp2/source/binfilter/module_binfilter.scp
+++ b/scp2/source/binfilter/module_binfilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_binfilter.scp,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/binfilter/module_binfilter.ulf b/scp2/source/binfilter/module_binfilter.ulf
index 2369831767bd..9b7fc77e9236 100644
--- a/scp2/source/binfilter/module_binfilter.ulf
+++ b/scp2/source/binfilter/module_binfilter.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_binfilter.ulf,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/binfilter/registryitem_binfilter.scp b/scp2/source/binfilter/registryitem_binfilter.scp
index 3c828d0042e4..7640e83ec20a 100644
--- a/scp2/source/binfilter/registryitem_binfilter.scp
+++ b/scp2/source/binfilter/registryitem_binfilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_binfilter.scp,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/binfilter/registryitem_binfilter.ulf b/scp2/source/binfilter/registryitem_binfilter.ulf
index 1372ee893ff4..6af0f0e02d73 100644
--- a/scp2/source/binfilter/registryitem_binfilter.ulf
+++ b/scp2/source/binfilter/registryitem_binfilter.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_binfilter.ulf,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index a4865b67b416..7b392f173378 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_calc.scp,v $
- * $Revision: 1.43.204.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,8 +57,6 @@ STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Scd, scd)
 
-STD_LIB_FILE( gid_File_Lib_Tfu, tfu)
-
 STD_RES_FILE( gid_File_Res_Solver, solver)
 
 STD_RES_FILE( gid_File_Res_Analysis, analysis)
@@ -70,8 +65,6 @@ STD_RES_FILE( gid_File_Res_Date, date)
 
 STD_RES_FILE( gid_File_Res_Sc, sc )
 
-STD_RES_FILE( gid_File_Res_Tfu, tfu )
-
 File gid_File_Help_Scalc_Zip
     Dir = gid_Dir_Help_Isolanguage;
     ARCHIVE_TXT_FILE_BODY;
diff --git a/scp2/source/calc/folderitem_calc.scp b/scp2/source/calc/folderitem_calc.scp
index bff71957bd0e..36cd965cb53b 100644
--- a/scp2/source/calc/folderitem_calc.scp
+++ b/scp2/source/calc/folderitem_calc.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_calc.scp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/calc/folderitem_calc.ulf b/scp2/source/calc/folderitem_calc.ulf
index 6ac55f58416f..e4919fbee29c 100644
--- a/scp2/source/calc/folderitem_calc.ulf
+++ b/scp2/source/calc/folderitem_calc.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_calc.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/calc/makefile.mk b/scp2/source/calc/makefile.mk
index 2ccfd5dd22c1..e049057f7335 100644
--- a/scp2/source/calc/makefile.mk
+++ b/scp2/source/calc/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
index 3ff1c73b0e3a..84ab326814ee 100644
--- a/scp2/source/calc/module_calc.scp
+++ b/scp2/source/calc/module_calc.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_calc.scp,v $
- * $Revision: 1.26 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/calc/module_calc.ulf b/scp2/source/calc/module_calc.ulf
index ab0bbdfa6d76..dbbf3227aa0b 100644
--- a/scp2/source/calc/module_calc.ulf
+++ b/scp2/source/calc/module_calc.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_calc.ulf,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index 4a30287e6fce..31742152cee1 100644..100755
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_calc.scp,v $
- * $Revision: 1.15.122.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -499,6 +496,14 @@ RegistryItem gid_Regitem_Stc_Contenttype
     Value = "application/vnd.sun.xml.calc.template";
 End
 
+RegistryItem gid_Regitem_stc_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarCalcTemplate.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Sxc_Contenttype
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -532,6 +537,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Styles = ();
 End
 
+RegistryItem gid_Regitem_sxc_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarCalcDocument.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 
 // new ods file extension 
 
@@ -582,7 +595,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_ods
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Calc_Bin;
     Name = "application/vnd.oasis.opendocument.spreadsheet";
     Value = "opendocument.CalcDocument.1";
     Styles = ();
@@ -640,6 +653,14 @@ RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,3";
 End
 
+RegistryItem gid_Regitem_ods_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.CalcDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -783,6 +804,14 @@ RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,4";
 End
 
+RegistryItem gid_Regitem_ots_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.Calctemplate.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.CalcTemplate.1\shell";
@@ -1076,6 +1105,15 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Scal
     Value = "<progpath>";
 End
 
+// registering the property handler for the supported file types
+
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( ods )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( ots )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxc )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( stc )
+
+// registering the mso file types
+
 CONDITIONAL_REGISTER_DOC_EXTENSION( Xls,  gid_Module_Prg_Calc_Bin, xls,  XLS,  MS_EXCEL_WORKSHEET_OLD, 3, scalc.exe, open, Calc )
 CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_Bin, xlsx, XLSX, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
 CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_Bin, xlsm, XLSM, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
diff --git a/scp2/source/calc/registryitem_calc.ulf b/scp2/source/calc/registryitem_calc.ulf
index 088adcd46e20..2f6e1e8eda9a 100644
--- a/scp2/source/calc/registryitem_calc.ulf
+++ b/scp2/source/calc/registryitem_calc.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_calc.ulf,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/canvas/cairocanvas.scp b/scp2/source/canvas/cairocanvas.scp
index f3251634c53d..435cef4304f8 100644
--- a/scp2/source/canvas/cairocanvas.scp
+++ b/scp2/source/canvas/cairocanvas.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cairocanvas.scp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp
index 87717292563a..f095eff9f23e 100644
--- a/scp2/source/canvas/canvascommons.scp
+++ b/scp2/source/canvas/canvascommons.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: canvascommons.scp,v $
- * $Revision: 1.11.226.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/canvas/directxcanvas.scp b/scp2/source/canvas/directxcanvas.scp
index f8be02db0e02..febdb8428c8b 100644
--- a/scp2/source/canvas/directxcanvas.scp
+++ b/scp2/source/canvas/directxcanvas.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: directxcanvas.scp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/canvas/makefile.mk b/scp2/source/canvas/makefile.mk
index 9bfc24d7a297..f89e1c685b08 100644
--- a/scp2/source/canvas/makefile.mk
+++ b/scp2/source/canvas/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/canvas/vclcanvas.scp b/scp2/source/canvas/vclcanvas.scp
index 04d0db1f74dd..5f69de34fee9 100644
--- a/scp2/source/canvas/vclcanvas.scp
+++ b/scp2/source/canvas/vclcanvas.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vclcanvas.scp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/crashrep/file_crashrep_dynamic.scp b/scp2/source/crashrep/file_crashrep_dynamic.scp
index 21710ccbd2f8..f92f93f0b1d8 100644
--- a/scp2/source/crashrep/file_crashrep_dynamic.scp
+++ b/scp2/source/crashrep/file_crashrep_dynamic.scp
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/scp2/source/crashrep/file_crashrep_static.scp b/scp2/source/crashrep/file_crashrep_static.scp
index 8bd76e80edb4..ba5c65087d79 100644
--- a/scp2/source/crashrep/file_crashrep_static.scp
+++ b/scp2/source/crashrep/file_crashrep_static.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_crashrep_static.scp,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/crashrep/makefile.mk b/scp2/source/crashrep/makefile.mk
index b58ced3b18ea..17c7584b9bb2 100644
--- a/scp2/source/crashrep/makefile.mk
+++ b/scp2/source/crashrep/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp
index 8d3a98efc12e..357e01f3cc00 100644
--- a/scp2/source/draw/file_draw.scp
+++ b/scp2/source/draw/file_draw.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_draw.scp,v $
- * $Revision: 1.28 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/draw/folderitem_draw.scp b/scp2/source/draw/folderitem_draw.scp
index 598884b60e13..4a73948ced39 100644
--- a/scp2/source/draw/folderitem_draw.scp
+++ b/scp2/source/draw/folderitem_draw.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_draw.scp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/draw/folderitem_draw.ulf b/scp2/source/draw/folderitem_draw.ulf
index aa800caeea70..5eea77b3e739 100644
--- a/scp2/source/draw/folderitem_draw.ulf
+++ b/scp2/source/draw/folderitem_draw.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_draw.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/draw/makefile.mk b/scp2/source/draw/makefile.mk
index 373de268b8d9..605300dad7ca 100644
--- a/scp2/source/draw/makefile.mk
+++ b/scp2/source/draw/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp
index c77034ddea0b..3226e08ea559 100644
--- a/scp2/source/draw/module_draw.scp
+++ b/scp2/source/draw/module_draw.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_draw.scp,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/draw/module_draw.ulf b/scp2/source/draw/module_draw.ulf
index f61b12960423..2d8bc0c38a16 100644
--- a/scp2/source/draw/module_draw.ulf
+++ b/scp2/source/draw/module_draw.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_draw.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index b06ca6430fe4..013f2cfaa9b9 100644..100755
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_draw.scp,v $
- * $Revision: 1.16.122.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -473,6 +470,14 @@ RegistryItem gid_Regitem_Std_Contenttype
     Value = "application/vnd.sun.xml.draw.template";
 End
 
+RegistryItem gid_Regitem_std_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarDrawTemplate.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Sxd_PersistentHandler
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
@@ -533,6 +538,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Styles = ();
 End
 
+RegistryItem gid_Regitem_sxd_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarDrawDocument.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 // new odg file extension 
 
 RegistryItem gid_Regitem_Odg_PersistentHandler
@@ -598,7 +611,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odg
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Draw_Bin;
     Name = "application/vnd.oasis.opendocument.graphics";
     Value = "opendocument.DrawDocument.1";
     Styles = ();
@@ -640,6 +653,14 @@ RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,5";
 End
 
+RegistryItem gid_Regitem_odg_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.DrawDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
@@ -783,6 +804,14 @@ RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,6";
 End
 
+RegistryItem gid_Regitem_otg_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.DrawTemplate.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.DrawTemplate.1\shell";
@@ -895,3 +924,10 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Sdra
     Name = "Path";
     Value = "<progpath>";
 End
+
+// registering the property handler for the supported file types
+
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odg )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( otg )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxd )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( std )
diff --git a/scp2/source/draw/registryitem_draw.ulf b/scp2/source/draw/registryitem_draw.ulf
index 852c93618811..46224625dfb8 100644
--- a/scp2/source/draw/registryitem_draw.ulf
+++ b/scp2/source/draw/registryitem_draw.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_draw.ulf,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
index 1b0fad489748..9d10261843d2 100644
--- a/scp2/source/gnome/file_gnome.scp
+++ b/scp2/source/gnome/file_gnome.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_gnome.scp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/gnome/makefile.mk b/scp2/source/gnome/makefile.mk
index 79293b168eea..185915353a5a 100644
--- a/scp2/source/gnome/makefile.mk
+++ b/scp2/source/gnome/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
index 5a12b6ddd248..f9df5c8969a1 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_gnome.scp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/gnome/module_gnome.ulf b/scp2/source/gnome/module_gnome.ulf
index e1d3e9314412..e39d1c626cb4 100644
--- a/scp2/source/gnome/module_gnome.ulf
+++ b/scp2/source/gnome/module_gnome.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_gnome.ulf,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp
index fbda826b5aa9..2cd0f53f9e56 100644
--- a/scp2/source/graphicfilter/file_graphicfilter.scp
+++ b/scp2/source/graphicfilter/file_graphicfilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_graphicfilter.scp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/graphicfilter/makefile.mk b/scp2/source/graphicfilter/makefile.mk
index 38e2d67eb8ee..522a22d36b28 100644
--- a/scp2/source/graphicfilter/makefile.mk
+++ b/scp2/source/graphicfilter/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp
index a1d85a724620..d5d99969fd64 100644
--- a/scp2/source/graphicfilter/module_graphicfilter.scp
+++ b/scp2/source/graphicfilter/module_graphicfilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_graphicfilter.scp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/graphicfilter/module_graphicfilter.ulf b/scp2/source/graphicfilter/module_graphicfilter.ulf
index ae748f9d2102..f152392a941e 100644
--- a/scp2/source/graphicfilter/module_graphicfilter.ulf
+++ b/scp2/source/graphicfilter/module_graphicfilter.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_graphicfilter.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp
index a4867a9a6ce2..00dde2ca9162 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_impress.scp,v $
- * $Revision: 1.34 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp
index 16d78cc8b18e..db7b0c3794dd 100644
--- a/scp2/source/impress/folderitem_impress.scp
+++ b/scp2/source/impress/folderitem_impress.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_impress.scp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/impress/folderitem_impress.ulf b/scp2/source/impress/folderitem_impress.ulf
index 7a3c1cd4a3e1..d633e57593fb 100644
--- a/scp2/source/impress/folderitem_impress.ulf
+++ b/scp2/source/impress/folderitem_impress.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_impress.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/impress/makefile.mk b/scp2/source/impress/makefile.mk
index a2036f5a3a8c..0a6e4c37ef1c 100644
--- a/scp2/source/impress/makefile.mk
+++ b/scp2/source/impress/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp
index 95fc3e558cb7..7f8bcb7c44f7 100644
--- a/scp2/source/impress/module_impress.scp
+++ b/scp2/source/impress/module_impress.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_impress.scp,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/impress/module_impress.ulf b/scp2/source/impress/module_impress.ulf
index dbb8b86b7084..6d795644a06e 100644
--- a/scp2/source/impress/module_impress.ulf
+++ b/scp2/source/impress/module_impress.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_impress.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp
index 9811616f0c3a..06fbb4bfcc1a 100644
--- a/scp2/source/impress/module_ogltrans.scp
+++ b/scp2/source/impress/module_ogltrans.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_impress.scp,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/impress/module_ogltrans.ulf b/scp2/source/impress/module_ogltrans.ulf
index 8faa064a5466..555e88a0fae4 100644
--- a/scp2/source/impress/module_ogltrans.ulf
+++ b/scp2/source/impress/module_ogltrans.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_impress.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index cb23b879fc37..cf4ba3ccbcb6 100644..100755
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_impress.scp,v $
- * $Revision: 1.15.122.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -487,6 +484,14 @@ RegistryItem gid_Regitem_Sti_Contenttype
     Value = "application/vnd.sun.xml.impress.template";
 End
 
+RegistryItem gid_Regitem_sti_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarImpressTemplate.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Sxi_PersistentHandler
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
@@ -547,6 +552,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Styles = ();
 End
 
+RegistryItem gid_Regitem_sxi_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarImpressDocument.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 // new odp file extension
 
 RegistryItem gid_Regitem_Odp_PersistentHandler
@@ -596,7 +609,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odp
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Impress_Bin;
     Name = "application/vnd.oasis.opendocument.presentation";
     Value = "opendocument.ImpressDocument.1";
     Styles = ();
@@ -655,6 +668,14 @@ RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,7";
 End
 
+RegistryItem gid_Regitem_odp_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.ImpressDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
@@ -812,6 +833,14 @@ RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,8";
 End
 
+RegistryItem gid_Regitem_otp_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.ImpressTemplate.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.ImpressTemplate.1\shell";
@@ -944,6 +973,15 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Simp
     Value = "<progpath>";
 End
 
+// registering the property handler for the supported file types
+
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odp )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( otp )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxi )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sti )
+
+// registering the mso file types
+
 CONDITIONAL_REGISTER_DOC_EXTENSION( Ppt,  gid_Module_Prg_Impress_Bin, ppt,  PPT,  MS_POWERPOINT_PRESENTATION_OLD, 7, simpress.exe, open, Impress )
 CONDITIONAL_REGISTER_DOC_EXTENSION( Pps,  gid_Module_Prg_Impress_Bin, pps,  PPS,  MS_POWERPOINT_SHOW, 7, simpress.exe, open, Impress )
 CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_Bin, pptx, PPTX, MS_POWERPOINT_PRESENTATION, 7, simpress.exe, open, Impress )
@@ -951,4 +989,3 @@ CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_Bin, pptm, PPTM
 CONDITIONAL_REGISTER_DOC_EXTENSION( Pot,  gid_Module_Prg_Impress_Bin, pot,  POT,  MS_POWERPOINT_TEMPLATE_OLD, 8, simpress.exe, new, Impress )
 CONDITIONAL_REGISTER_DOC_EXTENSION( Potx, gid_Module_Prg_Impress_Bin, potx, POTX, MS_POWERPOINT_TEMPLATE, 8, simpress.exe, new, Impress )
 CONDITIONAL_REGISTER_DOC_EXTENSION( Potm, gid_Module_Prg_Impress_Bin, potm, POTM, MS_POWERPOINT_TEMPLATE, 8, simpress.exe, new, Impress )
-
diff --git a/scp2/source/impress/registryitem_impress.ulf b/scp2/source/impress/registryitem_impress.ulf
index 2aaa99102691..2b49957ea470 100644
--- a/scp2/source/impress/registryitem_impress.ulf
+++ b/scp2/source/impress/registryitem_impress.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_impress.ulf,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/javafilter/file_javafilter.scp b/scp2/source/javafilter/file_javafilter.scp
index 294f0a577b9b..d7a902dbf00f 100644
--- a/scp2/source/javafilter/file_javafilter.scp
+++ b/scp2/source/javafilter/file_javafilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_javafilter.scp,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/javafilter/makefile.mk b/scp2/source/javafilter/makefile.mk
index 3e34a40e8c1a..49f50ab16162 100644
--- a/scp2/source/javafilter/makefile.mk
+++ b/scp2/source/javafilter/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/javafilter/module_javafilter.scp b/scp2/source/javafilter/module_javafilter.scp
index 980b1fb79023..dd69d014caf7 100644
--- a/scp2/source/javafilter/module_javafilter.scp
+++ b/scp2/source/javafilter/module_javafilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_javafilter.scp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/javafilter/module_javafilter.ulf b/scp2/source/javafilter/module_javafilter.ulf
index 1e0762d0cc4a..64ae9c420367 100644
--- a/scp2/source/javafilter/module_javafilter.ulf
+++ b/scp2/source/javafilter/module_javafilter.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_javafilter.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/javafilter/registryitem_javafilter.scp b/scp2/source/javafilter/registryitem_javafilter.scp
index 14c3ac59200d..593c6177edad 100644
--- a/scp2/source/javafilter/registryitem_javafilter.scp
+++ b/scp2/source/javafilter/registryitem_javafilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_javafilter.scp,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/javafilter/registryitem_javafilter.ulf b/scp2/source/javafilter/registryitem_javafilter.ulf
index 5c0bf9d2dfb5..fb2478dd8dda 100644
--- a/scp2/source/javafilter/registryitem_javafilter.ulf
+++ b/scp2/source/javafilter/registryitem_javafilter.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_javafilter.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/kde/file_kde.scp b/scp2/source/kde/file_kde.scp
index 4cd9de0b240c..0e0b3d1b73bb 100644
--- a/scp2/source/kde/file_kde.scp
+++ b/scp2/source/kde/file_kde.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_kde.scp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/kde/makefile.mk b/scp2/source/kde/makefile.mk
index 6ddb30108ce6..32d713812ee9 100644
--- a/scp2/source/kde/makefile.mk
+++ b/scp2/source/kde/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp
index 28dacbef0583..55180c57bad8 100644
--- a/scp2/source/kde/module_kde.scp
+++ b/scp2/source/kde/module_kde.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_kde.scp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/kde/module_kde.ulf b/scp2/source/kde/module_kde.ulf
index 1c9aa414b9e9..3d9be78ef898 100644
--- a/scp2/source/kde/module_kde.ulf
+++ b/scp2/source/kde/module_kde.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_kde.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/layout/layout.scp b/scp2/source/layout/layout.scp
index 0bb9d19ec2ab..c801808a444b 100644
--- a/scp2/source/layout/layout.scp
+++ b/scp2/source/layout/layout.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: layout.scp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/layout/makefile.mk b/scp2/source/layout/makefile.mk
index eb923ceb7cae..55fddf86e915 100644
--- a/scp2/source/layout/makefile.mk
+++ b/scp2/source/layout/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index 3426fea0f7e1..4da9f1a23bbc 100644
--- a/scp2/source/math/file_math.scp
+++ b/scp2/source/math/file_math.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_math.scp,v $
- * $Revision: 1.38 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp
index cf6564e414a1..2decfb20811c 100644
--- a/scp2/source/math/folderitem_math.scp
+++ b/scp2/source/math/folderitem_math.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_math.scp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/math/folderitem_math.ulf b/scp2/source/math/folderitem_math.ulf
index 3e0372b8b1aa..4458d7115aed 100644
--- a/scp2/source/math/folderitem_math.ulf
+++ b/scp2/source/math/folderitem_math.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_math.ulf,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/math/makefile.mk b/scp2/source/math/makefile.mk
index 6237dc67c09d..b622097ee65d 100644
--- a/scp2/source/math/makefile.mk
+++ b/scp2/source/math/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp
index 1c63de29d50c..e9c084ba928d 100644
--- a/scp2/source/math/module_math.scp
+++ b/scp2/source/math/module_math.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_math.scp,v $
- * $Revision: 1.22 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/math/module_math.ulf b/scp2/source/math/module_math.ulf
index b830e39735c9..25fd59018858 100644
--- a/scp2/source/math/module_math.ulf
+++ b/scp2/source/math/module_math.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_math.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
index cc50981da023..a1c71702fc42 100644..100755
--- a/scp2/source/math/registryitem_math.scp
+++ b/scp2/source/math/registryitem_math.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_math.scp,v $
- * $Revision: 1.15.122.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -433,6 +430,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Styles = ();
 End
 
+RegistryItem gid_Regitem_sxm_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarMathDocument.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 // new odf file extension
 
 RegistryItem gid_Regitem_Odf_PersistentHandler
@@ -498,7 +503,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odf
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Math_Bin;
     Name = "application/vnd.oasis.opendocument.formula";
     Value = "opendocument.MathDocument.1";
     Styles = ();
@@ -532,6 +537,14 @@ RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,14";
 End
 
+RegistryItem gid_Regitem_odf_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.MathDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
@@ -668,3 +681,8 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Smat
     Name = "Path";
     Value = "<progpath>";
 End
+
+// registering the property handler for the supported file types
+
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odf )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxm )
diff --git a/scp2/source/math/registryitem_math.ulf b/scp2/source/math/registryitem_math.ulf
index d94c2e3f2331..cee55d76d3c8 100644
--- a/scp2/source/math/registryitem_math.ulf
+++ b/scp2/source/math/registryitem_math.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_math.ulf,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp
index 6405511d48fc..e33eb6fa35c7 100644
--- a/scp2/source/onlineupdate/file_onlineupdate.scp
+++ b/scp2/source/onlineupdate/file_onlineupdate.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_onlineupdate.scp,v $
- * $Revision: 1.7.116.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/onlineupdate/makefile.mk b/scp2/source/onlineupdate/makefile.mk
index 19d62c5549c5..4b3ce930483f 100644
--- a/scp2/source/onlineupdate/makefile.mk
+++ b/scp2/source/onlineupdate/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/onlineupdate/module_onlineupdate.scp b/scp2/source/onlineupdate/module_onlineupdate.scp
index 51b9d5ebc8ec..6685450774f2 100644
--- a/scp2/source/onlineupdate/module_onlineupdate.scp
+++ b/scp2/source/onlineupdate/module_onlineupdate.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_onlineupdate.scp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/onlineupdate/module_onlineupdate.ulf b/scp2/source/onlineupdate/module_onlineupdate.ulf
index c0620c9c548b..be6d799de65b 100644
--- a/scp2/source/onlineupdate/module_onlineupdate.ulf
+++ b/scp2/source/onlineupdate/module_onlineupdate.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_onlineupdate.ulf,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 7e0b884519ad..b317eb6ded8b 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: common_brand.scp,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/common_brand_readme.scp b/scp2/source/ooo/common_brand_readme.scp
index ba10f087fb2e..dea9145a000e 100644
--- a/scp2/source/ooo/common_brand_readme.scp
+++ b/scp2/source/ooo/common_brand_readme.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: common_brand_readme.scp,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/datacarrier_ooo.scp b/scp2/source/ooo/datacarrier_ooo.scp
index 5d6398c984be..89bfef1e5626 100644
--- a/scp2/source/ooo/datacarrier_ooo.scp
+++ b/scp2/source/ooo/datacarrier_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: datacarrier_ooo.scp,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index f76433db3ffe..cc805f9e8288 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -1,14 +1,11 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: directory_ooo.scp,v $
- * $Revision: 1.55.66.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/directory_ooo.ulf b/scp2/source/ooo/directory_ooo.ulf
index 9c8604922589..6102bc4cf497 100644
--- a/scp2/source/ooo/directory_ooo.ulf
+++ b/scp2/source/ooo/directory_ooo.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: directory_ooo.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/directory_ooo_macosx.scp b/scp2/source/ooo/directory_ooo_macosx.scp
index 6bff77e6f355..9cd00117dcbf 100755
--- a/scp2/source/ooo/directory_ooo_macosx.scp
+++ b/scp2/source/ooo/directory_ooo_macosx.scp
@@ -1,14 +1,11 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: directory_ooo_macosx.scp,v $
- * $Revision: 1.55.66.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index 9ac8384e360e..dbea12eee10c 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_extra_ooo.scp,v $
- * $Revision: 1.31 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
index 59d829b29830..f26339fe8b1d 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_font_ooo.scp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/file_improvement.scp b/scp2/source/ooo/file_improvement.scp
index 37e3e3e0c731..224d26de6a0d 100644
--- a/scp2/source/ooo/file_improvement.scp
+++ b/scp2/source/ooo/file_improvement.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_jre_ooo.scp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/file_jre_ooo.scp b/scp2/source/ooo/file_jre_ooo.scp
index 45985d8c9290..8800db4c6065 100644
--- a/scp2/source/ooo/file_jre_ooo.scp
+++ b/scp2/source/ooo/file_jre_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_jre_ooo.scp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index e491fb72d672..4a39b5da4978 100644..100755
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -2,12 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_library_ooo.scp,v $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,6 +56,20 @@ File gid_File_Lib_Basprov
   #endif
 End
 
+#ifdef ENABLE_VBA
+File gid_File_Lib_Vbaevent
+    TXT_FILE_BODY;
+    Styles = (PACKED,UNO_COMPONENT);
+    RegistryID = gid_Starregistry_Services_Rdb;
+    Dir = SCP2_OOO_BIN_DIR;
+  #ifdef UNX
+    Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,UNXSUFFIX));
+  #else
+    Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,.dll));
+  #endif
+End
+#endif // ENABLE_VBA
+
 STD_UNO_LIB_FILE( gid_File_Lib_Bib , bib)
 
 File gid_File_Lib_Cached1
@@ -173,13 +185,13 @@ File gid_File_Lib_Curl
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     #ifdef MACOSX
-       Name = STRING(CONCAT2(libcurl.3,UNXSUFFIX));
+       Name = STRING(CONCAT2(libcurl.4,UNXSUFFIX));
     #else
-       Name = STRING(CONCAT3(libcurl,UNXSUFFIX,.3));
+       Name = STRING(CONCAT3(libcurl,UNXSUFFIX,.4));
     #endif
   #else
    #ifdef _gcc3
-    Name = "libcurl-3.dll";
+    Name = "libcurl-4.dll";
    #else
     Name = "libcurl.dll";
    #endif
@@ -659,14 +671,6 @@ File gid_File_Lib_Gdiplus
 End
 #endif
 
-File gid_File_Lib_Go
-    Name = LIBNAME(go);
-    TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    Dir = SCP2_OOO_BIN_DIR;
-    RegistryID = gid_Starregistry_Services_Rdb;
-End
-
 SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory.uno )
 
 STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker)
@@ -1382,6 +1386,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Svtools, svt )
 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_LIB_FILE( gid_File_Lib_Editeng, editeng)
 
 STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter)
 
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index d5b55133c63e..d21afbc07c5a 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_ooo.scp,v $
- * $Revision: 1.257.18.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index 010a3ec5efd6..5e4a2b0ff089 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_resource_ooo.scp,v $
- * $Revision: 1.66.96.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -104,6 +101,7 @@ STD_RES_FILE( gid_File_Res_Svt, svt )
 STD_RES_FILE_ONLY( gid_File_Res_Svp, svp )
 
 STD_RES_FILE( gid_File_Res_Svx, svx )
+STD_RES_FILE( gid_File_Res_Editeng, editeng )
 STD_RES_FILE( gid_File_Res_TextConversionDlgs, textconversiondlgs )
 
 STD_RES_FILE( gid_File_Res_Cui, cui )
diff --git a/scp2/source/ooo/folder_ooo.scp b/scp2/source/ooo/folder_ooo.scp
index a8335061fcf0..88e40629661e 100644
--- a/scp2/source/ooo/folder_ooo.scp
+++ b/scp2/source/ooo/folder_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folder_ooo.scp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/folderitem_ooo.scp b/scp2/source/ooo/folderitem_ooo.scp
index ef6cd70d1eb5..b6ef81eff36d 100644
--- a/scp2/source/ooo/folderitem_ooo.scp
+++ b/scp2/source/ooo/folderitem_ooo.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_ooo.scp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/folderitem_ooo.ulf b/scp2/source/ooo/folderitem_ooo.ulf
index dfa22d09132c..25443ea9253d 100644
--- a/scp2/source/ooo/folderitem_ooo.ulf
+++ b/scp2/source/ooo/folderitem_ooo.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_ooo.ulf,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/installation_ooo.scp b/scp2/source/ooo/installation_ooo.scp
index 22bdbce84de3..8b045bb440c2 100644
--- a/scp2/source/ooo/installation_ooo.scp
+++ b/scp2/source/ooo/installation_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: installation_ooo.scp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index aa8c3178c9fd..5258c40c8c02 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.77.16.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/mergemodules_ooo.scp b/scp2/source/ooo/mergemodules_ooo.scp
index ca4cf0d0f68c..f88cce4d2314 100755
--- a/scp2/source/ooo/mergemodules_ooo.scp
+++ b/scp2/source/ooo/mergemodules_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mergemodules_ooo.scp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_headless.scp b/scp2/source/ooo/module_headless.scp
index 024d3d3a079a..bb77b0e2fbcb 100644
--- a/scp2/source/ooo/module_headless.scp
+++ b/scp2/source/ooo/module_headless.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_headless.scp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_headless.ulf b/scp2/source/ooo/module_headless.ulf
index 33839fcc58c4..e64185dfb1a8 100644
--- a/scp2/source/ooo/module_headless.ulf
+++ b/scp2/source/ooo/module_headless.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_headless.ulf,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 04692770a444..1393eb36f6e5 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_hidden_ooo.scp,v $
- * $Revision: 1.123 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -177,6 +174,7 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_Dbt,
 	gid_File_Lib_Dbfile,
 	gid_File_Lib_Drawinglayer,
+        gid_File_Lib_Editeng,
 	gid_File_Lib_Flat,
 	gid_File_Lib_For,
 	gid_File_Lib_Forui,
diff --git a/scp2/source/ooo/module_improvement.scp b/scp2/source/ooo/module_improvement.scp
index 9bacce07fe90..1380202f34e7 100644
--- a/scp2/source/ooo/module_improvement.scp
+++ b/scp2/source/ooo/module_improvement.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_java.scp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_java.scp b/scp2/source/ooo/module_java.scp
index 32cf80586969..e93721ce3c5b 100644
--- a/scp2/source/ooo/module_java.scp
+++ b/scp2/source/ooo/module_java.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_java.scp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_java.ulf b/scp2/source/ooo/module_java.ulf
index c58cc885c1ee..c3ccedc59f14 100644
--- a/scp2/source/ooo/module_java.ulf
+++ b/scp2/source/ooo/module_java.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_java.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index 6901254c4ef7..7ecd4747cdea 100755
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_lang_template.scp,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -68,6 +65,7 @@ Module gid_Module_Langpack_Resource_Template
              gid_File_Res_Dba,
              gid_File_Res_Dbw,
              gid_File_Res_Dkt,
+             gid_File_Res_Editeng,
              gid_File_Res_Epb,
              gid_File_Res_Epg,
              gid_File_Res_Epp,
diff --git a/scp2/source/ooo/module_langpack.scp b/scp2/source/ooo/module_langpack.scp
index d50be8837337..bda152b286da 100644
--- a/scp2/source/ooo/module_langpack.scp
+++ b/scp2/source/ooo/module_langpack.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack.scp,v $
- * $Revision: 1.11.222.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf
index 5fbcbdda7107..3127cdd8b904 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack.ulf,v $
- * $Revision: 1.10.178.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 3a643705124e..d77c05768fbb 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_ooo.scp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 37e97b3932c7..4660a2a442df 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_ooo.ulf,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_systemint.scp b/scp2/source/ooo/module_systemint.scp
index 552ed2c2e24a..ea9faa7e765c 100644
--- a/scp2/source/ooo/module_systemint.scp
+++ b/scp2/source/ooo/module_systemint.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_systemint.scp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_systemint.ulf b/scp2/source/ooo/module_systemint.ulf
index 1f2a525fb4cb..b178c80fa2c4 100644
--- a/scp2/source/ooo/module_systemint.ulf
+++ b/scp2/source/ooo/module_systemint.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_systemint.ulf,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp
index cc5780b56f57..7021f02efc4a 100644
--- a/scp2/source/ooo/ooo_brand.scp
+++ b/scp2/source/ooo/ooo_brand.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ooo_brand.scp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/profile_ooo.scp b/scp2/source/ooo/profile_ooo.scp
index cbd331666851..a2491045caf9 100644
--- a/scp2/source/ooo/profile_ooo.scp
+++ b/scp2/source/ooo/profile_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: profile_ooo.scp,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp
index 708ece95f6c5..bb3a9ecd4126 100644
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ b/scp2/source/ooo/profileitem_ooo.scp
@@ -1,14 +1,11 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: profileitem_ooo.scp,v $
- * $Revision: 1.67.2.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
index 6544de17f993..04162a200ccf 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_ooo.scp,v $
- * $Revision: 1.34 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/registryitem_ooo.ulf b/scp2/source/ooo/registryitem_ooo.ulf
index cbcf513d1358..cbb57ef56d98 100644
--- a/scp2/source/ooo/registryitem_ooo.ulf
+++ b/scp2/source/ooo/registryitem_ooo.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_ooo.ulf,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp
index f88737451a5f..e5314c7c386e 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scpaction_ooo.scp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp
index 3824fe3a0841..fb43b041c585 100644
--- a/scp2/source/ooo/shortcut_ooo.scp
+++ b/scp2/source/ooo/shortcut_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shortcut_ooo.scp,v $
- * $Revision: 1.32 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/starregistry_ooo.scp b/scp2/source/ooo/starregistry_ooo.scp
index dfd1d3c0170b..41bacdcecf48 100644
--- a/scp2/source/ooo/starregistry_ooo.scp
+++ b/scp2/source/ooo/starregistry_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: starregistry_ooo.scp,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 41f2b73adbe8..ca7a7222b074 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ure.scp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/ure_into_ooo.scp b/scp2/source/ooo/ure_into_ooo.scp
index 0f5be1aae19b..397d8fd8f2da 100755
--- a/scp2/source/ooo/ure_into_ooo.scp
+++ b/scp2/source/ooo/ure_into_ooo.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ure_into_ooo.scp,v $
- * $Revision: 1.5.176.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/ure_standalone.scp b/scp2/source/ooo/ure_standalone.scp
index d4fd951c9771..caa78335e509 100755
--- a/scp2/source/ooo/ure_standalone.scp
+++ b/scp2/source/ooo/ure_standalone.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ure_standalone.scp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index b7e6e81dc331..70c490d954f8 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -2,12 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2009 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vc_redist.scp,v $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index ceb0b156cd7b..b69082b05cd5 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: windowscustomaction_ooo.scp,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index 6042c062d21b..1303bf59460f 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_python.scp,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/python/makefile.mk b/scp2/source/python/makefile.mk
index f78bdbd7d349..b34c0af1491d 100644
--- a/scp2/source/python/makefile.mk
+++ b/scp2/source/python/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.15 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
index e0b11a9ead4d..3abeec2e3142 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_python.scp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/python/module_python.ulf b/scp2/source/python/module_python.ulf
index 411debf2d469..2303dcd8a383 100644
--- a/scp2/source/python/module_python.ulf
+++ b/scp2/source/python/module_python.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_python.ulf,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/python/module_python_mailmerge.scp b/scp2/source/python/module_python_mailmerge.scp
index 2d7f68d3a315..00a5c30a122c 100644
--- a/scp2/source/python/module_python_mailmerge.scp
+++ b/scp2/source/python/module_python_mailmerge.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_python_mailmerge.scp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/python/module_python_mailmerge.ulf b/scp2/source/python/module_python_mailmerge.ulf
index 12de9f65ed8f..b69dda152aeb 100755
--- a/scp2/source/python/module_python_mailmerge.ulf
+++ b/scp2/source/python/module_python_mailmerge.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_python_mailmerge.ulf,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/python/profileitem_python.scp b/scp2/source/python/profileitem_python.scp
index 75bb6710f0f9..be8edc601eb6 100644
--- a/scp2/source/python/profileitem_python.scp
+++ b/scp2/source/python/profileitem_python.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: profileitem_python.scp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/quickstart/file_quickstart.scp b/scp2/source/quickstart/file_quickstart.scp
index 50548eac85f9..447dcee0431a 100644
--- a/scp2/source/quickstart/file_quickstart.scp
+++ b/scp2/source/quickstart/file_quickstart.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_quickstart.scp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/quickstart/folderitem_quickstart.scp b/scp2/source/quickstart/folderitem_quickstart.scp
index 0243c6fba216..b533637cc788 100644
--- a/scp2/source/quickstart/folderitem_quickstart.scp
+++ b/scp2/source/quickstart/folderitem_quickstart.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_quickstart.scp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/quickstart/makefile.mk b/scp2/source/quickstart/makefile.mk
index 96adeafcce16..283d220733e3 100644
--- a/scp2/source/quickstart/makefile.mk
+++ b/scp2/source/quickstart/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/quickstart/module_quickstart.scp b/scp2/source/quickstart/module_quickstart.scp
index 7e1bad4f825f..078de4b5f041 100644
--- a/scp2/source/quickstart/module_quickstart.scp
+++ b/scp2/source/quickstart/module_quickstart.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_quickstart.scp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/quickstart/module_quickstart.ulf b/scp2/source/quickstart/module_quickstart.ulf
index 93d39ef0bf6b..f8a8809f69a3 100644
--- a/scp2/source/quickstart/module_quickstart.ulf
+++ b/scp2/source/quickstart/module_quickstart.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_quickstart.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/quickstart/registryitem_quickstart.scp b/scp2/source/quickstart/registryitem_quickstart.scp
index 3a10ff71e929..4c8b4c5ad2a5 100644
--- a/scp2/source/quickstart/registryitem_quickstart.scp
+++ b/scp2/source/quickstart/registryitem_quickstart.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_quickstart.scp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/sdkoo/makefile.mk b/scp2/source/sdkoo/makefile.mk
index 5a4fdf72f021..6b4200b4671c 100644
--- a/scp2/source/sdkoo/makefile.mk
+++ b/scp2/source/sdkoo/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/sdkoo/module_sdkoo.scp b/scp2/source/sdkoo/module_sdkoo.scp
index 4777fb0b5598..b24bd7aafd50 100644
--- a/scp2/source/sdkoo/module_sdkoo.scp
+++ b/scp2/source/sdkoo/module_sdkoo.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_sdkoo.scp,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/sdkoo/module_sdkoo.ulf b/scp2/source/sdkoo/module_sdkoo.ulf
index 52c377ce6af3..1bb139979403 100644
--- a/scp2/source/sdkoo/module_sdkoo.ulf
+++ b/scp2/source/sdkoo/module_sdkoo.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_sdkoo.ulf,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index b8dd4e5faed4..9794fa06719e 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdkoo.scp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/makefile.mk b/scp2/source/templates/makefile.mk
index 59f5dab89f9e..47be771c5e50 100755
--- a/scp2/source/templates/makefile.mk
+++ b/scp2/source/templates/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack.sct b/scp2/source/templates/module_langpack.sct
index 1d349100eb4b..2876776f5f32 100755
--- a/scp2/source/templates/module_langpack.sct
+++ b/scp2/source/templates/module_langpack.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack.sct,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack_base.sct b/scp2/source/templates/module_langpack_base.sct
index 7dacd0710437..4c569f322b52 100755
--- a/scp2/source/templates/module_langpack_base.sct
+++ b/scp2/source/templates/module_langpack_base.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack_base.sct,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack_binfilter.sct b/scp2/source/templates/module_langpack_binfilter.sct
index e4f558df0d1a..76f389049580 100644
--- a/scp2/source/templates/module_langpack_binfilter.sct
+++ b/scp2/source/templates/module_langpack_binfilter.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack_binfilter.sct,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack_calc.sct b/scp2/source/templates/module_langpack_calc.sct
index de6d8385fc02..865d03ebe3ff 100755
--- a/scp2/source/templates/module_langpack_calc.sct
+++ b/scp2/source/templates/module_langpack_calc.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack_calc.sct,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack_draw.sct b/scp2/source/templates/module_langpack_draw.sct
index 1a6349fd4c27..b87ff103a517 100755
--- a/scp2/source/templates/module_langpack_draw.sct
+++ b/scp2/source/templates/module_langpack_draw.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack_draw.sct,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack_impress.sct b/scp2/source/templates/module_langpack_impress.sct
index 919cf74e2355..fe90cfdc8892 100755
--- a/scp2/source/templates/module_langpack_impress.sct
+++ b/scp2/source/templates/module_langpack_impress.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack_impress.sct,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack_math.sct b/scp2/source/templates/module_langpack_math.sct
index 6b5189a86ca1..5b7722a146c0 100755
--- a/scp2/source/templates/module_langpack_math.sct
+++ b/scp2/source/templates/module_langpack_math.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack_math.sct,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack_onlineupdate.sct b/scp2/source/templates/module_langpack_onlineupdate.sct
index 6aed95ff6a2d..24fb09c3566a 100755
--- a/scp2/source/templates/module_langpack_onlineupdate.sct
+++ b/scp2/source/templates/module_langpack_onlineupdate.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack_onlineupdate.sct,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack_root.sct b/scp2/source/templates/module_langpack_root.sct
index 977608d78ea3..0eb5a5373f55 100755
--- a/scp2/source/templates/module_langpack_root.sct
+++ b/scp2/source/templates/module_langpack_root.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack_root.sct,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack_writer.sct b/scp2/source/templates/module_langpack_writer.sct
index 15e5aab9bcd9..d4c59baa68af 100755
--- a/scp2/source/templates/module_langpack_writer.sct
+++ b/scp2/source/templates/module_langpack_writer.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack_writer.sct,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/modules.pl b/scp2/source/templates/modules.pl
index 2b77662a95b8..68133b14a772 100755
--- a/scp2/source/templates/modules.pl
+++ b/scp2/source/templates/modules.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: modules.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/testtool/file_testtool.scp b/scp2/source/testtool/file_testtool.scp
index 4e44a1f80fcd..86faf16faefc 100644
--- a/scp2/source/testtool/file_testtool.scp
+++ b/scp2/source/testtool/file_testtool.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_testtool.scp,v $
- * $Revision: 1.7.156.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/testtool/makefile.mk b/scp2/source/testtool/makefile.mk
index 036cd1420c12..edcad2e17abe 100644
--- a/scp2/source/testtool/makefile.mk
+++ b/scp2/source/testtool/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/testtool/module_testtool.scp b/scp2/source/testtool/module_testtool.scp
index 356772a62310..1a6bc0d01484 100644
--- a/scp2/source/testtool/module_testtool.scp
+++ b/scp2/source/testtool/module_testtool.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_testtool.scp,v $
- * $Revision: 1.9.156.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/testtool/module_testtool.ulf b/scp2/source/testtool/module_testtool.ulf
index 20a93f19d6c0..8d219eaab541 100644
--- a/scp2/source/testtool/module_testtool.ulf
+++ b/scp2/source/testtool/module_testtool.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_testtool.ulf,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp
index dd8b8912ae8c..50f0aa064d71 100644..100755
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_winexplorerext.scp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -42,13 +39,6 @@ File gid_File_Lib_OOoFilt
     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
@@ -59,14 +49,6 @@ File gid_File_Lib_OOoFilt64
     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
@@ -87,34 +69,29 @@ End
 
 #endif
 
-#if defined M1310
-File gid_File_Lib_Shlxthdl_Msvcr71
+File gid_File_Lib_PropertyHdl
     TXT_FILE_BODY;
+    Styles = (PACKED);
     Dir = gid_Dir_Shlxthdl;
-    Name = SCP2_URE_DL_NORMAL("msvcr71" SCP2_STDLP_DEBUG);
+    Name = "propertyhdl.dll";
+End
+
+#ifdef BUILD_X64
+	File gid_File_Lib_PropertyHdl64
+    TXT_FILE_BODY;
     Styles = (PACKED);
+    Dir = gid_Dir_Shlxthdl;
+    Name = "propertyhdl_x64.dll";
+    ComponentCondition = "VersionNT64";
 End
+
 #endif
 
-#if !defined USE_SYSTEM_STL
-File gid_File_Lib_Shlxthdl_Stlport
+#if defined M1310
+File gid_File_Lib_Shlxthdl_Msvcr71
     TXT_FILE_BODY;
     Dir = gid_Dir_Shlxthdl;
-#if defined _gcc3 /* && defined WNT */
-#if defined _STLP_DEBUG
-    Name = SCP2_URE_DL_NORMAL("libstlport_gcc_stldebug");
-#else
-    Name = SCP2_URE_DL_NORMAL("libstlport_gcc");
-#endif
-#elif (defined(M1310) || defined(M1400) || defined(M1500)) /* && defined WNT */
-#if defined _STLP_DEBUG
-    Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45");
-#else
-    Name = SCP2_URE_DL_NORMAL("stlport_vc7145");
-#endif
-#else
-#error "stlport dynamic library: unsupported platform"
-#endif
+    Name = SCP2_URE_DL_NORMAL("msvcr71" SCP2_STDLP_DEBUG);
     Styles = (PACKED);
 End
 #endif
@@ -132,3 +109,4 @@ File gid_File_Lib_Reg64
     Dir = SCP2_OOO_BIN_DIR;
     Name = "reg64msi.dll";
 End
+
diff --git a/scp2/source/winexplorerext/makefile.mk b/scp2/source/winexplorerext/makefile.mk
index 6fc8ef03b382..21eaad714eac 100644..100755
--- a/scp2/source/winexplorerext/makefile.mk
+++ b/scp2/source/winexplorerext/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp
index c1f0ac7f9010..6993ba25c1d1 100644..100755
--- a/scp2/source/winexplorerext/module_winexplorerext.scp
+++ b/scp2/source/winexplorerext/module_winexplorerext.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_winexplorerext.scp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,7 +29,7 @@
 
 Module gid_Module_Optional_Winexplorerext
     MOD_NAME_DESC ( MODULE_OPTIONAL_WINDOWS_EXPLORER_EXTENSIONS );
-    Sortkey = "1200";
+    Sortkey = "1205";
     Default = YES;
     Minimal = YES;
     ParentID = gid_Module_Optional;
@@ -40,12 +37,21 @@ Module gid_Module_Optional_Winexplorerext
     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
+
+Module gid_Module_Optional_Winexplorerext_PropertyHdl
+	ParentID = gid_Module_Optional_Winexplorerext;
+	Name = "gid_Module_Optional_Winexplorerext_PropertyHdl";
+	Description = "gid_Module_Optional_Winexplorerext_PropertyHdl";
+	Sortkey = "1210";
+	Default = YES;
+	Styles = (HIDDEN_ROOT);
+    Dirs = (gid_Dir_Shlxthdl);
+	Files = (gid_File_Lib_PropertyHdl,
+			 gid_File_Lib_PropertyHdl64);
+End
diff --git a/scp2/source/winexplorerext/module_winexplorerext.ulf b/scp2/source/winexplorerext/module_winexplorerext.ulf
index bfc8aaa90d14..506c80d71766 100644
--- a/scp2/source/winexplorerext/module_winexplorerext.ulf
+++ b/scp2/source/winexplorerext/module_winexplorerext.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_winexplorerext.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index 87084695ada0..7c932bac1f28 100644..100755
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_winexplorerext.scp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,8 +35,8 @@ RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer
     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\"";
+    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
@@ -61,8 +58,8 @@ RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer
     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\"";
+    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
@@ -93,8 +90,8 @@ RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer
     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\"";
+    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
@@ -127,8 +124,8 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer
     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";
+    Value = "[BASISINSTALLLOCATION]program\shlxthdl\ooofilt.dll";
+    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel
@@ -170,8 +167,8 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer
     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\"";
+    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
@@ -184,4 +181,50 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer
     Val64 = "Apartment";
 End
 
-// End registry entries for the PropertySheet handler
\ No newline at end of file
+// End registry entries for the PropertySheet handler
+
+// Begin registry entries for the Property handler
+
+RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ComponentCondition = "VersionNT >= 600";
+    Styles = (X64);
+    Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}";
+    Value = "%PRODUCTNAME Property Handler";
+    Val64 = "%PRODUCTNAME Property Handler";
+End
+
+RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ComponentCondition = "VersionNT >= 600";
+    Styles = (X64);
+    Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32";
+    Value = "[BASISINSTALLLOCATION]program\shlxthdl\propertyhdl.dll";
+    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\propertyhdl_x64.dll";
+End
+
+RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_ThreadingModel
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ComponentCondition = "VersionNT >= 600";
+    Styles = (X64);
+    Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32";
+    Name = "ThreadingModel";
+    Value = "Apartment";
+    Val64 = "Apartment";
+End
+
+RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_Approved
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ComponentCondition = "VersionNT >= 600";
+    Styles = (X64);
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved";
+    Name = "{AE424E85-F6DF-4910-A6A9-438797986431}";
+    Value = "%PRODUCTNAME Property Handler";
+    Val64 = "%PRODUCTNAME Property Handler";
+End
+
+// End registry entries for the Property handler
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index 5c76da172576..3d7c22b9e7a9 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_writer.scp,v $
- * $Revision: 1.39 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/writer/folderitem_writer.scp b/scp2/source/writer/folderitem_writer.scp
index 3b7f28b67970..7541e1d2d344 100644
--- a/scp2/source/writer/folderitem_writer.scp
+++ b/scp2/source/writer/folderitem_writer.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_writer.scp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/writer/folderitem_writer.ulf b/scp2/source/writer/folderitem_writer.ulf
index d585bfd18dc6..a088978663d6 100644
--- a/scp2/source/writer/folderitem_writer.ulf
+++ b/scp2/source/writer/folderitem_writer.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_writer.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/writer/makefile.mk b/scp2/source/writer/makefile.mk
index 09d48fc67134..136079bec377 100644
--- a/scp2/source/writer/makefile.mk
+++ b/scp2/source/writer/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
index 3568686ac94a..16928c8b25b9 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_writer.scp,v $
- * $Revision: 1.29 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/writer/module_writer.ulf b/scp2/source/writer/module_writer.ulf
index 32b9bf2804fb..1e02043e19ee 100644
--- a/scp2/source/writer/module_writer.ulf
+++ b/scp2/source/writer/module_writer.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_writer.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 819ba6128663..b6497f889630 100644..100755
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_writer.scp,v $
- * $Revision: 1.15.122.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -542,6 +539,14 @@ RegistryItem gid_Regitem_Stw_Contenttype
     Value = "application/vnd.sun.xml.writer.template";
 End
 
+RegistryItem gid_Regitem_stw_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarWriterTemplate.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Sxg_PersistentHandler
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -586,6 +591,14 @@ RegistryItem gid_Regitem_Sxg_Mime_Database
     Value = ".sxg";
 End
 
+RegistryItem gid_Regitem_sxg_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarWriterGlobalDocument.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Sxw_PersistentHandler
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -646,6 +659,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Styles = ();
 End
 
+RegistryItem gid_Regitem_sxw_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarWriterDocument.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 
 // new odt file extension 
 
@@ -696,13 +717,12 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odt
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = "application/vnd.oasis.opendocument.text";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
 End
 
-
 RegistryItem gid_Regitem_Odt_Contenttype
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -761,6 +781,14 @@ RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Insertable
     Subkey = "opendocument.WriterDocument.1\Insertable";
 End
 
+RegistryItem gid_Regitem_odt_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.WriterDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Server
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -921,6 +949,14 @@ RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,2";
 End
 
+RegistryItem gid_Regitem_ott_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.WriterTemplate.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -1037,6 +1073,14 @@ RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,10";
 End
 
+RegistryItem gid_Regitem_odm_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.WriterGlobalDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.WriterGlobalDocument.1\shell";
@@ -1195,6 +1239,14 @@ RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Printto_Command
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
+RegistryItem gid_Regitem_oth_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.WriterWebTemplate.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 // "OpenWith" Windows Registry keys for extensions supported by Writer
 
 // .ODT
@@ -1428,6 +1480,18 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Swri
     Value = "<progpath>";
 End
 
+
+// registering the property handler for the supported file types
+
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odt )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( ott )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( oth )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odm )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxw )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( stw )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxg )
+
+// registering the mso file types
 // CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid,                 key,  cond, disp_name,        icon_id, app, default, dox_type)
 
 CONDITIONAL_REGISTER_DOC_EXTENSION( Doc,  gid_Module_Prg_Wrt_Bin, doc,  DOC,  MS_WORD_DOCUMENT_OLD, 1, swriter.exe, open, Writer )
diff --git a/scp2/source/writer/registryitem_writer.ulf b/scp2/source/writer/registryitem_writer.ulf
index 87c27fbce898..ce8108ae572d 100644
--- a/scp2/source/writer/registryitem_writer.ulf
+++ b/scp2/source/writer/registryitem_writer.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_writer.ulf,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/xsltfilter/file_xsltfilter.scp b/scp2/source/xsltfilter/file_xsltfilter.scp
index fc15a6437615..848b1c707ff7 100644
--- a/scp2/source/xsltfilter/file_xsltfilter.scp
+++ b/scp2/source/xsltfilter/file_xsltfilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_xsltfilter.scp,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/xsltfilter/makefile.mk b/scp2/source/xsltfilter/makefile.mk
index 29e2ffb4c2f5..a9c6c9f77888 100644
--- a/scp2/source/xsltfilter/makefile.mk
+++ b/scp2/source/xsltfilter/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/xsltfilter/module_xsltfilter.scp b/scp2/source/xsltfilter/module_xsltfilter.scp
index f5bc2acc6482..7854ce70474f 100644
--- a/scp2/source/xsltfilter/module_xsltfilter.scp
+++ b/scp2/source/xsltfilter/module_xsltfilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_xsltfilter.scp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/xsltfilter/module_xsltfilter.ulf b/scp2/source/xsltfilter/module_xsltfilter.ulf
index 5620f926d210..9561c2dc6ec6 100644
--- a/scp2/source/xsltfilter/module_xsltfilter.ulf
+++ b/scp2/source/xsltfilter/module_xsltfilter.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_xsltfilter.ulf,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index bafca83860cb..f62d0c0f2a91 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.58 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/set_soenv.in b/set_soenv.in
index 47aed42b0736..1e74bb7526fe 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -593,7 +593,6 @@ elsif ( $platform =~ m/osf1/ )
 } 
 elsif ( $platform =~ m/cygwin/ ) 
 {
-      $COMPATH        = PathFormat('@COMPATH@');
       $MSPDB_PATH     = PathFormat('@MSPDB_PATH@');
       $MIDL_PATH      = PathFormat('@MIDL_PATH@');
       $CSC_PATH       = PathFormat('@CSC_PATH@');
@@ -618,6 +617,8 @@ elsif ( $platform =~ m/cygwin/ )
       $FLIPCMD        = "slfl.pl";
       $PATH_SEPERATOR = ';';
       $outfile        = "winmingw.set"; 
+      $COMPATH        = PathFormat('@COMPATH@/bin');
+      $COMPATH        =~ s/\/bin$//i;
       $COM            = "GCC";
       $CVER           = "C341";
       $OUTPATH        = "wntgcci";
@@ -626,6 +627,7 @@ elsif ( $platform =~ m/cygwin/ )
   }
   else # The MSVC section starts here
   {   $outfile        = "winenv.set";
+      $COMPATH        = PathFormat('@COMPATH@');
       $COM            = "MSC";
       $OUTPATH        = "wntmsci@COMEX@";
       $INPATH         = $OUTPATH.$PROEXT;
@@ -1833,6 +1835,13 @@ ToFile( "SYSTEM_EXPAT",      "@SYSTEM_EXPAT@",     "e" );
 ToFile( "SYSTEM_DB",         "@SYSTEM_DB@",        "e" );
 ToFile( "DB_VERSION",        "@DB_VERSION@",       "e" );
 ToFile( "DB_INCLUDES",       "@DB_INCLUDES@",      "e" );
+ToFile( "ENABLE_MYSQLC",     "@ENABLE_MYSQLC@",    "e" );
+ToFile( "SYSTEM_MYSQL",      "@SYSTEM_MYSQL@",     "e" );
+ToFile( "SYSTEM_MYSQL_CPPCONN","@SYSTEM_MYSQL_CPPCONN@","e" );
+ToFile( "MYSQL_INC",         "@MYSQL_INC@",        "e" );
+ToFile( "MYSQL_LIB",         "@MYSQL_LIB@",        "e" );
+ToFile( "MYSQL_DEFINES",     "@MYSQL_DEFINES@",    "e" );
+ToFile( "LIBMYSQL_PATH",     "@LIBMYSQL_PATH@",    "e" );
 ToFile( "SYSTEM_HSQLDB",     "@SYSTEM_HSQLDB@",    "e" );
 ToFile( "HSQLDB_JAR",        "@HSQLDB_JAR@",       "e" );
 ToFile( "SYSTEM_LUCENE",     "@SYSTEM_LUCENE@",    "e" );
diff --git a/soldep/bootstrp/appdef.cxx b/soldep/bootstrp/appdef.cxx
index 9c867064c4cc..8ce777888781 100644
--- a/soldep/bootstrp/appdef.cxx
+++ b/soldep/bootstrp/appdef.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appdef.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/bootstrp/build_list_converter.pl b/soldep/bootstrp/build_list_converter.pl
index 95493997d717..3887eca03a12 100644
--- a/soldep/bootstrp/build_list_converter.pl
+++ b/soldep/bootstrp/build_list_converter.pl
@@ -6,14 +6,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: build_list_converter.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/bootstrp/dep.cxx b/soldep/bootstrp/dep.cxx
index 7f9646a6530d..fb4edcc998bc 100644
--- a/soldep/bootstrp/dep.cxx
+++ b/soldep/bootstrp/dep.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dep.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/bootstrp/hashtbl.cxx b/soldep/bootstrp/hashtbl.cxx
index 66b88f3c78dc..b6f9b0b7826a 100644
--- a/soldep/bootstrp/hashtbl.cxx
+++ b/soldep/bootstrp/hashtbl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hashtbl.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/bootstrp/makefile.mk b/soldep/bootstrp/makefile.mk
index ac56f781b791..56d3fa1f07f4 100644
--- a/soldep/bootstrp/makefile.mk
+++ b/soldep/bootstrp/makefile.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/bootstrp/minormk.cxx b/soldep/bootstrp/minormk.cxx
index 2a8a69dbc3b5..8c08d3a69840 100644
--- a/soldep/bootstrp/minormk.cxx
+++ b/soldep/bootstrp/minormk.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: minormk.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/bootstrp/prj.cxx b/soldep/bootstrp/prj.cxx
index 5e93c1142673..d13e08a05283 100644
--- a/soldep/bootstrp/prj.cxx
+++ b/soldep/bootstrp/prj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prj.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/bootstrp/prodmap.cxx b/soldep/bootstrp/prodmap.cxx
index 5c48704d5a6d..166d111b563b 100644
--- a/soldep/bootstrp/prodmap.cxx
+++ b/soldep/bootstrp/prodmap.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prodmap.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/appdef.hxx b/soldep/inc/appdef.hxx
index 7539b3c9c49b..cc8d5d0f2f8b 100644
--- a/soldep/inc/appdef.hxx
+++ b/soldep/inc/appdef.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appdef.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/dep.hxx b/soldep/inc/dep.hxx
index a7a2b31d046a..f7ef15ace882 100644
--- a/soldep/inc/dep.hxx
+++ b/soldep/inc/dep.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dep.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/dtsodcmp.hrc b/soldep/inc/dtsodcmp.hrc
index e43fd369c4d1..bfeca821562b 100644
--- a/soldep/inc/dtsodcmp.hrc
+++ b/soldep/inc/dtsodcmp.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dtsodcmp.hrc,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/minormk.hxx b/soldep/inc/minormk.hxx
index a4c743fdcbb2..0f14497dbaa7 100644
--- a/soldep/inc/minormk.hxx
+++ b/soldep/inc/minormk.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: minormk.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/prodmap.hxx b/soldep/inc/prodmap.hxx
index 3faa8ed9368a..97b554b9e52d 100644
--- a/soldep/inc/prodmap.hxx
+++ b/soldep/inc/prodmap.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prodmap.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/soldep/connctr.hxx b/soldep/inc/soldep/connctr.hxx
index 478cf2843cc3..40ef986245e5 100644
--- a/soldep/inc/soldep/connctr.hxx
+++ b/soldep/inc/soldep/connctr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: connctr.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/soldep/depper.hxx b/soldep/inc/soldep/depper.hxx
index 7caffca8662e..a9de33c57043 100644
--- a/soldep/inc/soldep/depper.hxx
+++ b/soldep/inc/soldep/depper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: depper.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/soldep/depwin.hxx b/soldep/inc/soldep/depwin.hxx
index 152e81fe2f19..4464e91aa59a 100644
--- a/soldep/inc/soldep/depwin.hxx
+++ b/soldep/inc/soldep/depwin.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: depwin.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/soldep/graphwin.hxx b/soldep/inc/soldep/graphwin.hxx
index 54ee629632fa..e0152d6e34f7 100644
--- a/soldep/inc/soldep/graphwin.hxx
+++ b/soldep/inc/soldep/graphwin.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: graphwin.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/soldep/hashobj.hxx b/soldep/inc/soldep/hashobj.hxx
index 798430125b58..73d4daf699e7 100644
--- a/soldep/inc/soldep/hashobj.hxx
+++ b/soldep/inc/soldep/hashobj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hashobj.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/soldep/hashtbl.hxx b/soldep/inc/soldep/hashtbl.hxx
index c7bc3ebf372e..0308a6a33e0e 100644
--- a/soldep/inc/soldep/hashtbl.hxx
+++ b/soldep/inc/soldep/hashtbl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hashtbl.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/soldep/objwin.hxx b/soldep/inc/soldep/objwin.hxx
index 884507a2fa81..e7bc94826858 100644
--- a/soldep/inc/soldep/objwin.hxx
+++ b/soldep/inc/soldep/objwin.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objwin.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/soldep/prj.hxx b/soldep/inc/soldep/prj.hxx
index bd94a3e87f9a..b04d6ac1fe4e 100644
--- a/soldep/inc/soldep/prj.hxx
+++ b/soldep/inc/soldep/prj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prj.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/soldep/sdtresid.hxx b/soldep/inc/soldep/sdtresid.hxx
index 6b7f9ca50846..02a3a57e37ea 100644
--- a/soldep/inc/soldep/sdtresid.hxx
+++ b/soldep/inc/soldep/sdtresid.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdtresid.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/soldep/soldep.hxx b/soldep/inc/soldep/soldep.hxx
index 8c65e9ca08eb..55fb4fc0e11c 100644
--- a/soldep/inc/soldep/soldep.hxx
+++ b/soldep/inc/soldep/soldep.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soldep.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/soldep/soldlg.hrc b/soldep/inc/soldep/soldlg.hrc
index 95bea8e50880..94a26514e5b2 100644
--- a/soldep/inc/soldep/soldlg.hrc
+++ b/soldep/inc/soldep/soldlg.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soldlg.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/soldep/soldlg.hxx b/soldep/inc/soldep/soldlg.hxx
index 8ab3a4bed220..ef57908b6913 100644
--- a/soldep/inc/soldep/soldlg.hxx
+++ b/soldep/inc/soldep/soldlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soldlg.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/inc/soldep/tbox.hxx b/soldep/inc/soldep/tbox.hxx
index 2159d05c0f49..69276895aad5 100644
--- a/soldep/inc/soldep/tbox.hxx
+++ b/soldep/inc/soldep/tbox.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tbox.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/source/connctr.cxx b/soldep/source/connctr.cxx
index acba58ce48d9..10650cb41fca 100644
--- a/soldep/source/connctr.cxx
+++ b/soldep/source/connctr.cxx
@@ -1,275 +1,272 @@
-/*************************************************************************

- *

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

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

-    {

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

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

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

-        pDevice->DrawEllipse( aRect );

-    }

-}

-

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

-{

-//  more than one call ?

-//

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

-}

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#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
+         (mpEndWin->GetBodyText() != ByteString("null")) && IsVisible())  //null_project
+    {
+        pDevice->DrawLine( pDevice->PixelToLogic( mEnd ) - rOffset, pDevice->PixelToLogic( mStart ) - rOffset );
+        Rectangle aRect( pDevice->PixelToLogic( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2) ) ) );
+        aRect.Move( -rOffset.X(), -rOffset.Y() );
+        pDevice->DrawEllipse( aRect );
+    }
+}
+
+void Connector::UpdatePosition( ObjectWin* pWin, BOOL bPaint )
+{
+//  more than one call ?
+//
+    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 6b000cc6fbce..0c2b11f030be 100644
--- a/soldep/source/depapp.cxx
+++ b/soldep/source/depapp.cxx
@@ -1,150 +1,147 @@
-/*************************************************************************

- *

- * 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);

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

-}

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// -----------------------------------------------------------------------
+#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);
+    aArgs[0] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );
+    aArgs[1] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );
+
+    ::ucbhelper::ContentBroker::initialize( xMS, aArgs );
+
+    aMyApp.Main();
+    DeInitVCL();
+    return 0;
+}
diff --git a/soldep/source/depapp.hxx b/soldep/source/depapp.hxx
index e6cb96a63832..cf8c1935c220 100644
--- a/soldep/source/depapp.hxx
+++ b/soldep/source/depapp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: depapp.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/source/depper.cxx b/soldep/source/depper.cxx
index c6a4b4899d54..11610ea1fcef 100644
--- a/soldep/source/depper.cxx
+++ b/soldep/source/depper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: depper.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/source/depwin.cxx b/soldep/source/depwin.cxx
index 2f4fe79cf410..5d7a1e36e4e7 100644
--- a/soldep/source/depwin.cxx
+++ b/soldep/source/depwin.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: depwin.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/source/graphwin.cxx b/soldep/source/graphwin.cxx
index bc120fae2671..7450d654ab38 100644
--- a/soldep/source/graphwin.cxx
+++ b/soldep/source/graphwin.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: graphwin.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/source/hashobj.cxx b/soldep/source/hashobj.cxx
index b9836316ed7b..7f05dc33870a 100644
--- a/soldep/source/hashobj.cxx
+++ b/soldep/source/hashobj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hashobj.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/source/makefile.mk b/soldep/source/makefile.mk
index 7ababf509010..5261ee5175f6 100644
--- a/soldep/source/makefile.mk
+++ b/soldep/source/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.17 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/source/objwin.cxx b/soldep/source/objwin.cxx
index baa24d41fce0..07eab4dd4cb7 100644
--- a/soldep/source/objwin.cxx
+++ b/soldep/source/objwin.cxx
@@ -1,824 +1,821 @@
-/*************************************************************************

- *

- * 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[] = {

-    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

-}

-

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

-/*****************************************************************************/

-{

-    Size aWinSize  = PixelToLogic( GetSizePixel() );

-    Size aTextSize;

-    ByteString sbt = msBodyText;                      

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

-    aTextSize.Height() = GetTextHeight();

-    Point aPos = GetPosPixel();

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

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

-    aTextPos += aPos;

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

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

-    if ( msBodyText !="null" ) 

-    {

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

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

-        Font aFont( GetFont() );

-        Size aSize = aFont.GetSize();

-        aSize = pDevice->PixelToLogic( aSize );

-        aFont.SetSize( aSize );

-        pDevice->SetFont( aFont );

-        pDevice->SetTextColor( GetTextColor() );

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

-    }

-}

-

-/*****************************************************************************/

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

-/*****************************************************************************/

-{

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

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#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[] = {
+    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
+}
+
+void ObjectWin::DrawOutput( OutputDevice* pDevice, const Point& rOffset )
+/*****************************************************************************/
+{
+    Size aWinSize  = PixelToLogic( GetSizePixel() );
+    Size aTextSize;
+    ByteString sbt = msBodyText;
+    aTextSize.Width() = GetTextWidth( String( msBodyText, RTL_TEXTENCODING_UTF8 ));
+    aTextSize.Height() = GetTextHeight();
+    Point aPos = GetPosPixel();
+    Point aTextPos( aWinSize.Width() / 2  - aTextSize.Width() / 2,
+                aWinSize.Height() / 2 - aTextSize.Height() / 2 );
+    aTextPos += aPos;
+    aPos = pDevice->PixelToLogic( aPos ) - rOffset;
+    aTextPos = pDevice->PixelToLogic( aTextPos ) - rOffset;
+    if ( msBodyText !="null" )
+    {
+        pDevice->SetFillColor( GetBackground().GetColor() );
+        pDevice->DrawRect( Rectangle( aPos, pDevice->PixelToLogic( GetSizePixel() ) ) );
+        Font aFont( GetFont() );
+        Size aSize = aFont.GetSize();
+        aSize = pDevice->PixelToLogic( aSize );
+        aFont.SetSize( aSize );
+        pDevice->SetFont( aFont );
+        pDevice->SetTextColor( GetTextColor() );
+        pDevice->DrawText( aTextPos, String( sbt, RTL_TEXTENCODING_UTF8 ) );
+    }
+}
+
+/*****************************************************************************/
+void ObjectWin::MouseButtonDown( const MouseEvent& rMEvt )
+/*****************************************************************************/
+{
+    //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/sdtresid.cxx b/soldep/source/sdtresid.cxx
index b4f3edb51d66..02977059f5c6 100644
--- a/soldep/source/sdtresid.cxx
+++ b/soldep/source/sdtresid.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdtresid.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/source/soldep.cxx b/soldep/source/soldep.cxx
index bc4d096f764e..ce94afbbab92 100644
--- a/soldep/source/soldep.cxx
+++ b/soldep/source/soldep.cxx
@@ -1,1810 +1,1807 @@
-/*************************************************************************

- *

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

-        case TID_SOLDEP_CREATEMETA :

-        {

-            VirtualDevice   aVDev;

-            aVDev.SetMapMode( MAP_100TH_MM );

-            GDIMetaFile     aMtf;

-            aVDev.EnableOutput( FALSE );

-            aMtf.Record( &aVDev );

-

-            aVDev.SetLineColor( Color( COL_BLACK ) );

-            aVDev.SetTextAlign( ALIGN_TOP );

-

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

-            long nXMin = aSize.Width();

-            long nXMax = 0;

-            long nYMax = 0;

-            long nYMin = aSize.Height();

-

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

-            {

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

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

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

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

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

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

-            }

-

-            Point aOffset( nXMin, nYMin );

-            aOffset = aVDev.PixelToLogic( aOffset );

-

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

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

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

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

-

-            aMtf.Stop();

-            aMtf.WindStart();

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

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

-            aDevSize =  aVDev.PixelToLogic( aDevSize );

-            aMtf.SetPrefSize( aDevSize );

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

-            aMtf.Write( aStream );

-            break;

-        }

-        case TID_SOLDEP_HIDE_INDEPENDEND:

-            {

-                ToggleHideDependency();

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

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

-

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

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

-            }

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

-    }

-}

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+//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;
+        case TID_SOLDEP_CREATEMETA :
+        {
+            VirtualDevice   aVDev;
+            aVDev.SetMapMode( MAP_100TH_MM );
+            GDIMetaFile     aMtf;
+            aVDev.EnableOutput( FALSE );
+            aMtf.Record( &aVDev );
+
+            aVDev.SetLineColor( Color( COL_BLACK ) );
+            aVDev.SetTextAlign( ALIGN_TOP );
+
+            Size aSize( GetDepWin()->GetOutputSizePixel() );
+            long nXMin = aSize.Width();
+            long nXMax = 0;
+            long nYMax = 0;
+            long nYMin = aSize.Height();
+
+            for ( USHORT i=0; i<mpObjectList->Count(); i++ )
+            {
+                Point aPoint = mpObjectList->GetObject(i)->GetPosPixel();
+                Size aSize = mpObjectList->GetObject(i)->GetSizePixel();
+                nXMin = MIN( aPoint.X(), nXMin );
+                nXMax = MAX( aPoint.X() + aSize.Width(), nXMax );
+                nYMin = MIN( aPoint.Y(), nYMin );
+                nYMax = MAX( aPoint.Y() + aSize.Height(), nYMax );
+            }
+
+            Point aOffset( nXMin, nYMin );
+            aOffset = aVDev.PixelToLogic( aOffset );
+
+            GetDepWin()->DrawOutput( &aVDev, aOffset );
+            for ( USHORT i=0; i<mpObjectList->Count(); i++ )
+                if ( mpObjectList->GetObject(i)->IsVisible() )
+                    mpObjectList->GetObject(i)->DrawOutput( &aVDev, aOffset );
+
+            aMtf.Stop();
+            aMtf.WindStart();
+            aMtf.SetPrefMapMode( aVDev.GetMapMode() );
+            Size aDevSize( nXMax-nXMin + 10, nYMax-nYMin + 10);
+            aDevSize =  aVDev.PixelToLogic( aDevSize );
+            aMtf.SetPrefSize( aDevSize );
+            SvFileStream aStream( String::CreateFromAscii("d:\\out.svm"), STREAM_STD_READWRITE );
+            aMtf.Write( aStream );
+            break;
+        }
+        case TID_SOLDEP_HIDE_INDEPENDEND:
+            {
+                ToggleHideDependency();
+                for ( USHORT i=0; i<mpObjectList->Count(); i++ )
+                    mpObjectList->GetObject(i)->SetViewMask(!mbIsHide);
+
+                   maToolBox.CheckItem(TID_SOLDEP_HIDE_INDEPENDEND, IsHideMode());
+                   GetDepWin()->Invalidate(); //repaint Main-View
+            }
+            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/soldep/source/soldlg.cxx b/soldep/source/soldlg.cxx
index f49562c2cd27..96ad469f8284 100644
--- a/soldep/source/soldlg.cxx
+++ b/soldep/source/soldlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soldlg.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/source/soldlg.src b/soldep/source/soldlg.src
index 9d9897971826..0f5035fcee6e 100644
--- a/soldep/source/soldlg.src
+++ b/soldep/source/soldlg.src
@@ -1,377 +1,374 @@
-/*************************************************************************

- *

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

- * 

- * Copyright 2008 by Sun Microsystems, Inc.

- *

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

- *

- * $RCSfile: soldlg.src,v $

- * $Revision: 1.7 $

- *

- * This file is part of OpenOffice.org.

- *

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

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

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

- *

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

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

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

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

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

- *

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

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

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

- * for a copy of the LGPLv3 License.

- *

- ************************************************************************/

-

-#include <dtsodcmp.hrc>

-#include <soldep/soldlg.hrc>

-

-//========================================================================

-// Dialogs

-ModalDialog RID_SD_DIALOG_NEWPROJECT

-{

-    OutputSize = TRUE;

-    Text = "New Project";

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

-    SVLook = TRUE;

-    MOVEABLE = TRUE;

-    CLOSEABLE = TRUE;

-    OKButton BTN_OK

-    {

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

-        TabStop = TRUE;

-        Hide = FALSE;

-        DefButton = TRUE;

-    };

-    CancelButton BTN_CANCEL {

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

-        TabStop = TRUE;

-    };

-    FixedText FT_PRJNAME {

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

-        Text = "Project Name";

-    };

-    Edit EDIT_PRJNAME {

-        Border = TRUE;

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

-    };

-    FixedText FT_PRJSHORT {

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

-        Text = "Project Short Name";

-    };

-    Edit EDIT_PRJSHORT {

-        Border = TRUE;

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

-    };

-    FixedText FT_PRJDEPS {

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

-        Text = "Project Depends on";

-    };

-    Edit EDIT_PRJDEPS {

-        Border = TRUE;

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

-    };

-};

-

-ModalDialog RID_SD_DIALOG_NEWDIRECTORY

-{

-    OutputSize = TRUE;

-    Text = "New Directory";

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

-    SVLook = TRUE;

-    MOVEABLE = TRUE;

-    CLOSEABLE = TRUE;

-    OKButton BTN_OK

-    {

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

-        TabStop = TRUE;

-        Hide = FALSE;

-        DefButton = TRUE;

-    };

-    CancelButton BTN_CANCEL {

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

-        TabStop = TRUE;

-    };

-    FixedText FT_DIRNAME {

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

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

-    };

-    Edit EDIT_DIRNAME {

-        Border = TRUE;

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

-    };

-    FixedText FT_DIRFLAG {

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

-        Text = "Directory Flag";

-    };

-    Edit EDIT_DIRFLAG {

-        Border = TRUE;

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

-    };

-    FixedText FT_DIRDEPS {

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

-        Text = "Directory Depends on";

-    };

-    Edit EDIT_DIRDEPS {

-        Border = TRUE;

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

-    };

-    FixedText FT_DIRACTION {

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

-        Text = "What To Do";

-    };

-    Edit EDIT_DIRACTION {

-        Border = TRUE;

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

-    };

-    FixedText FT_DIRENV {

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

-        Text = "Which Environments";

-    };

-    Edit EDIT_DIRENV {

-        Border = TRUE;

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

-    };

-};

-

-

-ModalDialog RID_SD_DIALOG_HELP

-{

-    OutputSize = TRUE;

-    Text = "Help";

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

-    SVLook = TRUE;

-    MOVEABLE = TRUE;

-    CLOSEABLE = TRUE;

-    OKButton BTN_OK

-    {

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

-        TabStop = TRUE;

-        Hide = FALSE;

-        DefButton = TRUE;

-    };

-    MultiLineEdit EDIT_HELP {

-        Border = TRUE;

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

-    };

-};

-

-ModalDialog DLG_VERSIONSELECT {

-    OutputSize = TRUE;

-    Pos = MAP_APPFONT( 92, 40 );

-    Size = MAP_APPFONT( 161, 98 );

-    Text = "Open workspace";

-    Moveable = TRUE;

-    Closeable = TRUE;

-    ListBox DLG_VERSIONSELECT_LISTBOX {

-            Border = TRUE;

-            Pos = MAP_APPFONT( 8, 16 );

-            Size = MAP_APPFONT( 96, 72 );

-            TabStop = TRUE;

-        };

-    GroupBox DLG_VERSIONSELECT_GROUP {

-            Pos = MAP_APPFONT( 4, 4 );

-            Size = MAP_APPFONT( 104, 88 );

-            Text = "Workspaces";

-        };

-    OKButton DLG_VERSIONSELECT_OK {

-            Pos = MAP_APPFONT( 116, 64 );

-            Size = MAP_APPFONT( 40, 12 );

-            DefButton = TRUE;

-            TabStop = TRUE;

-        };

-    CancelButton DLG_VERSIONSELECT_CANCEL {

-            Pos = MAP_APPFONT( 116, 80 );

-            Size = MAP_APPFONT( 40, 12 );

-            TabStop = TRUE;

-        };

-    GroupBox DLG_MINORSELECT_GROUP {

-            Pos = MAP_APPFONT( 110, 4 );

-            Size = MAP_APPFONT( 47, 30 );

-            Text = "Minor";

-        };

-    Edit    DLG_MINORSELECT_EDIT {

-            Border = TRUE;

-            Pos = MAP_APPFONT( 115, 16 );

-            Size = MAP_APPFONT( 36, 12 );

-            TabStop = TRUE;

-        };

-};

-

-ModelessDialog DLG_AUTOARRANGE {

-    OutputSize = TRUE;

-    Pos = MAP_APPFONT( 40, 12 );

-    Size = MAP_APPFONT( 225, 82 );

-    Text = "Autoarrange";

-    Moveable = TRUE;

-    GroupBox DLG_AUTOARRANGE_GROUP {

-            Pos = MAP_APPFONT( 4, 4 );

-            Size = MAP_APPFONT( 216, 72 );

-            Text = "Progress";

-        };

-    FixedText DLG_AUTOARRANGE_TEXT_MODULE {

-            Pos = MAP_APPFONT( 8, 16 );

-            Size = MAP_APPFONT( 208, 10 );

-            Text = "";

-        };

-    FixedText DLG_AUTOARRANGE_TEXT_OVERALL {

-            Pos = MAP_APPFONT( 8, 48 );

-            Size = MAP_APPFONT( 208, 10 );

-            Text = "";

-        };

-};

-

-ModalDialog DLG_FIND_PROJECT {

-    OutputSize = TRUE;

-    Pos = MAP_APPFONT( 40, 12 );

-    Size = MAP_APPFONT( 155, 55 );

-    Text = "Find Project";

-    Moveable = TRUE;

-    SVLook          = TRUE;

-    ComboBox DLG_FIND_PROJECT_COMBOBOX

-    {

-        Pos = MAP_APPFONT ( 5 , 18 ) ;

-        Size = MAP_APPFONT ( 100 , 90 ) ;

-        TabStop = TRUE ;

-        DropDown = TRUE ;

-        VScroll = TRUE ;

-        Sort = TRUE ;

-    };

-    OKButton DLG_FIND_PROJECT_OK {

-            Pos = MAP_APPFONT( 110, 10 );

-            Size = MAP_APPFONT( 40, 12 );

-            DefButton = TRUE;

-            TabStop = TRUE;

-        };

-    CancelButton DLG_FIND_PROJECT_CANCEL {

-            Pos = MAP_APPFONT( 110, 26 );

-            Size = MAP_APPFONT( 40, 12 );

-            TabStop = TRUE;

-        };

-};

-

-ToolBox TID_SOLDEP_MAIN

-{

-    ButtonType      = BUTTON_SYMBOL;

-    Align           = BOXALIGN_TOP;

-        LineCount       = 1;

-        SVLook          = TRUE;

-        Border          = TRUE;

-        Sizeable                = TRUE;

-        Dockable                = TRUE;

-        Scroll                  = TRUE;

-        Moveable                = TRUE;

-        Closeable               = TRUE;

-        Zoomable                = TRUE;

-        ItemList        =

-        {

-                ToolBoxItem

-                {

-                        Identifier      = TID_SOLDEP_OPEN;

-                        Type            = TOOLBOXITEM_BUTTON;

-                        Text            = "Load";

-                        HelpId          = TID_SOLDEP_OPEN;

-                        HelpText        = "Load";

-                        Checkable               = TRUE;

-                        ItemBitmap      = Bitmap

-                        {

-                                File = "sx03190.png";

-                        };

-                };

-                ToolBoxItem

-                {

-                        Identifier      = TID_SOLDEP_SAVE;

-                        Type            = TOOLBOXITEM_BUTTON;

-                        Text            = "Save";

-                        HelpId          = TID_SOLDEP_SAVE;

-                        HelpText        = "Save";

-                        Checkable               = TRUE;

-                        ItemBitmap      = Bitmap

-                        {

-                                File = "sc05505.png";

-                        };

-                };

-                ToolBoxItem

-                {

-                         Type            = TOOLBOXITEM_SEPARATOR;

-                };

-                ToolBoxItem

-                {

-                        Identifier      = TID_SOLDEP_SELECT_WORKSPACE;

-                        Type            = TOOLBOXITEM_BUTTON;

-                        Text            = "Select Workspace";

-                        HelpId          = TID_SOLDEP_HIDE_INDEPENDEND;

-                        HelpText        = "Select Workspace";

-                        Checkable               = TRUE;

-                        ItemBitmap      = Bitmap

-                        {

-                                File = "selectupd_16.png";

-                        };

-                };

-                ToolBoxItem

-                {

-                        Identifier      = TID_SOLDEP_FIND;

-                        Type            = TOOLBOXITEM_BUTTON;

-                        Text            = "Find Module";

-                        HelpId          = TID_SOLDEP_FIND;

-                        HelpText        = "Find Module";

-                        Checkable               = TRUE;

-                        ItemBitmap      = Bitmap

-                        {

-                                File = "sc05961.png";

-                        };

-                };

-                ToolBoxItem

-                {

-                        Identifier      = TID_SOLDEP_BACK;

-                        Type            = TOOLBOXITEM_BUTTON;

-                        Text            = "Back to Overview";

-                        HelpId          = TID_SOLDEP_BACK;

-                        HelpText        = "Back to Overview";

-                        Checkable               = TRUE;

-                        ItemBitmap      = Bitmap

-                        {

-                                File = "arrowup_16.png";

-                        };

-                };

-                ToolBoxItem

-                {

-                        Identifier      = TID_SOLDEP_HIDE_INDEPENDEND;

-                        Type            = TOOLBOXITEM_BUTTON;

-                        Text            = "Hide Independend Modules";

-                        HelpId          = TID_SOLDEP_HIDE_INDEPENDEND;

-                        HelpText        = "Hide Independend Modules";

-                        Checkable               = TRUE;

-                        ItemBitmap      = Bitmap

-                        {

-                                File = "hidedependency_16.png";

-                        };

-                };

-                ToolBoxItem

-                {

-                        Identifier      = TID_SOLDEP_CREATEMETA;

-                        Type            = TOOLBOXITEM_BUTTON;

-                        Text            = "Create MetaFile";

-                        Checkable       = TRUE;

-                };                

-        };

-};

-

-/*****************************************************************************/

-Bitmap TID_SMALL_PIN_PINED

-/*****************************************************************************/

-{

-    File = "ballgreen_7.png";

-};

-

-/*****************************************************************************/

-Bitmap TID_SMALL_PIN_UNPINED

-/*****************************************************************************/

-{

-    File = "ballred_7.png";

-};

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <dtsodcmp.hrc>
+#include <soldep/soldlg.hrc>
+
+//========================================================================
+// Dialogs
+ModalDialog RID_SD_DIALOG_NEWPROJECT
+{
+    OutputSize = TRUE;
+    Text = "New Project";
+    PosSize = MAP_SYSFONT(18,18,142,142);
+    SVLook = TRUE;
+    MOVEABLE = TRUE;
+    CLOSEABLE = TRUE;
+    OKButton BTN_OK
+    {
+        PosSize = MAP_SYSFONT(5,123,40,14);
+        TabStop = TRUE;
+        Hide = FALSE;
+        DefButton = TRUE;
+    };
+    CancelButton BTN_CANCEL {
+        PosSize = MAP_SYSFONT(50,123,40,14);
+        TabStop = TRUE;
+    };
+    FixedText FT_PRJNAME {
+        PosSize = MAP_SYSFONT( 5, 10, 100, 10 );
+        Text = "Project Name";
+    };
+    Edit EDIT_PRJNAME {
+        Border = TRUE;
+        PosSize = MAP_SYSFONT(5,20,132,10);
+    };
+    FixedText FT_PRJSHORT {
+        PosSize = MAP_SYSFONT( 5, 30, 100, 10 );
+        Text = "Project Short Name";
+    };
+    Edit EDIT_PRJSHORT {
+        Border = TRUE;
+        PosSize = MAP_SYSFONT(5,40,132,10);
+    };
+    FixedText FT_PRJDEPS {
+        PosSize = MAP_SYSFONT( 5, 50, 100, 10 );
+        Text = "Project Depends on";
+    };
+    Edit EDIT_PRJDEPS {
+        Border = TRUE;
+        PosSize = MAP_SYSFONT(5,60,132,10);
+    };
+};
+
+ModalDialog RID_SD_DIALOG_NEWDIRECTORY
+{
+    OutputSize = TRUE;
+    Text = "New Directory";
+    PosSize = MAP_SYSFONT(18,18,142,142);
+    SVLook = TRUE;
+    MOVEABLE = TRUE;
+    CLOSEABLE = TRUE;
+    OKButton BTN_OK
+    {
+        PosSize = MAP_SYSFONT(5,123,40,14);
+        TabStop = TRUE;
+        Hide = FALSE;
+        DefButton = TRUE;
+    };
+    CancelButton BTN_CANCEL {
+        PosSize = MAP_SYSFONT(50,123,40,14);
+        TabStop = TRUE;
+    };
+    FixedText FT_DIRNAME {
+        PosSize = MAP_SYSFONT( 5, 10, 132, 10 );
+        Text = "Directory Name ( with projectname )";
+    };
+    Edit EDIT_DIRNAME {
+        Border = TRUE;
+        PosSize = MAP_SYSFONT(5,20,132,10);
+    };
+    FixedText FT_DIRFLAG {
+        PosSize = MAP_SYSFONT( 5, 30, 100, 10 );
+        Text = "Directory Flag";
+    };
+    Edit EDIT_DIRFLAG {
+        Border = TRUE;
+        PosSize = MAP_SYSFONT(5,40,132,10);
+    };
+    FixedText FT_DIRDEPS {
+        PosSize = MAP_SYSFONT( 5, 50, 100, 10 );
+        Text = "Directory Depends on";
+    };
+    Edit EDIT_DIRDEPS {
+        Border = TRUE;
+        PosSize = MAP_SYSFONT(5,60,132,10);
+    };
+    FixedText FT_DIRACTION {
+        PosSize = MAP_SYSFONT( 5, 70, 100, 10 );
+        Text = "What To Do";
+    };
+    Edit EDIT_DIRACTION {
+        Border = TRUE;
+        PosSize = MAP_SYSFONT(5,80,132,10);
+    };
+    FixedText FT_DIRENV {
+        PosSize = MAP_SYSFONT( 5, 90, 100, 10 );
+        Text = "Which Environments";
+    };
+    Edit EDIT_DIRENV {
+        Border = TRUE;
+        PosSize = MAP_SYSFONT(5,100,132,10);
+    };
+};
+
+
+ModalDialog RID_SD_DIALOG_HELP
+{
+    OutputSize = TRUE;
+    Text = "Help";
+    PosSize = MAP_SYSFONT(18,18,242,242);
+    SVLook = TRUE;
+    MOVEABLE = TRUE;
+    CLOSEABLE = TRUE;
+    OKButton BTN_OK
+    {
+        PosSize = MAP_SYSFONT(101,223,40,14);
+        TabStop = TRUE;
+        Hide = FALSE;
+        DefButton = TRUE;
+    };
+    MultiLineEdit EDIT_HELP {
+        Border = TRUE;
+        PosSize = MAP_SYSFONT(5,5,232,213);
+    };
+};
+
+ModalDialog DLG_VERSIONSELECT {
+    OutputSize = TRUE;
+    Pos = MAP_APPFONT( 92, 40 );
+    Size = MAP_APPFONT( 161, 98 );
+    Text = "Open workspace";
+    Moveable = TRUE;
+    Closeable = TRUE;
+    ListBox DLG_VERSIONSELECT_LISTBOX {
+            Border = TRUE;
+            Pos = MAP_APPFONT( 8, 16 );
+            Size = MAP_APPFONT( 96, 72 );
+            TabStop = TRUE;
+        };
+    GroupBox DLG_VERSIONSELECT_GROUP {
+            Pos = MAP_APPFONT( 4, 4 );
+            Size = MAP_APPFONT( 104, 88 );
+            Text = "Workspaces";
+        };
+    OKButton DLG_VERSIONSELECT_OK {
+            Pos = MAP_APPFONT( 116, 64 );
+            Size = MAP_APPFONT( 40, 12 );
+            DefButton = TRUE;
+            TabStop = TRUE;
+        };
+    CancelButton DLG_VERSIONSELECT_CANCEL {
+            Pos = MAP_APPFONT( 116, 80 );
+            Size = MAP_APPFONT( 40, 12 );
+            TabStop = TRUE;
+        };
+    GroupBox DLG_MINORSELECT_GROUP {
+            Pos = MAP_APPFONT( 110, 4 );
+            Size = MAP_APPFONT( 47, 30 );
+            Text = "Minor";
+        };
+    Edit    DLG_MINORSELECT_EDIT {
+            Border = TRUE;
+            Pos = MAP_APPFONT( 115, 16 );
+            Size = MAP_APPFONT( 36, 12 );
+            TabStop = TRUE;
+        };
+};
+
+ModelessDialog DLG_AUTOARRANGE {
+    OutputSize = TRUE;
+    Pos = MAP_APPFONT( 40, 12 );
+    Size = MAP_APPFONT( 225, 82 );
+    Text = "Autoarrange";
+    Moveable = TRUE;
+    GroupBox DLG_AUTOARRANGE_GROUP {
+            Pos = MAP_APPFONT( 4, 4 );
+            Size = MAP_APPFONT( 216, 72 );
+            Text = "Progress";
+        };
+    FixedText DLG_AUTOARRANGE_TEXT_MODULE {
+            Pos = MAP_APPFONT( 8, 16 );
+            Size = MAP_APPFONT( 208, 10 );
+            Text = "";
+        };
+    FixedText DLG_AUTOARRANGE_TEXT_OVERALL {
+            Pos = MAP_APPFONT( 8, 48 );
+            Size = MAP_APPFONT( 208, 10 );
+            Text = "";
+        };
+};
+
+ModalDialog DLG_FIND_PROJECT {
+    OutputSize = TRUE;
+    Pos = MAP_APPFONT( 40, 12 );
+    Size = MAP_APPFONT( 155, 55 );
+    Text = "Find Project";
+    Moveable = TRUE;
+    SVLook          = TRUE;
+    ComboBox DLG_FIND_PROJECT_COMBOBOX
+    {
+        Pos = MAP_APPFONT ( 5 , 18 ) ;
+        Size = MAP_APPFONT ( 100 , 90 ) ;
+        TabStop = TRUE ;
+        DropDown = TRUE ;
+        VScroll = TRUE ;
+        Sort = TRUE ;
+    };
+    OKButton DLG_FIND_PROJECT_OK {
+            Pos = MAP_APPFONT( 110, 10 );
+            Size = MAP_APPFONT( 40, 12 );
+            DefButton = TRUE;
+            TabStop = TRUE;
+        };
+    CancelButton DLG_FIND_PROJECT_CANCEL {
+            Pos = MAP_APPFONT( 110, 26 );
+            Size = MAP_APPFONT( 40, 12 );
+            TabStop = TRUE;
+        };
+};
+
+ToolBox TID_SOLDEP_MAIN
+{
+    ButtonType      = BUTTON_SYMBOL;
+    Align           = BOXALIGN_TOP;
+        LineCount       = 1;
+        SVLook          = TRUE;
+        Border          = TRUE;
+        Sizeable                = TRUE;
+        Dockable                = TRUE;
+        Scroll                  = TRUE;
+        Moveable                = TRUE;
+        Closeable               = TRUE;
+        Zoomable                = TRUE;
+        ItemList        =
+        {
+                ToolBoxItem
+                {
+                        Identifier      = TID_SOLDEP_OPEN;
+                        Type            = TOOLBOXITEM_BUTTON;
+                        Text            = "Load";
+                        HelpId          = TID_SOLDEP_OPEN;
+                        HelpText        = "Load";
+                        Checkable               = TRUE;
+                        ItemBitmap      = Bitmap
+                        {
+                                File = "sx03190.png";
+                        };
+                };
+                ToolBoxItem
+                {
+                        Identifier      = TID_SOLDEP_SAVE;
+                        Type            = TOOLBOXITEM_BUTTON;
+                        Text            = "Save";
+                        HelpId          = TID_SOLDEP_SAVE;
+                        HelpText        = "Save";
+                        Checkable               = TRUE;
+                        ItemBitmap      = Bitmap
+                        {
+                                File = "sc05505.png";
+                        };
+                };
+                ToolBoxItem
+                {
+                         Type            = TOOLBOXITEM_SEPARATOR;
+                };
+                ToolBoxItem
+                {
+                        Identifier      = TID_SOLDEP_SELECT_WORKSPACE;
+                        Type            = TOOLBOXITEM_BUTTON;
+                        Text            = "Select Workspace";
+                        HelpId          = TID_SOLDEP_HIDE_INDEPENDEND;
+                        HelpText        = "Select Workspace";
+                        Checkable               = TRUE;
+                        ItemBitmap      = Bitmap
+                        {
+                                File = "selectupd_16.png";
+                        };
+                };
+                ToolBoxItem
+                {
+                        Identifier      = TID_SOLDEP_FIND;
+                        Type            = TOOLBOXITEM_BUTTON;
+                        Text            = "Find Module";
+                        HelpId          = TID_SOLDEP_FIND;
+                        HelpText        = "Find Module";
+                        Checkable               = TRUE;
+                        ItemBitmap      = Bitmap
+                        {
+                                File = "sc05961.png";
+                        };
+                };
+                ToolBoxItem
+                {
+                        Identifier      = TID_SOLDEP_BACK;
+                        Type            = TOOLBOXITEM_BUTTON;
+                        Text            = "Back to Overview";
+                        HelpId          = TID_SOLDEP_BACK;
+                        HelpText        = "Back to Overview";
+                        Checkable               = TRUE;
+                        ItemBitmap      = Bitmap
+                        {
+                                File = "arrowup_16.png";
+                        };
+                };
+                ToolBoxItem
+                {
+                        Identifier      = TID_SOLDEP_HIDE_INDEPENDEND;
+                        Type            = TOOLBOXITEM_BUTTON;
+                        Text            = "Hide Independend Modules";
+                        HelpId          = TID_SOLDEP_HIDE_INDEPENDEND;
+                        HelpText        = "Hide Independend Modules";
+                        Checkable               = TRUE;
+                        ItemBitmap      = Bitmap
+                        {
+                                File = "hidedependency_16.png";
+                        };
+                };
+                ToolBoxItem
+                {
+                        Identifier      = TID_SOLDEP_CREATEMETA;
+                        Type            = TOOLBOXITEM_BUTTON;
+                        Text            = "Create MetaFile";
+                        Checkable       = TRUE;
+                };
+        };
+};
+
+/*****************************************************************************/
+Bitmap TID_SMALL_PIN_PINED
+/*****************************************************************************/
+{
+    File = "ballgreen_7.png";
+};
+
+/*****************************************************************************/
+Bitmap TID_SMALL_PIN_UNPINED
+/*****************************************************************************/
+{
+    File = "ballred_7.png";
+};
diff --git a/soldep/source/tbox.cxx b/soldep/source/tbox.cxx
index fe693e4a7fd0..327941167808 100644
--- a/soldep/source/tbox.cxx
+++ b/soldep/source/tbox.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tbox.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soldep/util/perl.mk b/soldep/util/perl.mk
index 21591d1b1ecb..733459a96394 100644
--- a/soldep/util/perl.mk
+++ b/soldep/util/perl.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: perl.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/addsym.awk b/solenv/bin/addsym.awk
index b9a1e6e18f66..c7b02e15db35 100644
--- a/solenv/bin/addsym.awk
+++ b/solenv/bin/addsym.awk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: header.hxx,v $
-#
-# $Revision: 1.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 5b4d4622754a..5775468d0ead 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -5,14 +5,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: build.pl,v $
-#
-# $Revision: 1.171 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/build_client.pl b/solenv/bin/build_client.pl
index 8c8151f0a9b8..54a5c4f84de2 100755
--- a/solenv/bin/build_client.pl
+++ b/solenv/bin/build_client.pl
@@ -5,14 +5,10 @@ eval 'exec perl -S $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: build_client.pl,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/checkdll.sh b/solenv/bin/checkdll.sh
index e64b8fd2aa4c..e8faa516a852 100755
--- a/solenv/bin/checkdll.sh
+++ b/solenv/bin/checkdll.sh
@@ -3,14 +3,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: header.hxx,v $
-#
-# $Revision: 1.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/cleandiff.pl b/solenv/bin/cleandiff.pl
index 6b2e1fbe7244..c7fc80487a7f 100644
--- a/solenv/bin/cleandiff.pl
+++ b/solenv/bin/cleandiff.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: cleandiff.pl,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/cleanzip.pl b/solenv/bin/cleanzip.pl
index 87ff24ffa7ef..8103a13945b1 100755
--- a/solenv/bin/cleanzip.pl
+++ b/solenv/bin/cleanzip.pl
@@ -3,14 +3,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: cleanzip.pl,v $
-#
-# $Revision$
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/clipatchconfig.pl b/solenv/bin/clipatchconfig.pl
index aa73d86991d2..365e0bb14950 100644
--- a/solenv/bin/clipatchconfig.pl
+++ b/solenv/bin/clipatchconfig.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: clipatchconfig.pl,v $
-#
-# $Revision: 1.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/convertlinks.pl b/solenv/bin/convertlinks.pl
index c8644aa4c9af..09b298bd5ea5 100644
--- a/solenv/bin/convertlinks.pl
+++ b/solenv/bin/convertlinks.pl
@@ -2,7 +2,7 @@
 # convertlinks - a perl script to make hrefs to
 # http://api.openoffice.org/common/ref relativ.
 #
-# Copyright (c) 2000 Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 
 use File::Find;
diff --git a/solenv/bin/converttags.pl b/solenv/bin/converttags.pl
index 641b83d696b6..aa2fe63c6ce8 100644
--- a/solenv/bin/converttags.pl
+++ b/solenv/bin/converttags.pl
@@ -2,7 +2,7 @@
 # converttags - a perl script to coonvert some predefined tags
 # to user specified values
 #
-# Copyright (c) 2000 Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 
 if($#ARGV == -1)
diff --git a/solenv/bin/createpdbrelocators.pl b/solenv/bin/createpdbrelocators.pl
index 8b6218adbab2..75047f3952f5 100644
--- a/solenv/bin/createpdbrelocators.pl
+++ b/solenv/bin/createpdbrelocators.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: createpdbrelocators.pl,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/cws.pl b/solenv/bin/cws.pl
index 801d62add78c..f3e3f9a7a722 100644
--- a/solenv/bin/cws.pl
+++ b/solenv/bin/cws.pl
@@ -3,14 +3,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: cws.pl,v $
-#
-# $Revision: 1.1.2.14 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/cwsattach.pl b/solenv/bin/cwsattach.pl
index 60ad81f2f152..05e1b8df3cb4 100644
--- a/solenv/bin/cwsattach.pl
+++ b/solenv/bin/cwsattach.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: cwsattach.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/cwscheckapi b/solenv/bin/cwscheckapi
index ddb56fd1d7c1..63712be76623 100755
--- a/solenv/bin/cwscheckapi
+++ b/solenv/bin/cwscheckapi
@@ -1,15 +1,12 @@
 #!/bin/bash
 #*************************************************************************
+#
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: cwscheckapi,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,6 +23,7 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
+#
 #***********************************************************************/
 
 
diff --git a/solenv/bin/cwscheckapi.btm b/solenv/bin/cwscheckapi.btm
index 64c624dd4bba..73f8da0e6d39 100755
--- a/solenv/bin/cwscheckapi.btm
+++ b/solenv/bin/cwscheckapi.btm
@@ -1,15 +1,12 @@
 @echo off
 REM **************************************************************************
+REM *
 REM * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM * 
-REM * Copyright 2008 by Sun Microsystems, Inc.
+REM * Copyright 2000, 2010 Oracle and/or its affiliates.
 REM *
 REM * OpenOffice.org - a multi-platform office productivity suite
 REM *
-REM * $RCSfile: cwscheckapi.btm,v $
-REM *
-REM * $Revision: 1.3.6.4 $
-REM *
 REM * This file is part of OpenOffice.org.
 REM *
 REM * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,6 +23,7 @@ REM * You should have received a copy of the GNU Lesser General Public License
 REM * version 3 along with OpenOffice.org.  If not, see
 REM * <http://www.openoffice.org/license.html>
 REM * for a copy of the LGPLv3 License.
+REM *
 REM ************************************************************************/
 
 rem echo on
diff --git a/solenv/bin/cwstestresult.pl b/solenv/bin/cwstestresult.pl
index c786870b4c61..43b41ff7b5e8 100644
--- a/solenv/bin/cwstestresult.pl
+++ b/solenv/bin/cwstestresult.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: cwsattach.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/cwstouched.pl b/solenv/bin/cwstouched.pl
index 03e5095e78b4..eb306277580c 100755
--- a/solenv/bin/cwstouched.pl
+++ b/solenv/bin/cwstouched.pl
@@ -5,7 +5,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #*************************************************************************
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,6 +25,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
+#
 #***********************************************************************/
 
 use strict;
diff --git a/solenv/bin/cwstouched.py b/solenv/bin/cwstouched.py
index 6ed3e67757b2..87dfe4b03595 100755
--- a/solenv/bin/cwstouched.py
+++ b/solenv/bin/cwstouched.py
@@ -3,7 +3,7 @@
 #*************************************************************************
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -23,6 +23,7 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
+#
 #***********************************************************************/
 
 import os
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 0d6c8b27afa4..2f642b5b6ed4 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: deliver.pl,v $
-#
-# $Revision$
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/diffmv.pl b/solenv/bin/diffmv.pl
index 3bd1065b9569..89e5e4fd9ffb 100755
--- a/solenv/bin/diffmv.pl
+++ b/solenv/bin/diffmv.pl
@@ -5,14 +5,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: diffmv.pl,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/exectest.pl b/solenv/bin/exectest.pl
index 552935eb5b6b..d343cf298017 100644
--- a/solenv/bin/exectest.pl
+++ b/solenv/bin/exectest.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: exectest.pl,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/gccinstlib.pl b/solenv/bin/gccinstlib.pl
index 6b2ec3170641..7c9ac4b24c2e 100644..100755
--- a/solenv/bin/gccinstlib.pl
+++ b/solenv/bin/gccinstlib.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: gccinstlib.pl,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/gen_update_info.pl b/solenv/bin/gen_update_info.pl
index d1a2e1ba2dee..ae2aa6f251e0 100644
--- a/solenv/bin/gen_update_info.pl
+++ b/solenv/bin/gen_update_info.pl
@@ -6,14 +6,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: gen_update_info.pl,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/gen_userfeedback_VCL_names.pl b/solenv/bin/gen_userfeedback_VCL_names.pl
index 2e5ed3cf2588..e65968e6b6c2 100755
--- a/solenv/bin/gen_userfeedback_VCL_names.pl
+++ b/solenv/bin/gen_userfeedback_VCL_names.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: ,v $
-#
-# $Revision:  $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/getcompver.awk b/solenv/bin/getcompver.awk
index 7b471294180c..068960481130 100644
--- a/solenv/bin/getcompver.awk
+++ b/solenv/bin/getcompver.awk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: header.hxx,v $
-#
-# $Revision: 1.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/getcsym.awk b/solenv/bin/getcsym.awk
index daa3a81fad60..9490a06b3535 100644
--- a/solenv/bin/getcsym.awk
+++ b/solenv/bin/getcsym.awk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: getcsym.awk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/guw.pl b/solenv/bin/guw.pl
index 9839a5d637d7..c5326204eb49 100755
--- a/solenv/bin/guw.pl
+++ b/solenv/bin/guw.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: guw.pl,v $
-#
-# $Revision: 1.28 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/hicontrast-to-theme.pl b/solenv/bin/hicontrast-to-theme.pl
index 531762889914..027d7405dab2 100644
--- a/solenv/bin/hicontrast-to-theme.pl
+++ b/solenv/bin/hicontrast-to-theme.pl
@@ -5,14 +5,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: hicontrast-to-theme.pl,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/installoffice b/solenv/bin/installoffice
index 29645688b56a..59ad271ee142 100755
--- a/solenv/bin/installoffice
+++ b/solenv/bin/installoffice
@@ -1,8 +1,9 @@
 #!/bin/bash
 #*************************************************************************
+#
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -22,6 +23,7 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
+#
 #***********************************************************************/
 
 EXIT_SUCCESS=0
diff --git a/solenv/bin/installoffice.btm b/solenv/bin/installoffice.btm
index ffd6633fafcd..a77f8defeb45 100755
--- a/solenv/bin/installoffice.btm
+++ b/solenv/bin/installoffice.btm
@@ -1,15 +1,12 @@
 @echo off
 REM **************************************************************************
+REM * 
 REM * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM * 
-REM * Copyright 2008 by Sun Microsystems, Inc.
+REM * Copyright 2000, 2010 Oracle and/or its affiliates.
 REM *
 REM * OpenOffice.org - a multi-platform office productivity suite
 REM *
-REM * $RCSfile: installoffice.btm,v $
-REM *
-REM * $Revision: 1.3.6.1 $
-REM *
 REM * This file is part of OpenOffice.org.
 REM *
 REM * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,6 +23,7 @@ REM * You should have received a copy of the GNU Lesser General Public License
 REM * version 3 along with OpenOffice.org.  If not, see
 REM * <http://www.openoffice.org/license.html>
 REM * for a copy of the LGPLv3 License.
+REM * 
 REM ************************************************************************/
 
 
diff --git a/solenv/bin/installoffice.pl b/solenv/bin/installoffice.pl
index 0d297e289b3f..b6c852ae8624 100755
--- a/solenv/bin/installoffice.pl
+++ b/solenv/bin/installoffice.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #*************************************************************************
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: installoffice.pl,v $
-#
-# $Revision: 1.2.24.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,6 +25,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
+#
 #***********************************************************************/
 
 use strict;
diff --git a/solenv/bin/leconvert.pl b/solenv/bin/leconvert.pl
index 48723c1d79f0..dec0d333f99d 100755
--- a/solenv/bin/leconvert.pl
+++ b/solenv/bin/leconvert.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: leconvert.pl,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/licinserter.pl b/solenv/bin/licinserter.pl
index b01a85b75731..bfb4d1999fe1 100644
--- a/solenv/bin/licinserter.pl
+++ b/solenv/bin/licinserter.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: licinserter.pl,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index a86c133cd3ed..fe75d0d562d4 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -12,14 +12,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: linkoo,v $
-#
-# $Revision: 1.17 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl
index 5e7064631ec0..b7530e4f5e98 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: macosx-change-install-names.pl,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/macosx-create-bundle b/solenv/bin/macosx-create-bundle
index f4cbeacc20f1..ba7d624e68f3 100755
--- a/solenv/bin/macosx-create-bundle
+++ b/solenv/bin/macosx-create-bundle
@@ -3,14 +3,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: macosx-create-bundle,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/macosx-dylib-link-list.pl b/solenv/bin/macosx-dylib-link-list.pl
index 159eb66d782d..1554bbe56016 100644
--- a/solenv/bin/macosx-dylib-link-list.pl
+++ b/solenv/bin/macosx-dylib-link-list.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: macosx-dylib-link-list.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/make_download.pl b/solenv/bin/make_download.pl
index 464b0d75e25d..dd492ea3bfa1 100644
--- a/solenv/bin/make_download.pl
+++ b/solenv/bin/make_download.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: make_installer.pl,v $
-#
-# $Revision: 1.121 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/make_ext_update_info.pl b/solenv/bin/make_ext_update_info.pl
index e3dac8a95cbe..f350dc489386 100755
--- a/solenv/bin/make_ext_update_info.pl
+++ b/solenv/bin/make_ext_update_info.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: make_ext_update_info.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 6458fbfdc5cb..a2f552eceb8d 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -2,12 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: make_installer.pl,v $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/makemani.pl b/solenv/bin/makemani.pl
index df11a50c7e17..cdebaab77617 100644
--- a/solenv/bin/makemani.pl
+++ b/solenv/bin/makemani.pl
@@ -5,14 +5,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makemani.pl,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/mapgen.pl b/solenv/bin/mapgen.pl
index 9d1c837377b6..48c335c2adba 100644
--- a/solenv/bin/mapgen.pl
+++ b/solenv/bin/mapgen.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: mapgen.pl,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/mhids.pl b/solenv/bin/mhids.pl
index 52a62ef70040..f2d0acc649f6 100644
--- a/solenv/bin/mhids.pl
+++ b/solenv/bin/mhids.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: mhids.pl,v $
-#
-# $Revision: 1.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/mkdir.pl b/solenv/bin/mkdir.pl
index d2a374adfc67..85c2cc78f199 100755
--- a/solenv/bin/mkdir.pl
+++ b/solenv/bin/mkdir.pl
@@ -7,7 +7,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 # options -p (for compatibility)
 #         -mode mode
 #
-# Copyright (c) 2000 Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 
 use Cwd;
 
diff --git a/solenv/bin/mkout.pl b/solenv/bin/mkout.pl
index d803e83bf991..4839b8525bb9 100755
--- a/solenv/bin/mkout.pl
+++ b/solenv/bin/mkout.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: mkout.pl,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/CreatePDBRelocators.pm b/solenv/bin/modules/CreatePDBRelocators.pm
index 0b57e748b486..8f272fe896f8 100644
--- a/solenv/bin/modules/CreatePDBRelocators.pm
+++ b/solenv/bin/modules/CreatePDBRelocators.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: CreatePDBRelocators.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/Cws.pm b/solenv/bin/modules/Cws.pm
index 2ec5d13ff88c..6948c21d554e 100755
--- a/solenv/bin/modules/Cws.pm
+++ b/solenv/bin/modules/Cws.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: Cws.pm,v $
-#
-# $Revision: 1.26 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/CwsConfig.pm b/solenv/bin/modules/CwsConfig.pm
index 3574bc89e7a8..6121691e1e7f 100644
--- a/solenv/bin/modules/CwsConfig.pm
+++ b/solenv/bin/modules/CwsConfig.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: CwsConfig.pm,v $
-#
-# $Revision: 1.11.44.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/Eis.pm b/solenv/bin/modules/Eis.pm
index f06c0387d64f..696595f5af71 100755
--- a/solenv/bin/modules/Eis.pm
+++ b/solenv/bin/modules/Eis.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: Eis.pm,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/GenInfoParser.pm b/solenv/bin/modules/GenInfoParser.pm
index c211c0c82a28..2671da13a69d 100644
--- a/solenv/bin/modules/GenInfoParser.pm
+++ b/solenv/bin/modules/GenInfoParser.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: GenInfoParser.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm
index 088005e43d7b..88aa226f68a9 100644
--- a/solenv/bin/modules/SourceConfig.pm
+++ b/solenv/bin/modules/SourceConfig.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: SourceConfig.pm,v $
-#
-# $Revision: 1.0 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/archivefiles.pm b/solenv/bin/modules/installer/archivefiles.pm
index 62a35193cd69..80c468b61db2 100644
--- a/solenv/bin/modules/installer/archivefiles.pm
+++ b/solenv/bin/modules/installer/archivefiles.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: archivefiles.pm,v $
-#
-# $Revision: 1.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/configuration.pm b/solenv/bin/modules/installer/configuration.pm
index ed6a5b4b2707..4aa82d25b5b2 100644
--- a/solenv/bin/modules/installer/configuration.pm
+++ b/solenv/bin/modules/installer/configuration.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: configuration.pm,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index b58f376486e0..7818b74f4b40 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: control.pm,v $
-#
-# $Revision: 1.42 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/converter.pm b/solenv/bin/modules/installer/converter.pm
index 72901448598a..beeec52b71ac 100644
--- a/solenv/bin/modules/installer/converter.pm
+++ b/solenv/bin/modules/installer/converter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: converter.pm,v $
-#
-# $Revision: 1.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/copyproject.pm b/solenv/bin/modules/installer/copyproject.pm
index ed826d692df5..5db9cf7f8b04 100644
--- a/solenv/bin/modules/installer/copyproject.pm
+++ b/solenv/bin/modules/installer/copyproject.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: copyproject.pm,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 4fbe8d4255f8..0aa02451d22e 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: download.pm,v $
-#
-# $Revision: 1.47 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/downloadsigner.pm b/solenv/bin/modules/installer/downloadsigner.pm
index ad6ddabece55..aa3bbb25a484 100644
--- a/solenv/bin/modules/installer/downloadsigner.pm
+++ b/solenv/bin/modules/installer/downloadsigner.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: remover.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index c51612722fd9..6c0280207173 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: environment.pm,v $
-#
-# $Revision: 1.14 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 8b8a7aa2bafb..95f661160a0e 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: epmfile.pm,v $
-#
-# $Revision: 1.87 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/existence.pm b/solenv/bin/modules/installer/existence.pm
index bcdcfa478a78..1ecf9ce9965b 100644
--- a/solenv/bin/modules/installer/existence.pm
+++ b/solenv/bin/modules/installer/existence.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: existence.pm,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/exiter.pm b/solenv/bin/modules/installer/exiter.pm
index 15192ca86378..d5976f428b93 100644
--- a/solenv/bin/modules/installer/exiter.pm
+++ b/solenv/bin/modules/installer/exiter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: exiter.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/files.pm b/solenv/bin/modules/installer/files.pm
index db869ad7906a..73ea26738b05 100644
--- a/solenv/bin/modules/installer/files.pm
+++ b/solenv/bin/modules/installer/files.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: files.pm,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/followme.pm b/solenv/bin/modules/installer/followme.pm
index 0a1ef456adcb..1abc035d5615 100644
--- a/solenv/bin/modules/installer/followme.pm
+++ b/solenv/bin/modules/installer/followme.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: environment.pm,v $
-#
-# $Revision: 1.14 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 8579e67ed970..79cbd3a8cc80 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: globals.pm,v $
-#
-# $Revision: 1.103.16.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/javainstaller.pm b/solenv/bin/modules/installer/javainstaller.pm
index b9735e5aee29..f68346bdcce2 100644
--- a/solenv/bin/modules/installer/javainstaller.pm
+++ b/solenv/bin/modules/installer/javainstaller.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: javainstaller.pm,v $
-#
-# $Revision: 1.30 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/languagepack.pm b/solenv/bin/modules/installer/languagepack.pm
index 11b8ecbd2edb..ded5bc3d2e21 100644
--- a/solenv/bin/modules/installer/languagepack.pm
+++ b/solenv/bin/modules/installer/languagepack.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: languagepack.pm,v $
-#
-# $Revision: 1.16.226.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/languages.pm b/solenv/bin/modules/installer/languages.pm
index 978a213bda35..7070b09f80b8 100644
--- a/solenv/bin/modules/installer/languages.pm
+++ b/solenv/bin/modules/installer/languages.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: languages.pm,v $
-#
-# $Revision: 1.14 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/logger.pm b/solenv/bin/modules/installer/logger.pm
index 26d0b6313743..c5982c6a05f9 100644
--- a/solenv/bin/modules/installer/logger.pm
+++ b/solenv/bin/modules/installer/logger.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: logger.pm,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/mail.pm b/solenv/bin/modules/installer/mail.pm
index 054eccf3f4db..3580b3f3b6ab 100644
--- a/solenv/bin/modules/installer/mail.pm
+++ b/solenv/bin/modules/installer/mail.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: mail.pm,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/packagelist.pm b/solenv/bin/modules/installer/packagelist.pm
index 79eaa3a96d7d..f2becc19a610 100644
--- a/solenv/bin/modules/installer/packagelist.pm
+++ b/solenv/bin/modules/installer/packagelist.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: packagelist.pm,v $
-#
-# $Revision: 1.19 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/packagepool.pm b/solenv/bin/modules/installer/packagepool.pm
index 4ca68bf30d38..d4032b7db17e 100644
--- a/solenv/bin/modules/installer/packagepool.pm
+++ b/solenv/bin/modules/installer/packagepool.pm
@@ -1,35 +1,27 @@
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-#   $RCSfile: copyproject.pm,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   last change: $Author: obo $ $Date: 2007/07/19 07:16:23 $
+# This file is part of OpenOffice.org.
 #
-#   The Contents of this file are made available subject to
-#   the terms of GNU Lesser General Public License Version 2.1.
+# 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).
 #
-#     GNU Lesser General Public License Version 2.1
-#     =============================================
-#     Copyright 2005 by Sun Microsystems, Inc.
-#     901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-#     This library is free software; you can redistribute it and/or
-#     modify it under the terms of the GNU Lesser General Public
-#     License version 2.1, as published by the Free Software Foundation.
-#
-#     This library 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 for more details.
-#
-#     You should have received a copy of the GNU Lesser General Public
-#     License along with this library; if not, write to the Free Software
-#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#     MA  02111-1307  USA
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
 #
 #*************************************************************************
 
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index a0d91954ddb5..8a54c27db3a9 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: parameter.pm,v $
-#
-# $Revision: 1.56 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/pathanalyzer.pm b/solenv/bin/modules/installer/pathanalyzer.pm
index 3aa6ece5f691..1c57a0d76e02 100644
--- a/solenv/bin/modules/installer/pathanalyzer.pm
+++ b/solenv/bin/modules/installer/pathanalyzer.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: pathanalyzer.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/profiles.pm b/solenv/bin/modules/installer/profiles.pm
index 5bea2b9f9b27..3feef2e8a367 100644
--- a/solenv/bin/modules/installer/profiles.pm
+++ b/solenv/bin/modules/installer/profiles.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: profiles.pm,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/regmerge.pm b/solenv/bin/modules/installer/regmerge.pm
index bb6461b00d7d..1c2821549131 100644
--- a/solenv/bin/modules/installer/regmerge.pm
+++ b/solenv/bin/modules/installer/regmerge.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: regmerge.pm,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/remover.pm b/solenv/bin/modules/installer/remover.pm
index e142682be614..541a33bce4c1 100644
--- a/solenv/bin/modules/installer/remover.pm
+++ b/solenv/bin/modules/installer/remover.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: remover.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/scppatchsoname.pm b/solenv/bin/modules/installer/scppatchsoname.pm
index bc358903093c..32a142828981 100644
--- a/solenv/bin/modules/installer/scppatchsoname.pm
+++ b/solenv/bin/modules/installer/scppatchsoname.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: scppatchsoname.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/scpzipfiles.pm b/solenv/bin/modules/installer/scpzipfiles.pm
index f5a242b5ff0a..52dea6032ee1 100644
--- a/solenv/bin/modules/installer/scpzipfiles.pm
+++ b/solenv/bin/modules/installer/scpzipfiles.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: scpzipfiles.pm,v $
-#
-# $Revision: 1.15 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index 5f02acab8e81..778ca23e740a 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: scriptitems.pm,v $
-#
-# $Revision: 1.53 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/servicesfile.pm b/solenv/bin/modules/installer/servicesfile.pm
index f0afea5583a6..38c21a57593b 100644
--- a/solenv/bin/modules/installer/servicesfile.pm
+++ b/solenv/bin/modules/installer/servicesfile.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: servicesfile.pm,v $
-#
-# $Revision: 1.33 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/setupscript.pm b/solenv/bin/modules/installer/setupscript.pm
index a131d32b21c0..e266832e6ba6 100644
--- a/solenv/bin/modules/installer/setupscript.pm
+++ b/solenv/bin/modules/installer/setupscript.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: setupscript.pm,v $
-#
-# $Revision: 1.19 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index a543c32c048a..d18c4cb5745b 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: simplepackage.pm,v $
-#
-# $Revision: 1.19.48.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/sorter.pm b/solenv/bin/modules/installer/sorter.pm
index 080a20223e70..dd983c060093 100644
--- a/solenv/bin/modules/installer/sorter.pm
+++ b/solenv/bin/modules/installer/sorter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: sorter.pm,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/strip.pm b/solenv/bin/modules/installer/strip.pm
index 5a2f3b23947c..a9541879d119 100644
--- a/solenv/bin/modules/installer/strip.pm
+++ b/solenv/bin/modules/installer/strip.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: strip.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/substfilenamefiles.pm b/solenv/bin/modules/installer/substfilenamefiles.pm
index c97b2ec6ec57..12cb6ab8eb4f 100644
--- a/solenv/bin/modules/installer/substfilenamefiles.pm
+++ b/solenv/bin/modules/installer/substfilenamefiles.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: substfilenamefiles.pm,v $
-#
-# $Revision: 1.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm
index ba04d1085532..d36e2133e825 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: systemactions.pm,v $
-#
-# $Revision: 1.38 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/upx.pm b/solenv/bin/modules/installer/upx.pm
index ebdd859a87d2..7bfb14fae0d5 100644
--- a/solenv/bin/modules/installer/upx.pm
+++ b/solenv/bin/modules/installer/upx.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: upx.pm,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/admin.pm b/solenv/bin/modules/installer/windows/admin.pm
index c6c175fa5027..d22a1299e9c9 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: admin.pm,v $
-#
-# $Revision: 1.1.2.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/assembly.pm b/solenv/bin/modules/installer/windows/assembly.pm
index 7b2372603b70..bb5efe2207d5 100644
--- a/solenv/bin/modules/installer/windows/assembly.pm
+++ b/solenv/bin/modules/installer/windows/assembly.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: assembly.pm,v $
-#
-# $Revision: 1.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/binary.pm b/solenv/bin/modules/installer/windows/binary.pm
index 4f327b6d93c0..96ee50eb4b19 100644
--- a/solenv/bin/modules/installer/windows/binary.pm
+++ b/solenv/bin/modules/installer/windows/binary.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: binary.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/component.pm b/solenv/bin/modules/installer/windows/component.pm
index 1cddc98cf6af..125c8607f249 100644
--- a/solenv/bin/modules/installer/windows/component.pm
+++ b/solenv/bin/modules/installer/windows/component.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: component.pm,v $
-#
-# $Revision: 1.14 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/createfolder.pm b/solenv/bin/modules/installer/windows/createfolder.pm
index 3abb3acad3d3..7ade8866c6c5 100644
--- a/solenv/bin/modules/installer/windows/createfolder.pm
+++ b/solenv/bin/modules/installer/windows/createfolder.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: createfolder.pm,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm
index 94ac41d8cb92..2ad207731b51 100644
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ b/solenv/bin/modules/installer/windows/directory.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: directory.pm,v $
-#
-# $Revision: 1.30.126.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/feature.pm b/solenv/bin/modules/installer/windows/feature.pm
index b422dc45eb65..39521baecdfe 100644
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ b/solenv/bin/modules/installer/windows/feature.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: feature.pm,v $
-#
-# $Revision: 1.24 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/featurecomponent.pm b/solenv/bin/modules/installer/windows/featurecomponent.pm
index 0c3d5763325e..c5053212aad3 100644
--- a/solenv/bin/modules/installer/windows/featurecomponent.pm
+++ b/solenv/bin/modules/installer/windows/featurecomponent.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: featurecomponent.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/file.pm b/solenv/bin/modules/installer/windows/file.pm
index e8d46c124317..10666be7460c 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: file.pm,v $
-#
-# $Revision: 1.24 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/font.pm b/solenv/bin/modules/installer/windows/font.pm
index fec60e719150..9dab78caf5f7 100644
--- a/solenv/bin/modules/installer/windows/font.pm
+++ b/solenv/bin/modules/installer/windows/font.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: font.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/icon.pm b/solenv/bin/modules/installer/windows/icon.pm
index 5f101131ff4f..ac2fa9ea8cfa 100644
--- a/solenv/bin/modules/installer/windows/icon.pm
+++ b/solenv/bin/modules/installer/windows/icon.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: icon.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm
index e9ad0c73d249..6f03228ca10a 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: idtglobal.pm,v $
-#
-# $Revision: 1.45 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/inifile.pm b/solenv/bin/modules/installer/windows/inifile.pm
index b6737495279a..de279da8d48b 100644
--- a/solenv/bin/modules/installer/windows/inifile.pm
+++ b/solenv/bin/modules/installer/windows/inifile.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: inifile.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/java.pm b/solenv/bin/modules/installer/windows/java.pm
index 6b9cb7d725aa..11ccd7076f71 100644
--- a/solenv/bin/modules/installer/windows/java.pm
+++ b/solenv/bin/modules/installer/windows/java.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: java.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/language.pm b/solenv/bin/modules/installer/windows/language.pm
index 11a31c6c5f60..c0dca543eb56 100644
--- a/solenv/bin/modules/installer/windows/language.pm
+++ b/solenv/bin/modules/installer/windows/language.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: language.pm,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/media.pm b/solenv/bin/modules/installer/windows/media.pm
index c8b1e03ab5e3..35e90f6a3856 100644
--- a/solenv/bin/modules/installer/windows/media.pm
+++ b/solenv/bin/modules/installer/windows/media.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: media.pm,v $
-#
-# $Revision: 1.12 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/mergemodule.pm b/solenv/bin/modules/installer/windows/mergemodule.pm
index 7dfd8ff49c76..eb524fdafc3e 100755
--- a/solenv/bin/modules/installer/windows/mergemodule.pm
+++ b/solenv/bin/modules/installer/windows/mergemodule.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: mergemodule.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 6c49a8db3cf2..0d3abe886b03 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -2,12 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: msiglobal.pm,v $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm
index 0a5a35f05693..a4996945de4d 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: msp.pm,v $
-#
-# $Revision: 1.1.2.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/patch.pm b/solenv/bin/modules/installer/windows/patch.pm
index 25f8fab6caa2..536464192a71 100644
--- a/solenv/bin/modules/installer/windows/patch.pm
+++ b/solenv/bin/modules/installer/windows/patch.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: patch.pm,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index 9ce90d8bc7eb..4679e0e19a1b 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: property.pm,v $
-#
-# $Revision: 1.31 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/registry.pm b/solenv/bin/modules/installer/windows/registry.pm
index 9f9da9485677..16174750d178 100644
--- a/solenv/bin/modules/installer/windows/registry.pm
+++ b/solenv/bin/modules/installer/windows/registry.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: registry.pm,v $
-#
-# $Revision: 1.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/removefile.pm b/solenv/bin/modules/installer/windows/removefile.pm
index 73c276a44310..ec2a6142db71 100644
--- a/solenv/bin/modules/installer/windows/removefile.pm
+++ b/solenv/bin/modules/installer/windows/removefile.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: removefile.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/selfreg.pm b/solenv/bin/modules/installer/windows/selfreg.pm
index 821eae4dceb4..70dffc3ea1af 100644
--- a/solenv/bin/modules/installer/windows/selfreg.pm
+++ b/solenv/bin/modules/installer/windows/selfreg.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: selfreg.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/shortcut.pm b/solenv/bin/modules/installer/windows/shortcut.pm
index acc0f7484910..dac740bcd9de 100644
--- a/solenv/bin/modules/installer/windows/shortcut.pm
+++ b/solenv/bin/modules/installer/windows/shortcut.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: shortcut.pm,v $
-#
-# $Revision: 1.15 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/sign.pm b/solenv/bin/modules/installer/windows/sign.pm
index ecefbd9fd1f8..81ba78c8b218 100644
--- a/solenv/bin/modules/installer/windows/sign.pm
+++ b/solenv/bin/modules/installer/windows/sign.pm
@@ -2,12 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: binary.pm,v $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -120,9 +118,9 @@ sub check_system_path
 {
     # The following files have to be found in the environment variable PATH
     # Only, if \"-sign\" is used.
-    # Windows : "msicert.exe", "msidb.exe", "signtool.exe"
+    # Windows : "msicert.exe", "diff.exe", "msidb.exe", "signtool.exe"
 
-    my @needed_files_in_path = ("msicert.exe", "msidb.exe", "signtool.exe");
+    my @needed_files_in_path = ("msicert.exe", "msidb.exe", "signtool.exe", "diff.exe");
     if ( $installer::globals::internal_cabinet_signing )
     {
         push(@needed_files_in_path, "cabarc.exe");
@@ -307,6 +305,34 @@ sub get_hash_count
 }
 
 ############################################################
+# Collect all last files in a cabinet file. This is
+# necessary to control, if the cabinet file was damaged
+# by calling signtool.exe.
+############################################################
+
+sub analyze_file_file
+{
+    my ($filecontent) = @_;
+
+    my %filenamehash = ();
+
+    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
+    {
+        if ( $i < 3 ) { next; }
+
+        if ( ${$filecontent}[$i] =~ /^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ )
+        {
+            my $name = $1;
+            my $sequence = $8;
+
+            $filenamehash{$sequence} = $name;
+        }
+    }
+
+    return ( \%filenamehash );
+}
+
+############################################################
 # Collect all DiskIds to the corresponding cabinet files.
 ############################################################
 
@@ -315,6 +341,7 @@ sub analyze_media_file
     my ($filecontent) = @_;
 
     my %diskidhash = ();
+    my %lastsequencehash = ();
 
     for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
     {
@@ -323,13 +350,15 @@ sub analyze_media_file
         if ( ${$filecontent}[$i] =~ /^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ )
         {
             my $diskid = $1;
+            my $lastsequence = $2;
             my $cabfile = $4;
 
             $diskidhash{$cabfile} = $diskid;
+            $lastsequencehash{$cabfile} = $lastsequence;
         }
     }
 
-    return \%diskidhash;
+    return ( \%diskidhash, \%lastsequencehash );
 }
 
 ########################################################
@@ -342,15 +371,20 @@ sub collect_diskid_from_media_table
 
     # creating working directory
     my $workdir = installer::systemactions::create_directories("media", \$languagestring);
-    installer::windows::admin::extract_tables_from_pcpfile($msidatabase, $workdir, "Media");
+    installer::windows::admin::extract_tables_from_pcpfile($msidatabase, $workdir, "Media File");
 
     # Reading tables
     my $filename = $workdir . $installer::globals::separator . "Media.idt";
     if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find required file: $filename !", "collect_diskid_from_media_table"); }
     my $filecontent = installer::files::read_file($filename);
-    my $diskidhash = analyze_media_file($filecontent);
+    my ( $diskidhash, $lastsequencehash ) = analyze_media_file($filecontent);
+
+    $filename = $workdir . $installer::globals::separator . "File.idt";
+    if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find required file: $filename !", "collect_diskid_from_media_table"); }
+    $filecontent = installer::files::read_file($filename);
+    my $filenamehash = analyze_file_file($filecontent);
 
-    return $diskidhash;
+    return ( $diskidhash, $filenamehash, $lastsequencehash );
 }
 
 ########################################################
@@ -429,7 +463,7 @@ sub analyze_installset_content
 
     if ( $msidatabase ne "" ) { $contains_msidatabase = 1; }
 
-    return (\%allcabfileshash, \%allfileshash, $msidatabase, $contains_external_cabfiles, $contains_msidatabase);
+    return (\%allcabfileshash, \%allfileshash, $msidatabase, $contains_external_cabfiles, $contains_msidatabase, \@sourcefiles);
 }
 
 ########################################################
@@ -445,6 +479,8 @@ sub msicert_database
 
     foreach my $cabfile ( keys %{$allcabfiles} )
     {
+        my $origfilesize = -s $cabfile;
+
         my $mediacabfilename = $cabfile;
         if ( $internalcabfile ) { $mediacabfilename = "\#" . $mediacabfilename; }
         if ( ! exists($cabfilehash->{$mediacabfilename}) ) { installer::exiter::exit_program("ERROR: Could not determine DiskId from media table for cabinet file \"$cabfile\" !", "msicert_database"); }
@@ -453,18 +489,168 @@ sub msicert_database
         my $systemcall = "msicert.exe -d $msidatabase -m $diskid -c $cabfile -h";
          $success = make_systemcall($systemcall, $systemcall);
         if ( ! $success ) { $fullsuccess = 0; }
+
+        # size of cabinet file must not change
+        my $finalfilesize = -s $cabfile;
+
+        if ( $origfilesize != $finalfilesize ) { installer::exiter::exit_program("ERROR: msicert.exe changed size of cabinet file !", "msicert_database"); }
     }
 
     return $fullsuccess;
 }
 
 ########################################################
+# Checking if cabinet file was broken by signtool.
+########################################################
+
+sub cabinet_cosistency_check
+{
+    my ( $onefile, $followmeinfohash, $filenamehash, $lastsequencehash, $temppath ) = @_;
+
+    my $infoline = "Making consistency check of $onefile\n";
+    push( @installer::globals::logfileinfo, $infoline);
+    my $expandfile = "expand.exe";  # Has to be in the path
+
+    if ( $^O =~ /cygwin/i )
+    {
+        $expandfile = qx(cygpath -u "$ENV{WINDIR}"/System32/expand.exe);
+        chomp $expandfile;
+    }
+
+    if ( $filenamehash == 0 )
+    {
+        $infoline = "Warning: Stopping consistency check: Important hash of filenames is empty!\n";
+        push( @installer::globals::logfileinfo, $infoline);
+    }
+    elsif  ( $lastsequencehash == 0 )
+    {
+        $infoline = "Warning: Stopping consistency check; Important hash of last sequences is empty!\n";
+        push( @installer::globals::logfileinfo, $infoline);
+    }
+    else # both hashes are available
+    {
+        # $onefile contains only the name of the cabinet file without path
+         my $sequence = $lastsequencehash->{$onefile};
+         my $lastfile = $filenamehash->{$sequence};
+        $infoline = "Check of $onefile: Sequence: $sequence is file: $lastfile\n";
+        push( @installer::globals::logfileinfo, $infoline);
+
+         # Therefore the file $lastfile need to be binary compared.
+         # It has to be expanded from the cabinet file
+         # of the original installation set and from the
+         # newly signed cabinet file.
+
+        # How about cabinet files extracted from msi database?
+        my $finalinstalldir = $followmeinfohash->{'finalinstalldir'};
+
+        $finalinstalldir =~ s/\\\s*$//;
+        $finalinstalldir =~ s/\/\s*$//;
+        my $sourcecabfile = $finalinstalldir . $installer::globals::separator . $onefile;
+        my $currentpath = cwd();
+        my $destcabfile = $currentpath . $installer::globals::separator . $onefile;
+        # my $destcabfile = $onefile;
+
+        if ( $^O =~ /cygwin/i )
+        {
+            chomp( $destcabfile = qx{cygpath -w "$destcabfile"} );
+            $destcabfile =~ s/\\/\//g;
+        }
+
+        if ( ! -f $sourcecabfile )
+        {
+            $infoline = "WARNING: Check of cab file cannot happen, because source cabinet file was not found: $sourcecabfile\n";
+            push( @installer::globals::logfileinfo, $infoline);
+        }
+        elsif ( ! -f $destcabfile )
+        {
+            $infoline = "WARNING: Check of cab file cannot happen, because destination cabinet file was not found: $sourcecabfile\n";
+            push( @installer::globals::logfileinfo, $infoline);
+        }
+        else # everything is okay for the check
+        {
+            my $diffpath = get_diff_path($temppath);
+
+            my $origdiffpath = $diffpath . $installer::globals::separator . "orig";
+            my $newdiffpath = $diffpath . $installer::globals::separator . "new";
+
+            if ( ! -d $origdiffpath ) { mkdir($origdiffpath); }
+            if ( ! -d $newdiffpath ) { mkdir($newdiffpath); }
+
+            my $systemcall = "$expandfile $sourcecabfile $origdiffpath -f:$lastfile ";
+            $infoline = $systemcall . "\n";
+            push( @installer::globals::logfileinfo, $infoline);
+
+            my $success = make_systemcall($systemcall, $systemcall);
+            if ( ! $success ) { installer::exiter::exit_program("ERROR: Could not successfully execute: $systemcall !", "cabinet_cosistency_check"); }
+
+            $systemcall = "$expandfile $destcabfile $newdiffpath -f:$lastfile ";
+            $infoline = $systemcall . "\n";
+            push( @installer::globals::logfileinfo, $infoline);
+
+            $success = make_systemcall($systemcall, $systemcall);
+            if ( ! $success ) { installer::exiter::exit_program("ERROR: Could not successfully execute: $systemcall !", "cabinet_cosistency_check"); }
+
+            # and finally the two files can be diffed.
+            my $origfile = $origdiffpath . $installer::globals::separator . $lastfile;
+            my $newfile = $newdiffpath . $installer::globals::separator . $lastfile;
+
+            if ( ! -f $origfile ) { installer::exiter::exit_program("ERROR: Unpacked original file not found: $origfile !", "cabinet_cosistency_check"); }
+            if ( ! -f $newfile ) { installer::exiter::exit_program("ERROR: Unpacked new file not found: $newfile !", "cabinet_cosistency_check"); }
+
+            my $origsize = -s $origfile;
+            my $newsize = -s $newfile;
+
+            if ( $origsize != $newsize ) # This shows an error!
+            {
+                $infoline = "ERROR: Different filesize after signtool.exe was used. Original: $origsize Bytes, new: $newsize. File: $lastfile\n";
+                push( @installer::globals::logfileinfo, $infoline);
+                installer::exiter::exit_program("ERROR: The cabinet file $destcabfile is broken after signtool.exe signed this file !", "cabinet_cosistency_check");
+            }
+            else
+            {
+                $infoline = "Same size of last file in cabinet file after usage of signtool.exe: $newsize (File: $lastfile)\n";
+                push( @installer::globals::logfileinfo, $infoline);
+
+                # Also making a binary diff?
+
+                my $difffile = "diff.exe";  # has to be in the path
+                # $systemcall = "$difffile $sourcecabfile $destcabfile";  # Test for differences
+                $systemcall = "$difffile $origfile $newfile";
+                $infoline = $systemcall . "\n";
+                $returnvalue = make_systemcall($systemcall, $systemcall);
+
+                my $success = $?;
+
+                if ( $success == 0 )
+                {
+                    $infoline = "Last files are identical after signing cabinet file (File: $lastfile)\n";
+                    push( @installer::globals::logfileinfo, $infoline);
+                }
+                elsif ( $success == 1 )
+                {
+                    $infoline = "ERROR: Last files are different after signing cabinet file (File: $lastfile)\n";
+                    push( @installer::globals::logfileinfo, $infoline);
+                    installer::exiter::exit_program("ERROR: Last files are different after signing cabinet file (File: $lastfile)!", "cabinet_cosistency_check");
+                }
+                else
+                {
+                    $infoline = "ERROR: Problem occured calling diff.exe (File: $lastfile)\n";
+                    push( @installer::globals::logfileinfo, $infoline);
+                    installer::exiter::exit_program("ERROR: Problem occured calling diff.exe (File: $lastfile) !", "cabinet_cosistency_check");
+                }
+            }
+        }
+    }
+
+}
+
+########################################################
 # Signing a list of files
 ########################################################
 
 sub sign_files
 {
-    my ( $followmeinfohash, $allfiles, $pw, $cabinternal ) = @_;
+    my ( $followmeinfohash, $allfiles, $pw, $cabinternal, $filenamehash, $lastsequencehash, $temppath ) = @_;
 
     my $infoline = "";
     my $fullsuccess = 1;
@@ -508,6 +694,12 @@ sub sign_files
              $counter++;
          }
 
+         # Special check for cabinet files, that sometimes get damaged by signtool.exe
+         if (( $success ) && ( $onefile =~ /\.cab\s*$/ ) && ( ! $cabinternal ))
+         {
+             cabinet_cosistency_check($onefile, $followmeinfohash, $filenamehash, $lastsequencehash, $temppath);
+        }
+
          if ( ! $success )
          {
              $fullsuccess = 0;
@@ -570,6 +762,21 @@ sub get_cab_path
 }
 
 #################################################################
+# Setting the path, where the diff can happen.
+#################################################################
+
+sub get_diff_path
+{
+    my ($temppath) = @_;
+
+    my $diffpath = "diff_" . $$;
+    $diffpath = $temppath . $installer::globals::separator . $diffpath;
+    if ( ! -d $diffpath ) { installer::systemactions::create_directory($diffpath); }
+
+    return $diffpath;
+}
+
+#################################################################
 # Exclude all cab files from the msi database.
 #################################################################
 
@@ -888,7 +1095,7 @@ sub sign_files_in_cabinet_files
                 $allfileshash{$onefile} = 1;
             }
         }
-         $success = sign_files($followmeinfohash, \%allfileshash, $pw, 1);
+         $success = sign_files($followmeinfohash, \%allfileshash, $pw, 1, 0, 0, $temppath);
         if ( ! $success ) { $complete_success = 0; }
 
         chdir($from);
@@ -901,6 +1108,44 @@ sub sign_files_in_cabinet_files
 }
 
 ########################################################
+# Comparing the content of two directories.
+# Only filesize is compared.
+########################################################
+
+sub compare_directories
+{
+    my ( $dir1, $dir2, $files ) = @_;
+
+    $dir1 =~ s/\\\s*//;
+    $dir2 =~ s/\\\s*//;
+    $dir1 =~ s/\/\s*//;
+    $dir2 =~ s/\/\s*//;
+
+    my $infoline = "Comparing directories: $dir1 and $dir2\n";
+    push( @installer::globals::logfileinfo, $infoline);
+
+    foreach my $onefile ( @{$files} )
+    {
+        my $file1 = $dir1 . $installer::globals::separator . $onefile;
+        my $file2 = $dir2 . $installer::globals::separator . $onefile;
+
+        if ( ! -f $file1 ) { installer::exiter::exit_program("ERROR: Missing file : $file1!", "compare_directories"); }
+        if ( ! -f $file2 ) { installer::exiter::exit_program("ERROR: Missing file : $file2!", "compare_directories"); }
+
+        my $size1 = -s $file1;
+        my $size2 = -s $file2;
+
+        $infoline = "Comparing files: $file1 ($size1) and $file2 ($size2)\n";
+        push( @installer::globals::logfileinfo, $infoline);
+
+        if ( $size1 != $size2 )
+        {
+            installer::exiter::exit_program("ERROR: File defect after copy (different size) $file1 ($size1 bytes) and $file2 ($size2 bytes)!", "compare_directories");
+        }
+    }
+}
+
+########################################################
 # Signing an existing Windows installation set.
 ########################################################
 
@@ -929,7 +1174,9 @@ sub sign_install_set
     else { $installsetpath = rename_install_set($installsetpath); }
 
     # collecting all files in the installation set
-    my ($allcabfiles, $allfiles, $msidatabase, $contains_external_cabfiles, $contains_msidatabase) = analyze_installset_content($installsetpath);
+    my ($allcabfiles, $allfiles, $msidatabase, $contains_external_cabfiles, $contains_msidatabase, $sourcefiles) = analyze_installset_content($installsetpath);
+
+    if ( $make_copy ) { compare_directories($installsetpath, $followmeinfohash->{'finalinstalldir'}, $sourcefiles); }
 
     # changing into installation set
     my $from = cwd();
@@ -947,7 +1194,7 @@ sub sign_install_set
     if ( $contains_msidatabase )
     {
         # exclude media table from msi database and get all diskids.
-        my $cabfilehash = collect_diskid_from_media_table($msidatabase, $followmeinfohash->{'languagestring'});
+        my ( $cabfilehash, $filenamehash, $lastsequencehash ) = collect_diskid_from_media_table($msidatabase, $followmeinfohash->{'languagestring'});
 
         # Check, if there are internal cab files
         my ( $contains_internal_cabfiles, $all_internal_cab_files) = check_for_internal_cabfiles($cabfilehash);
@@ -963,7 +1210,7 @@ sub sign_install_set
 
             if ( $installer::globals::internal_cabinet_signing ) { sign_files_in_cabinet_files($followmeinfohash, $all_internal_cab_files, $pw, $temppath); }
 
-            $success = sign_files($followmeinfohash, $all_internal_cab_files, $pw, 0);
+            $success = sign_files($followmeinfohash, $all_internal_cab_files, $pw, 0, $filenamehash, $lastsequencehash, $temppath);
             if ( ! $success ) { $complete_success = 0; }
             $success = msicert_database($fullmsidatabase, $all_internal_cab_files, $cabfilehash, 1);
             if ( ! $success ) { $complete_success = 0; }
@@ -980,7 +1227,7 @@ sub sign_install_set
         {
             if ( $installer::globals::internal_cabinet_signing ) { sign_files_in_cabinet_files($followmeinfohash, $allcabfiles, $pw, $temppath); }
 
-            $success = sign_files($followmeinfohash, $allcabfiles, $pw, 0);
+            $success = sign_files($followmeinfohash, $allcabfiles, $pw, 0, $filenamehash, $lastsequencehash, $temppath);
             if ( ! $success ) { $complete_success = 0; }
             $success = msicert_database($msidatabase, $allcabfiles, $cabfilehash, 0);
             if ( ! $success ) { $complete_success = 0; }
@@ -988,7 +1235,7 @@ sub sign_install_set
     }
 
     # finally all other files can be signed
-    $success = sign_files($followmeinfohash, $allfiles, $pw, 0);
+    $success = sign_files($followmeinfohash, $allfiles, $pw, 0, 0, 0, $temppath);
     if ( ! $success ) { $complete_success = 0; }
 
     # and changing back
diff --git a/solenv/bin/modules/installer/windows/strip.pm b/solenv/bin/modules/installer/windows/strip.pm
index c7e5e883596c..79b1046c1e8f 100644
--- a/solenv/bin/modules/installer/windows/strip.pm
+++ b/solenv/bin/modules/installer/windows/strip.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: strip.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/update.pm b/solenv/bin/modules/installer/windows/update.pm
index 4c1081fa8458..efe6949b6fc4 100644
--- a/solenv/bin/modules/installer/windows/update.pm
+++ b/solenv/bin/modules/installer/windows/update.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: update.pm,v $
-#
-# $Revision: 1.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/upgrade.pm b/solenv/bin/modules/installer/windows/upgrade.pm
index 5e3d5379579a..d9d371fc1b56 100644
--- a/solenv/bin/modules/installer/windows/upgrade.pm
+++ b/solenv/bin/modules/installer/windows/upgrade.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: upgrade.pm,v $
-#
-# $Revision: 1.16 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index d64ac15ff73a..94f5cc7461fd 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: worker.pm,v $
-#
-# $Revision: 1.65.56.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/xpdinstaller.pm b/solenv/bin/modules/installer/xpdinstaller.pm
index e81380807a87..c6938292b313 100644
--- a/solenv/bin/modules/installer/xpdinstaller.pm
+++ b/solenv/bin/modules/installer/xpdinstaller.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: xpdinstaller.pm,v $
-#
-# $Revision: 1.19 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index 3232daf2138f..a434163b0dd9 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: ziplist.pm,v $
-#
-# $Revision: 1.22 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/macosxotoolhelper.pm b/solenv/bin/modules/macosxotoolhelper.pm
index c8d30c52e473..96ad8b2ed6f4 100644
--- a/solenv/bin/modules/macosxotoolhelper.pm
+++ b/solenv/bin/modules/macosxotoolhelper.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: macosxotoolhelper.pm,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/packager/check.pm b/solenv/bin/modules/packager/check.pm
index 1b1aaedab46f..8811451cd27c 100644
--- a/solenv/bin/modules/packager/check.pm
+++ b/solenv/bin/modules/packager/check.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: check.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/packager/existence.pm b/solenv/bin/modules/packager/existence.pm
index e3b3d99d4e35..81f13395befc 100644
--- a/solenv/bin/modules/packager/existence.pm
+++ b/solenv/bin/modules/packager/existence.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: existence.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/packager/exiter.pm b/solenv/bin/modules/packager/exiter.pm
index fbbbbbc719ec..d81d5f148f15 100644
--- a/solenv/bin/modules/packager/exiter.pm
+++ b/solenv/bin/modules/packager/exiter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: exiter.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/packager/files.pm b/solenv/bin/modules/packager/files.pm
index d2054838fa12..295f55fade45 100644
--- a/solenv/bin/modules/packager/files.pm
+++ b/solenv/bin/modules/packager/files.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: files.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/packager/globals.pm b/solenv/bin/modules/packager/globals.pm
index 85bd58fef690..955a1598adc8 100644
--- a/solenv/bin/modules/packager/globals.pm
+++ b/solenv/bin/modules/packager/globals.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: globals.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/packager/work.pm b/solenv/bin/modules/packager/work.pm
index 43a1ae2abe77..ae0c743a635f 100644
--- a/solenv/bin/modules/packager/work.pm
+++ b/solenv/bin/modules/packager/work.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: work.pm,v $
-#
-# $Revision: 1.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/check.pm b/solenv/bin/modules/par2script/check.pm
index 70b557f94d25..7a975f530445 100644
--- a/solenv/bin/modules/par2script/check.pm
+++ b/solenv/bin/modules/par2script/check.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: check.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/converter.pm b/solenv/bin/modules/par2script/converter.pm
index 1adff9b2bf0b..49f0d62d4c64 100644
--- a/solenv/bin/modules/par2script/converter.pm
+++ b/solenv/bin/modules/par2script/converter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: converter.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/existence.pm b/solenv/bin/modules/par2script/existence.pm
index a557020647ee..08fb8eda4c7c 100644
--- a/solenv/bin/modules/par2script/existence.pm
+++ b/solenv/bin/modules/par2script/existence.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: existence.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/exiter.pm b/solenv/bin/modules/par2script/exiter.pm
index ddfe5a9d499b..24399422dc73 100644
--- a/solenv/bin/modules/par2script/exiter.pm
+++ b/solenv/bin/modules/par2script/exiter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: exiter.pm,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/files.pm b/solenv/bin/modules/par2script/files.pm
index c781b6f9a3bc..3b7e70d2d4a9 100644
--- a/solenv/bin/modules/par2script/files.pm
+++ b/solenv/bin/modules/par2script/files.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: files.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/globals.pm b/solenv/bin/modules/par2script/globals.pm
index 1968b1907bda..9a3c06f23879 100644
--- a/solenv/bin/modules/par2script/globals.pm
+++ b/solenv/bin/modules/par2script/globals.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: globals.pm,v $
-#
-# $Revision: 1.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/module.pm b/solenv/bin/modules/par2script/module.pm
index f58022564f09..00b341306db2 100644
--- a/solenv/bin/modules/par2script/module.pm
+++ b/solenv/bin/modules/par2script/module.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: module.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/parameter.pm b/solenv/bin/modules/par2script/parameter.pm
index d24b2ea9e641..9c8abec78a0c 100644
--- a/solenv/bin/modules/par2script/parameter.pm
+++ b/solenv/bin/modules/par2script/parameter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: parameter.pm,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/remover.pm b/solenv/bin/modules/par2script/remover.pm
index b6b94d124403..ba981f914881 100644
--- a/solenv/bin/modules/par2script/remover.pm
+++ b/solenv/bin/modules/par2script/remover.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: remover.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/shortcut.pm b/solenv/bin/modules/par2script/shortcut.pm
index 49063c3162f5..ecaa1506beb1 100644
--- a/solenv/bin/modules/par2script/shortcut.pm
+++ b/solenv/bin/modules/par2script/shortcut.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: shortcut.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/systemactions.pm b/solenv/bin/modules/par2script/systemactions.pm
index e51565a01f02..f5a8db9979a7 100644
--- a/solenv/bin/modules/par2script/systemactions.pm
+++ b/solenv/bin/modules/par2script/systemactions.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: systemactions.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/undefine.pm b/solenv/bin/modules/par2script/undefine.pm
index e6c1c586502f..5fc1d18ebd3d 100644
--- a/solenv/bin/modules/par2script/undefine.pm
+++ b/solenv/bin/modules/par2script/undefine.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: undefine.pm,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/work.pm b/solenv/bin/modules/par2script/work.pm
index e37ce9c6dcdd..fd266e306d04 100644
--- a/solenv/bin/modules/par2script/work.pm
+++ b/solenv/bin/modules/par2script/work.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: work.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/directory.pm b/solenv/bin/modules/pre2par/directory.pm
index e09223d037f6..2253c54bc47a 100644
--- a/solenv/bin/modules/pre2par/directory.pm
+++ b/solenv/bin/modules/pre2par/directory.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: directory.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/existence.pm b/solenv/bin/modules/pre2par/existence.pm
index 6ae1f6500fcf..1775f1d9394c 100644
--- a/solenv/bin/modules/pre2par/existence.pm
+++ b/solenv/bin/modules/pre2par/existence.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: existence.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/exiter.pm b/solenv/bin/modules/pre2par/exiter.pm
index 2c6c755494b7..fe992aad4253 100644
--- a/solenv/bin/modules/pre2par/exiter.pm
+++ b/solenv/bin/modules/pre2par/exiter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: exiter.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/files.pm b/solenv/bin/modules/pre2par/files.pm
index e01c25fd4af9..e3de88b6dd4e 100644
--- a/solenv/bin/modules/pre2par/files.pm
+++ b/solenv/bin/modules/pre2par/files.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: files.pm,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/globals.pm b/solenv/bin/modules/pre2par/globals.pm
index 9f9e498ce227..55da94a211d2 100644
--- a/solenv/bin/modules/pre2par/globals.pm
+++ b/solenv/bin/modules/pre2par/globals.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: globals.pm,v $
-#
-# $Revision: 1.13 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/language.pm b/solenv/bin/modules/pre2par/language.pm
index 2686dbb3fdee..b5dc336ba847 100644
--- a/solenv/bin/modules/pre2par/language.pm
+++ b/solenv/bin/modules/pre2par/language.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: language.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/parameter.pm b/solenv/bin/modules/pre2par/parameter.pm
index 9d9f9cbd3572..763f1963051c 100644
--- a/solenv/bin/modules/pre2par/parameter.pm
+++ b/solenv/bin/modules/pre2par/parameter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: parameter.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/pathanalyzer.pm b/solenv/bin/modules/pre2par/pathanalyzer.pm
index 116adb6dde76..f45a0808d53a 100644
--- a/solenv/bin/modules/pre2par/pathanalyzer.pm
+++ b/solenv/bin/modules/pre2par/pathanalyzer.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: pathanalyzer.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/remover.pm b/solenv/bin/modules/pre2par/remover.pm
index 5c71c964bd6d..4efe6ea0610c 100644
--- a/solenv/bin/modules/pre2par/remover.pm
+++ b/solenv/bin/modules/pre2par/remover.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: remover.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/systemactions.pm b/solenv/bin/modules/pre2par/systemactions.pm
index c92bfd805a3e..e084d7753f48 100644
--- a/solenv/bin/modules/pre2par/systemactions.pm
+++ b/solenv/bin/modules/pre2par/systemactions.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: systemactions.pm,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/work.pm b/solenv/bin/modules/pre2par/work.pm
index c08313cc3b7f..d70f75e80b2e 100644
--- a/solenv/bin/modules/pre2par/work.pm
+++ b/solenv/bin/modules/pre2par/work.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: work.pm,v $
-#
-# $Revision: 1.13 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/oochkpatch.pl b/solenv/bin/oochkpatch.pl
index a15a6ba6fcc7..0234c6d5cf92 100644
--- a/solenv/bin/oochkpatch.pl
+++ b/solenv/bin/oochkpatch.pl
@@ -5,14 +5,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: oochkpatch.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/packager.pl b/solenv/bin/packager.pl
index aca8a48cc9b6..75d929ab86d6 100644
--- a/solenv/bin/packager.pl
+++ b/solenv/bin/packager.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: packager.pl,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/packimages.pl b/solenv/bin/packimages.pl
index 16cf2a113e8a..9466110124d2 100755
--- a/solenv/bin/packimages.pl
+++ b/solenv/bin/packimages.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: packimages.pl,v $
-#
-# $Revision: 1.17 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/par2script.pl b/solenv/bin/par2script.pl
index e7d89964df5e..0789c460d510 100644
--- a/solenv/bin/par2script.pl
+++ b/solenv/bin/par2script.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: par2script.pl,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/patch_sanitizer.pl b/solenv/bin/patch_sanitizer.pl
index d7297f772497..25260f9274c1 100755
--- a/solenv/bin/patch_sanitizer.pl
+++ b/solenv/bin/patch_sanitizer.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: patch_sanitizer.pl,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/pre2par.pl b/solenv/bin/pre2par.pl
index 2c243ce7bb48..f279ae106797 100644
--- a/solenv/bin/pre2par.pl
+++ b/solenv/bin/pre2par.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: pre2par.pl,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/relocate b/solenv/bin/relocate
index 4b19a578636e..2158d5d7314c 100755
--- a/solenv/bin/relocate
+++ b/solenv/bin/relocate
@@ -13,14 +13,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: relocate,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/rmdir.pl b/solenv/bin/rmdir.pl
index 01b817eb9e59..8feb1603fb44 100644
--- a/solenv/bin/rmdir.pl
+++ b/solenv/bin/rmdir.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: rmdir.pl,v $
-#
-# $Revision: 1.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/rpm-wrapper b/solenv/bin/rpm-wrapper
index 1c94bc0a9f10..1a285ddaa3e6 100755
--- a/solenv/bin/rpm-wrapper
+++ b/solenv/bin/rpm-wrapper
@@ -1,15 +1,12 @@
 #!/bin/bash
 #*************************************************************************
+#
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,6 +23,7 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
+#
 #***********************************************************************/
 
 # At least on v20z-so3, when /so/env/bt_linux_libc2.11/DEV300/bin/rpm is called
diff --git a/solenv/bin/slfl.pl b/solenv/bin/slfl.pl
index b5d8987af4f3..638e15140718 100755
--- a/solenv/bin/slfl.pl
+++ b/solenv/bin/slfl.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: slfl.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/soirpm.sh b/solenv/bin/soirpm.sh
index f886f0fb88d1..1aa34f2a4a45 100755
--- a/solenv/bin/soirpm.sh
+++ b/solenv/bin/soirpm.sh
@@ -2,14 +2,10 @@
 #*************************************************************************
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,6 +22,7 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
+#
 #***********************************************************************/
 
 LIBRPMBUILD=$(find ${COMPATH} -name 'librpmbuild-4.1*' -print)
diff --git a/solenv/bin/sort.pl b/solenv/bin/sort.pl
index 9e88552651f5..b157ed119aa2 100644
--- a/solenv/bin/sort.pl
+++ b/solenv/bin/sort.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: sort.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/touch.pl b/solenv/bin/touch.pl
index 2747dd822cea..4c7719cbbbc4 100644
--- a/solenv/bin/touch.pl
+++ b/solenv/bin/touch.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: touch.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/transform_description.pl b/solenv/bin/transform_description.pl
new file mode 100644
index 000000000000..0d6ab34583b3
--- /dev/null
+++ b/solenv/bin/transform_description.pl
@@ -0,0 +1,138 @@
+#!/usr/bin/perl
+#*************************************************************************
+#*
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#************************************************************************/
+
+parse_args();
+execute_args();
+exit(0);
+
+my $source = undef;
+my $dest = undef;
+my @languages = undef;
+
+sub parse_args
+{
+    # at most two arguments
+    explain(), exit(100) if ( $#ARGV > 1 );
+
+    # destination file is the second argument, if present
+    $dest = $ARGV[1] if ( $#ARGV > 0 );
+
+    # source file is the first argument if present
+    if ( $#ARGV > -1 )
+    {
+        $source = $ARGV[0];
+        if ( ! -f $source )
+        {
+            print STDERR "$source is not a valid file, aborting";
+            exit(101);
+        }
+    }
+
+    # check which languages to use
+    my $languages = $ENV{WITH_LANG};
+    if ( ! defined $languages )
+    {
+        print STDERR "$0: WITH_LANG not set, defaulting to 'en-US'\n";
+        $languages = "en-US";
+    }
+    @languages = split ( ' ', $languages );
+}
+
+sub execute_args
+{
+    my @description = ();
+    if ( defined $source )
+    {
+        open SOURCE, "$source" || die "could not open $source: $?\n";
+        @description = <SOURCE>;
+        close SOURCE;
+    }
+    else
+    {
+        @description = <STDIN>;
+    }
+
+    if ( defined $dest )
+    {
+        open DEST, ">$dest" || die "could not open $dest for writing: $?\n";
+    }
+
+    foreach (@description)
+    {
+        chomp; s/\r//;
+
+        if ( /\#LANG\#/ )
+        {
+            foreach $lang ( @languages )
+            {
+                my $transformed = $_;
+                $transformed =~ s/\#LANG#/$lang/g;
+                if ( defined $dest )
+                {
+                    print DEST "$transformed\n";
+                }
+                else
+                {
+                    print STDOUT "$transformed\n";
+                }
+            }
+        }
+        else
+        {
+            if ( defined $dest )
+            {
+                print DEST "$_\n";
+            }
+            else
+            {
+                print STDOUT "$_\n";
+            }
+        }
+    }
+
+    close DEST if ( defined $dest );
+}
+
+# explains the program's usage
+sub explain
+{
+    print STDOUT "usage:\n";
+    print STDOUT "  $0 [<description_file> [<output_file>]]\n";
+    print STDOUT "  transforms the given extension description file\n";
+    print STDOUT "\n";
+    print STDOUT "  If <output_file> is not given, STDOUT is used.\n";
+    print STDOUT "  If <description_file> is not given, STDIN is used.\n";
+    print STDOUT "\n";
+    print STDOUT "  The following transformations are done at the moment:\n";
+    print STDOUT "  - duplicate all lines containing #LANG#, for ever token of \$WITH_LANG\n";
+    print STDOUT "    replacing every occurance of \$LANG with a token\n";
+    print STDOUT "\n";
+    print STDOUT "  And yes, the functionality of this script should be\n";
+    print STDOUT "  - moved to solenv/inc/tg_ext.mk\n";
+    print STDOUT "  - implemented as XSLT, to be much less error-prone\n";
+}
diff --git a/solenv/bin/unxmap-to-macosx-explist.awk b/solenv/bin/unxmap-to-macosx-explist.awk
index 4f8bd93035a9..b791d46a291c 100644
--- a/solenv/bin/unxmap-to-macosx-explist.awk
+++ b/solenv/bin/unxmap-to-macosx-explist.awk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxmap-to-macosx-explist.awk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/update_module_ignore_lists.pl b/solenv/bin/update_module_ignore_lists.pl
index e4e4c2abe4e3..88d73a0217d6 100644
--- a/solenv/bin/update_module_ignore_lists.pl
+++ b/solenv/bin/update_module_ignore_lists.pl
@@ -5,14 +5,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: hicontrast-to-theme.pl,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/zipdep.pl b/solenv/bin/zipdep.pl
index c83f4d32ef73..f19f79f00e52 100755
--- a/solenv/bin/zipdep.pl
+++ b/solenv/bin/zipdep.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: header.hxx,v $
-#
-# $Revision: 1.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 055c5c146d98..907d5295c15c 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -8,7 +8,7 @@ common
 			BIG_SVX TRUE
 			BMP_WRITES_FLAG TRUE
 			BUILD_SPECIAL TRUE
-			BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN 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
+			BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN 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 MYSQLCPPCONN MYSQLC
 			common_build TRUE
 			COMMON_OUTDIR common
 			CONFIG_PROJECT config_office
@@ -23,6 +23,7 @@ common
 			ENABLE_GTK TRUE
 			ENABLE_MEDIAWIKI YES
 			ENABLE_MINIMIZER YES
+ 			ENABLE_MYSQLC YES
 			ENABLE_NSS_MODULE YES
 			ENABLE_RANDR TRUE
 			ENABLE_REPORTBUILDER YES
@@ -649,6 +650,7 @@ unxlngi6
 			JDK14PATH %SOLAR_JDK14PATH%
 			JDK15PATH %SOLAR_JDK15PATH%
 			KDE_ROOT /so/env/kde/linux/kde-3.2.2
+            LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxlngi6
 			NO_BSYMBOLIC True
 			OJDK16PATH %SOLAR_OJDK16PATH%
 			OS LINUX
@@ -920,6 +922,7 @@ unxlngx6
 			JDK14PATH %SOLAR_JDK14PATH%
 			JDK15PATH %SOLAR_JDK15PATH%
 			KDE_ROOT /so/env/kde/linux/kde-3.2.2
+            LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxlngx6
 			NO_BSYMBOLIC True
 			OJDK16PATH %SOLAR_OJDK16PATH%
 			OS LINUX
@@ -1211,6 +1214,7 @@ unxmacxi
 			JDK13PATH %SOLAR_JDK13PATH%
 			JDK14PATH %SOLAR_JDK15PATH%
 			JDK15PATH %SOLAR_JDK15PATH%
+            LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxmacxi
 			NO_BSYMBOLIC True
 			OS MACOSX
 			OUTPATH unxmacxi
@@ -1455,6 +1459,7 @@ unxsoli4
 			JDK13PATH %SOLAR_JDK13PATH%
 			JDK14PATH %SOLAR_JDK14PATH%
 			JDK15PATH %SOLAR_JDK15PATH%
+            LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxsoli4
 			OJDK16PATH %SOLAR_OJDK16PATH%
 			OS SOLARIS
 			OUTPATH unxsoli4
@@ -1710,6 +1715,7 @@ unxsols4
 			JDK13PATH %SOLAR_JDK13PATH%
 			JDK14PATH %SOLAR_JDK14PATH%
 			JDK15PATH %SOLAR_JDK15PATH%
+            LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxsols4
 			LM_LICENSE_FILE %SOLAR_LICENSE_FILE%
 			OJDK16PATH %SOLAR_OJDK16PATH%
 			OS SOLARIS
@@ -3020,6 +3026,7 @@ wntmsci12
 			GUIBASE WIN
 			GVER NT351
 			INPATH wntmsci12%PROEXT%
+            LIBMYSQL_PATH %SOLAR_ENV_ROOT%$/mysql-connector-c-6.0.2$/wntmsci12
 			MOZILLABUILD %SOLARROOT%/mozilla-build-1.3
 			OS WNT
 			OUTPATH wntmsci12
diff --git a/solenv/inc/ant.mk b/solenv/inc/ant.mk
index ce62599a11b7..2d182a66a437 100644
--- a/solenv/inc/ant.mk
+++ b/solenv/inc/ant.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: ant.mk,v $
-#
-# $Revision: 1.36 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/antsettings.mk b/solenv/inc/antsettings.mk
index 26ccfa6fe3bc..d840e4457f61 100644
--- a/solenv/inc/antsettings.mk
+++ b/solenv/inc/antsettings.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: antsettings.mk,v $
-#
-# $Revision: 1.7.166.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/cppunit.mk b/solenv/inc/cppunit.mk
index 6571d60d3ab0..0659e68adad7 100644
--- a/solenv/inc/cppunit.mk
+++ b/solenv/inc/cppunit.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: cppunit.mk,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk
index 07968efada54..47b62d20dd12 100644
--- a/solenv/inc/extension_post.mk
+++ b/solenv/inc/extension_post.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: extension_post.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,6 +25,8 @@
 #
 #*************************************************************************
 
+EXTENSION_TARGET:=$(ZIP9TARGETN)
+
 .SOURCE.xcu : $(MISC)/$(EXTNAME)/merge $(MISC)/$(EXTNAME)/registry/data $(MISC)/$(COMPONENT_SHARED_CONFIG)_in/merge $(MISC)/$(COMPONENT_SHARED_CONFIG)_in/registry/data $(COMPONENT_CONFIGDIR) .
 .SOURCE.xcs : $(MISC)/$(EXTNAME)/registry $(MISC)/$(EXTNAME)/registry/schema .
 
@@ -129,12 +127,18 @@ PHONYDESC=.PHONY
 .IF "$(DESCRIPTION)"!=""
 $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC)
     @@-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.$(EXTNAME)
     @echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)/$(TARGET)_lang_track.mk
-    $(COMMAND_ECHO)$(TYPE) $@.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ >  $(MISC)/desc.tmp.$(EXTNAME)
-    @@-$(RM) $@.$(EXTNAME)
-    $(COMMAND_ECHO)$(TYPE) $(MISC)/desc.tmp.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
-    @@-$(RM) $(MISC)/desc.tmp.$(EXTNAME)
+
+    $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.1.$(EXTNAME)
+
+    $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/transform_description.pl $@.1.$(EXTNAME) $@.2.$(EXTNAME)
+    @@-$(RM) $@.1.$(EXTNAME)
+
+    $(COMMAND_ECHO)$(TYPE) $@.2.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ >  $@.3.$(EXTNAME)
+    @@-$(RM) $@.2.$(EXTNAME)
+
+    $(COMMAND_ECHO)$(TYPE) $@.3.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
+    @@-$(RM) $@.3.$(EXTNAME)
 
 .ENDIF			# "$(DESCRIPTION)"!=""
 # default OOo license text!!!
diff --git a/solenv/inc/extension_pre.mk b/solenv/inc/extension_pre.mk
index 84a9d48fd804..abef2e7f8b73 100644
--- a/solenv/inc/extension_pre.mk
+++ b/solenv/inc/extension_pre.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: extension_pre.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/javaunittest.mk b/solenv/inc/javaunittest.mk
index 6d34ced82a61..8f9207fd3917 100644
--- a/solenv/inc/javaunittest.mk
+++ b/solenv/inc/javaunittest.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: javaunittest.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/lang.mk b/solenv/inc/lang.mk
index b013c0a68b67..fc5321653fbc 100644
--- a/solenv/inc/lang.mk
+++ b/solenv/inc/lang.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: lang.mk,v $
-#
-# $Revision: 1.16 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index b012c775f759..b0d7849a2525 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: libs.mk,v $
-#
-# $Revision: 1.134.2.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -182,7 +178,6 @@ BTCOMMUNILIB=-lbtcommuni$(DLLPOSTFIX)
 AUTOMATIONLIB=-lsts$(DLLPOSTFIX)
 SVLLIB=-lsvl$(DLLPOSTFIX)
 TKTLIB=-ltkt$(DLLPOSTFIX)
-GOODIESLIB=-lgo$(DLLPOSTFIX)
 SAXLIB=-lsax$(DLLPOSTFIX)
 MAILLIB=-lmail
 DOCMGRLIB=-ldmg$(DLLPOSTFIX)
@@ -245,6 +240,7 @@ FWILIB=-lfwi$(DLLPOSTFIX)
 SVXCORELIB=-lsvxcore$(DLLPOSTFIX)
 MSFILTERLIB=-lmsfilter$(DLLPOSTFIX)
 SVXLIB=-lsvx$(DLLPOSTFIX)
+EDITENGLIB=-lediteng$(DLLPOSTFIX)
 BASCTLLIB=-lbasctl$(DLLPOSTFIX)
 BASICIDELIB=-lybctl
 SVXLLIB=-lsvxl
@@ -422,7 +418,6 @@ BTCOMMUNILIB=ibtcommuni.lib
 AUTOMATIONLIB=ists.lib
 SVLLIB=isvl.lib
 PLUGAPPLIB=plugapp.lib
-GOODIESLIB=igo.lib
 SAXLIB=isax.lib
 MAILLIB=mail.lib
 DOCMGRLIB=docmgr.lib
@@ -433,6 +428,7 @@ SJLIB=sj.lib
 SVXCORELIB=isvxcore.lib
 MSFILTERLIB=imsfilter.lib
 SVXLIB=isvx.lib
+EDITENGLIB=iediteng.lib
 BASCTLLIB=basctl.lib
 BASICIDELIB=ybctl.lib
 SVXLLIB=svxl.lib
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index b2edcd774b83..99939518dc58 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=300
-RSCREVISION=300m71(Build:9481)
-BUILD=9481
-LAST_MINOR=m71
+RSCREVISION=300m72(Build:9484)
+BUILD=9484
+LAST_MINOR=m72
 SOURCEVERSION=DEV300
diff --git a/solenv/inc/os2.mk b/solenv/inc/os2.mk
index 03ad2f7a35da..981479f184c4 100644
--- a/solenv/inc/os2.mk
+++ b/solenv/inc/os2.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: os2.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/os2gcci.mk b/solenv/inc/os2gcci.mk
index 8305a5d25e56..46dcba24aaa1 100644
--- a/solenv/inc/os2gcci.mk
+++ b/solenv/inc/os2gcci.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: os2.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/pkg_config.mk b/solenv/inc/pkg_config.mk
index 4c04de5b5520..3654083e76ad 100644
--- a/solenv/inc/pkg_config.mk
+++ b/solenv/inc/pkg_config.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: pkg_config.mk,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/postmac.h b/solenv/inc/postmac.h
index 0cb58b86ff20..68f85b6c0f65 100644
--- a/solenv/inc/postmac.h
+++ b/solenv/inc/postmac.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: postmac.h,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk
index 4a7f6aeae28c..77413849c5f9 100644
--- a/solenv/inc/postset.mk
+++ b/solenv/inc/postset.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: postset.mk,v $
-#
-# $Revision: 1.47.50.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/preinclude.h b/solenv/inc/preinclude.h
index 3b12d39bccec..dee99bc6d3f4 100644
--- a/solenv/inc/preinclude.h
+++ b/solenv/inc/preinclude.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: preinclude.h,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/premac.h b/solenv/inc/premac.h
index 45d55cde4802..451a33b8ab00 100644
--- a/solenv/inc/premac.h
+++ b/solenv/inc/premac.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: premac.h,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk
index 814e37708b6b..74c50ae9616d 100644
--- a/solenv/inc/pstrules.mk
+++ b/solenv/inc/pstrules.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: pstrules.mk,v $
-#
-# $Revision: 1.50 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 2722661ab45d..b3c3cb5283dd 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: rules.mk,v $
-#
-# $Revision: 1.103.4.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/sc.mk b/solenv/inc/sc.mk
index 50cef7c5b028..ad2102a92b4f 100644
--- a/solenv/inc/sc.mk
+++ b/solenv/inc/sc.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: sc.mk,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/scpre.mk b/solenv/inc/scpre.mk
index 01ec9c72591b..1b9b7a7dacac 100644
--- a/solenv/inc/scpre.mk
+++ b/solenv/inc/scpre.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: scpre.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/set_ext.mk b/solenv/inc/set_ext.mk
index 1e035ed311cd..8d6d4db5a627 100644
--- a/solenv/inc/set_ext.mk
+++ b/solenv/inc/set_ext.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: set_ext.mk,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk
index 23dbee21d2cd..bf2ca9314f33 100644..100755
--- a/solenv/inc/set_wntx64.mk
+++ b/solenv/inc/set_wntx64.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: set_wntx64.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -128,6 +124,7 @@ COMCTL32LIB_X64=$(LIBPATH_X64)/comctl32.lib
 CRYPT32LIB_X64=$(LIBPATH_X64)/crypt32.lib
 GDIPLUSLIB_X64=$(LIBPATH_X64)/gdiplus.lib
 DBGHELPLIB_X64=$(LIBPATH_X64)/dbghelp.lib
+PROPSYSLIB_X64=$(LIBPATH_X64)/propsys.lib
 MSILIB_X64=$(LIBPATH_X64)/msi.lib
 DDRAWLIB_X64=$(LIBPATH_X64)/ddraw.lib
 SHLWAPILIB_X64=$(LIBPATH_X64)/shlwapi.lib
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 2980d939a2ce..7e9ca7548c22 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: settings.mk,v $
-#
-# $Revision: 1.214.30.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/shlinfo.rc b/solenv/inc/shlinfo.rc
index c114458617de..86257dc843a0 100644
--- a/solenv/inc/shlinfo.rc
+++ b/solenv/inc/shlinfo.rc
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 2330aa64e49b..e446635be9a2 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: target.mk,v $
-#
-# $Revision: 1.211.4.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/templates/extension_tmpl.mk b/solenv/inc/templates/extension_tmpl.mk
index fdc597c67164..b9ea7db7ee76 100644
--- a/solenv/inc/templates/extension_tmpl.mk
+++ b/solenv/inc/templates/extension_tmpl.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: extension_tmpl.mk,v $
-#
-# $Revision: 1.3.56.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk
index 29ea4ca9221a..cefdf14db033 100644
--- a/solenv/inc/tg_app.mk
+++ b/solenv/inc/tg_app.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_app.mk,v $
-#
-# $Revision: 1.75 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk
index 5c00ffb74f28..8218887528fe 100644
--- a/solenv/inc/tg_compv.mk
+++ b/solenv/inc/tg_compv.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_compv.mk,v $
-#
-# $Revision: 1.22 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_config.mk b/solenv/inc/tg_config.mk
index 06aadd094d03..2f1b9fedde80 100644
--- a/solenv/inc/tg_config.mk
+++ b/solenv/inc/tg_config.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_config.mk,v $
-#
-# $Revision: 1.21.72.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_def.mk b/solenv/inc/tg_def.mk
index 90262f95e2ff..0bbd1f6b1ab1 100644
--- a/solenv/inc/tg_def.mk
+++ b/solenv/inc/tg_def.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_def.mk,v $
-#
-# $Revision: 1.49 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_dep.mk b/solenv/inc/tg_dep.mk
index 8fb6d5502fd4..37517e2f14b8 100644
--- a/solenv/inc/tg_dep.mk
+++ b/solenv/inc/tg_dep.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_dep.mk,v $
-#
-# $Revision: 1.30.166.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index bb5402813282..5cc0cd4821d5 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_ext.mk,v $
-#
-# $Revision: 1.91 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_help.mk b/solenv/inc/tg_help.mk
index a8a33051f0fc..aa62b1cf477f 100755..100644
--- a/solenv/inc/tg_help.mk
+++ b/solenv/inc/tg_help.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # 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
diff --git a/solenv/inc/tg_jar.mk b/solenv/inc/tg_jar.mk
index 25bff261081b..d1109ec4e8f1 100644
--- a/solenv/inc/tg_jar.mk
+++ b/solenv/inc/tg_jar.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_jar.mk,v $
-#
-# $Revision: 1.25 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_java.mk b/solenv/inc/tg_java.mk
index 2192bb2d410f..5c00f2bbf7f5 100644
--- a/solenv/inc/tg_java.mk
+++ b/solenv/inc/tg_java.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_java.mk,v $
-#
-# $Revision: 1.13 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_javav.mk b/solenv/inc/tg_javav.mk
index e39533f9b6f6..fe5f7fe17e81 100644
--- a/solenv/inc/tg_javav.mk
+++ b/solenv/inc/tg_javav.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_javav.mk,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_lib.mk b/solenv/inc/tg_lib.mk
index 7ea3efea65ab..08909156b729 100644
--- a/solenv/inc/tg_lib.mk
+++ b/solenv/inc/tg_lib.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_lib.mk,v $
-#
-# $Revision: 1.24 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_merge.mk b/solenv/inc/tg_merge.mk
index 324daba82f8b..a40d48a81c66 100644
--- a/solenv/inc/tg_merge.mk
+++ b/solenv/inc/tg_merge.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_merge.mk,v $
-#
-# $Revision: 1.11.72.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_moz.mk b/solenv/inc/tg_moz.mk
index 2cde0e93e003..8c1c0dfa39d4 100644
--- a/solenv/inc/tg_moz.mk
+++ b/solenv/inc/tg_moz.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_moz.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_obj.mk b/solenv/inc/tg_obj.mk
index a7cabeb51bac..3a597c2409b3 100644
--- a/solenv/inc/tg_obj.mk
+++ b/solenv/inc/tg_obj.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_obj.mk,v $
-#
-# $Revision: 1.16 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_res.mk b/solenv/inc/tg_res.mk
index 2a530f904886..cad40533e7b8 100644
--- a/solenv/inc/tg_res.mk
+++ b/solenv/inc/tg_res.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_res.mk,v $
-#
-# $Revision: 1.12 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_rslb.mk b/solenv/inc/tg_rslb.mk
index fedfa8fbd43e..40096386c436 100644
--- a/solenv/inc/tg_rslb.mk
+++ b/solenv/inc/tg_rslb.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_rslb.mk,v $
-#
-# $Revision: 1.26 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_scp.mk b/solenv/inc/tg_scp.mk
index cb86abae4c20..fd970deaae18 100644
--- a/solenv/inc/tg_scp.mk
+++ b/solenv/inc/tg_scp.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_scp.mk,v $
-#
-# $Revision: 1.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_sdi.mk b/solenv/inc/tg_sdi.mk
index 0ac0e24d2a85..a515fc1ed13a 100644
--- a/solenv/inc/tg_sdi.mk
+++ b/solenv/inc/tg_sdi.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_sdi.mk,v $
-#
-# $Revision: 1.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index 8cb6653f334e..91edbed333ec 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_shl.mk,v $
-#
-# $Revision: 1.127 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_slo.mk b/solenv/inc/tg_slo.mk
index 4b96f2ffc3e0..0a0ae789a8c7 100644
--- a/solenv/inc/tg_slo.mk
+++ b/solenv/inc/tg_slo.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_slo.mk,v $
-#
-# $Revision: 1.15 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_srs.mk b/solenv/inc/tg_srs.mk
index 3d79bd932b00..347dd25569de 100644
--- a/solenv/inc/tg_srs.mk
+++ b/solenv/inc/tg_srs.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_srs.mk,v $
-#
-# $Revision: 1.26.164.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_wntx64.mk b/solenv/inc/tg_wntx64.mk
index 987b81276748..12e049763a84 100644
--- a/solenv/inc/tg_wntx64.mk
+++ b/solenv/inc/tg_wntx64.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_wntx64.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_yxx.mk b/solenv/inc/tg_yxx.mk
index c42420a08279..5dfb95e07eec 100644
--- a/solenv/inc/tg_yxx.mk
+++ b/solenv/inc/tg_yxx.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_yxx.mk,v $
-#
-# $Revision: 1.15 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_zip.mk b/solenv/inc/tg_zip.mk
index bca8d00208dd..0a0364e02ab3 100644
--- a/solenv/inc/tg_zip.mk
+++ b/solenv/inc/tg_zip.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_zip.mk,v $
-#
-# $Revision: 1.42 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/udkversion.mk b/solenv/inc/udkversion.mk
index 2e11029e6687..18fa3cf45d77 100644
--- a/solenv/inc/udkversion.mk
+++ b/solenv/inc/udkversion.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: udkversion.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index e76d1e292a62..ceca059ad0b3 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unitools.mk,v $
-#
-# $Revision: 1.53.30.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index 36e5cd70447f..c6d756343d79 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unx.mk,v $
-#
-# $Revision: 1.40 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxaixp.mk b/solenv/inc/unxaixp.mk
index 3590a3d8a936..571cee1053c6 100644
--- a/solenv/inc/unxaixp.mk
+++ b/solenv/inc/unxaixp.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxaixp.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxbsda.mk b/solenv/inc/unxbsda.mk
index 6e9fe1d9e7e4..fefaa1f02bd7 100644
--- a/solenv/inc/unxbsda.mk
+++ b/solenv/inc/unxbsda.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxbsda.mk,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxbsdi.mk b/solenv/inc/unxbsdi.mk
index 44942a34f11d..5e9c06605940 100644
--- a/solenv/inc/unxbsdi.mk
+++ b/solenv/inc/unxbsdi.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxbsdi.mk,v $
-#
-# $Revision: 1.17 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxbsdi2.mk b/solenv/inc/unxbsdi2.mk
index dd579f0caa9e..f4206304501b 100644
--- a/solenv/inc/unxbsdi2.mk
+++ b/solenv/inc/unxbsdi2.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxbsdi2.mk,v $
-#
-# $Revision: 1.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxbsds.mk b/solenv/inc/unxbsds.mk
index 698764f2801e..0811c85a4c6d 100644
--- a/solenv/inc/unxbsds.mk
+++ b/solenv/inc/unxbsds.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxbsds.mk,v $
-#
-# $Revision: 1.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxfbsd.mk b/solenv/inc/unxfbsd.mk
index dbf23846b3e8..4a22beaec256 100644
--- a/solenv/inc/unxfbsd.mk
+++ b/solenv/inc/unxfbsd.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxfbsd.mk,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxfbsdi.mk b/solenv/inc/unxfbsdi.mk
index 98de991f0b0b..c1227a35f2d3 100644
--- a/solenv/inc/unxfbsdi.mk
+++ b/solenv/inc/unxfbsdi.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxfbsdi.mk,v $
-#
-# $Revision: 1.26 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxfbsdx.mk b/solenv/inc/unxfbsdx.mk
index 62817d5604fc..4a8e120d318e 100644
--- a/solenv/inc/unxfbsdx.mk
+++ b/solenv/inc/unxfbsdx.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxfbsdx.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxhpgr.mk b/solenv/inc/unxhpgr.mk
index 9146457483c6..9ac0c7e3daf1 100644
--- a/solenv/inc/unxhpgr.mk
+++ b/solenv/inc/unxhpgr.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxhpgr.mk,v $
-#
-# $Revision: 1.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxhpxr.mk b/solenv/inc/unxhpxr.mk
index 00323aa0ed53..174d61fc2b4c 100644
--- a/solenv/inc/unxhpxr.mk
+++ b/solenv/inc/unxhpxr.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxhpxr.mk,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk
index b6c8f798a5f9..b27afb8c1fa4 100644
--- a/solenv/inc/unxlng.mk
+++ b/solenv/inc/unxlng.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngi6.mk,v $
-#
-# $Revision: 1.48 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlnga.mk b/solenv/inc/unxlnga.mk
index 2f18fe7b43c6..da5d2fcd3d38 100644
--- a/solenv/inc/unxlnga.mk
+++ b/solenv/inc/unxlnga.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlnga.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlnghppa.mk b/solenv/inc/unxlnghppa.mk
index 240eef609365..7ae2d25c332e 100644
--- a/solenv/inc/unxlnghppa.mk
+++ b/solenv/inc/unxlnghppa.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # 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
diff --git a/solenv/inc/unxlngi.mk b/solenv/inc/unxlngi.mk
index dcc2addcd46c..d86aab185d0e 100644
--- a/solenv/inc/unxlngi.mk
+++ b/solenv/inc/unxlngi.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngi6.mk,v $
-#
-# $Revision: 1.48 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngm68k.mk b/solenv/inc/unxlngm68k.mk
index 25d5118839e4..da6ed55d8cfd 100644
--- a/solenv/inc/unxlngm68k.mk
+++ b/solenv/inc/unxlngm68k.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngm68k.mk,v $
-#
-# $Revision: 1.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngmips.mk b/solenv/inc/unxlngmips.mk
index c4510ecb5738..53c927d10b32 100644
--- a/solenv/inc/unxlngmips.mk
+++ b/solenv/inc/unxlngmips.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngmips.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngppc.mk b/solenv/inc/unxlngppc.mk
index 3a7a8058498c..408233539bf8 100644
--- a/solenv/inc/unxlngppc.mk
+++ b/solenv/inc/unxlngppc.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngppc4.mk,v $
-#
-# $Revision: 1.34 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngppc64.mk b/solenv/inc/unxlngppc64.mk
index 1fa6b8f30e90..7ce9f35c4ad8 100644
--- a/solenv/inc/unxlngppc64.mk
+++ b/solenv/inc/unxlngppc64.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngppc64.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngr.mk b/solenv/inc/unxlngr.mk
index b108888d190b..1bcbb6626219 100644
--- a/solenv/inc/unxlngr.mk
+++ b/solenv/inc/unxlngr.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngr.mk,v $
-#
-# $Revision: 1.20 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngs.mk b/solenv/inc/unxlngs.mk
index 1286179659ae..b4e6f5f58f4d 100644
--- a/solenv/inc/unxlngs.mk
+++ b/solenv/inc/unxlngs.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngs.mk,v $
-#
-# $Revision: 1.27 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngs390.mk b/solenv/inc/unxlngs390.mk
index 303542dc7619..47e2e37011e8 100644
--- a/solenv/inc/unxlngs390.mk
+++ b/solenv/inc/unxlngs390.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngs3904.mk,v $
-#
-# $Revision: 1.22 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngs390x.mk b/solenv/inc/unxlngs390x.mk
index 6a0dfab905c7..108e30b7337a 100644
--- a/solenv/inc/unxlngs390x.mk
+++ b/solenv/inc/unxlngs390x.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngs390x.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngx.mk b/solenv/inc/unxlngx.mk
index ba74a55cfdc3..1ced6c3912d0 100644
--- a/solenv/inc/unxlngx.mk
+++ b/solenv/inc/unxlngx.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngx6.mk,v $
-#
-# $Revision: 1.19.12.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index 6cb113e7918b..b40814b9a9d7 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxmacx.mk,v $
-#
-# $Revision: 1.34.56.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxmacxi.mk b/solenv/inc/unxmacxi.mk
index 09d5d424b690..6a21022d4830 100644
--- a/solenv/inc/unxmacxi.mk
+++ b/solenv/inc/unxmacxi.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxmacxi.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxmacxp.mk b/solenv/inc/unxmacxp.mk
index f1336f12e543..28b2881962de 100644
--- a/solenv/inc/unxmacxp.mk
+++ b/solenv/inc/unxmacxp.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxmacxp.mk,v $
-#
-# $Revision: 1.59 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxscoi.mk b/solenv/inc/unxscoi.mk
index 486fcf02deb3..901fe7b2cb22 100644
--- a/solenv/inc/unxscoi.mk
+++ b/solenv/inc/unxscoi.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxscoi.mk,v $
-#
-# $Revision: 1.12 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxsogi.mk b/solenv/inc/unxsogi.mk
index c4559e44c4f2..ce82fca29fa9 100644
--- a/solenv/inc/unxsogi.mk
+++ b/solenv/inc/unxsogi.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxsogi.mk,v $
-#
-# $Revision: 1.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxsogs.mk b/solenv/inc/unxsogs.mk
index 6b052c33f50b..dd0fb53272f8 100644
--- a/solenv/inc/unxsogs.mk
+++ b/solenv/inc/unxsogs.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxsogs.mk,v $
-#
-# $Revision: 1.16 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk
index c4c777376561..0f227f9520fc 100644
--- a/solenv/inc/unxsoli4.mk
+++ b/solenv/inc/unxsoli4.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxsoli4.mk,v $
-#
-# $Revision: 1.48 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,7 +29,6 @@
 ASM=/usr/ccs/bin/as
 AFLAGS=-P
 
-
 CDEFS+=-D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=$(STLPORT_VER)
 
 SOLAR_JAVA*=TRUE
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk
index 67bafa3a1c14..0bd85aa0bd4f 100644
--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxsols4.mk,v $
-#
-# $Revision: 1.53 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +30,6 @@ ASM=/usr/ccs/bin/as
 # needs -D__sparcv8plus because it's not defined by the assembler with -xarch=v8plus
 AFLAGS=-P -xarch=v8plus -D__sparcv8plus
 
-
 CDEFS+=-D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=$(STLPORT_VER)
 
 SOLAR_JAVA*=TRUE
diff --git a/solenv/inc/unxsolu4.mk b/solenv/inc/unxsolu4.mk
index 02459ad91d5d..494ecb0478b3 100644
--- a/solenv/inc/unxsolu4.mk
+++ b/solenv/inc/unxsolu4.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxsolu4.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/verinfo.hrc b/solenv/inc/verinfo.hrc
index 58e98b3a1c6d..d0a585af90ee 100644
--- a/solenv/inc/verinfo.hrc
+++ b/solenv/inc/verinfo.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: verinfo.hrc,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc
index 048b59205e08..d4c205f942b9 100644
--- a/solenv/inc/version.hrc
+++ b/solenv/inc/version.hrc
@@ -1,80 +1,80 @@
-/*************************************************************************

- *

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

- * 

- * Copyright 2009 by Sun Microsystems, Inc.

- *

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

- *

- * This file is part of OpenOffice.org.

- *

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

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

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

- *

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

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

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

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

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

- *

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

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

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

- * for a copy of the LGPLv3 License.

- *

- *************************************************************************/

-

-#define VERSION         3

-#define SUBVERSION      2

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

-// .0 + VER_CONCEPT

-// .100 + VER_ALPHA

-// .200 + VER_BETA

-// .300 + VER_GAMMA

-// .500 + VER_FINAL

-//#define VER_CONCEPT       0

-//#define VER_BETA      6

-#define VER_FINAL       0

-

-#define VER_DAY         1

-#define VER_MONTH       1

-#define VER_YEAR        2010

-

-#ifndef VER_FIRSTYEAR

-#define VER_FIRSTYEAR   VER_YEAR

-#endif

-

-#include "verinfo.hrc"

-

-#ifdef WIN32

-#define FOR_WIN_X " (32 Bit)"

-#else

-#define FOR_WIN_X ""

-#endif

-

-// -----------------------------------------------------------------------

-//              language/character set specification table

-// -----------------------------------------------------------------------

-

-RCD_LANGUAGE rcdata

-{

-#ifdef LG_D

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

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

-#else

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

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

-#endif

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

-    0               // end of table

-}

-

-

-// version binary entry

-VS_VERSION_INFO rcdata

-{

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

-    VERSION, SUBVERSION, VERVARIANT, VER_COUNT

-};

-

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ *************************************************************************/
+
+#define VERSION         3
+#define SUBVERSION      2
+//#define VERVARIANT    0 // never define this one, will be provided by build environment (BUILD_ID)
+// .0 + VER_CONCEPT
+// .100 + VER_ALPHA
+// .200 + VER_BETA
+// .300 + VER_GAMMA
+// .500 + VER_FINAL
+//#define VER_CONCEPT       0
+//#define VER_BETA      6
+#define VER_FINAL       0
+
+#define VER_DAY         1
+#define VER_MONTH       1
+#define VER_YEAR        2010
+
+#ifndef VER_FIRSTYEAR
+#define VER_FIRSTYEAR   VER_YEAR
+#endif
+
+#include "verinfo.hrc"
+
+#ifdef WIN32
+#define FOR_WIN_X " (32 Bit)"
+#else
+#define FOR_WIN_X ""
+#endif
+
+// -----------------------------------------------------------------------
+//              language/character set specification table
+// -----------------------------------------------------------------------
+
+RCD_LANGUAGE rcdata
+{
+#ifdef LG_D
+    "040704B0",     // Germany -> Unicode
+    "040704E4",     // Germany -> Windows, Multilingual
+#else
+    "040904B0",     // Germany -> Unicode
+    "040904E4",     // USA -> Windows, Multilingual
+#endif
+    "04090000",     // USA -> 7-Bit-ASCII
+    0               // end of table
+}
+
+
+// version binary entry
+VS_VERSION_INFO rcdata
+{
+    0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,
+    VERSION, SUBVERSION, VERVARIANT, VER_COUNT
+};
+
diff --git a/solenv/inc/version_so.hrc b/solenv/inc/version_so.hrc
index 852af90168b0..70ea1c193ee6 100644
--- a/solenv/inc/version_so.hrc
+++ b/solenv/inc/version_so.hrc
@@ -1,79 +1,79 @@
-/*************************************************************************

- *

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

- * 

- * Copyright 2009 by Sun Microsystems, Inc.

- *

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

- *

- * This file is part of OpenOffice.org.

- *

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

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

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

- *

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

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

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

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

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

- *

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

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

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

- * for a copy of the LGPLv3 License.

- *

- *************************************************************************/

-

-#define VERSION         9

-#define SUBVERSION      2

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

-// .0 + VER_CONCEPT

-// .100 + VER_ALPHA

-// .200 + VER_BETA

-// .300 + VER_GAMMA

-// .500 + VER_FINAL

-//#define VER_CONCEPT       0

-//#define VER_BETA      6

-#define VER_FINAL       0

-

-#define VER_DAY         1

-#define VER_MONTH       1

-#define VER_YEAR        2010

-

-#ifndef VER_FIRSTYEAR

-#define VER_FIRSTYEAR   VER_YEAR

-#endif

-

-#include "verinfo.hrc"

-

-#ifdef WIN32

-#define FOR_WIN_X " (32 Bit)"

-#else

-#define FOR_WIN_X ""

-#endif

-

-// -----------------------------------------------------------------------

-//              language/character set specification table

-// -----------------------------------------------------------------------

-

-RCD_LANGUAGE rcdata

-{

-#ifdef LG_D

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

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

-#else

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

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

-#endif

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

-    0               // end of table

-}

-

-// version binary entry

-VS_VERSION_INFO rcdata

-{

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

-    VERSION, SUBVERSION, VERVARIANT, VER_COUNT

-};

-

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ *************************************************************************/
+
+#define VERSION         9
+#define SUBVERSION      2
+//#define VERVARIANT    0 // never define this one, will be provided by build environment (BUILD_ID)
+// .0 + VER_CONCEPT
+// .100 + VER_ALPHA
+// .200 + VER_BETA
+// .300 + VER_GAMMA
+// .500 + VER_FINAL
+//#define VER_CONCEPT       0
+//#define VER_BETA      6
+#define VER_FINAL       0
+
+#define VER_DAY         1
+#define VER_MONTH       1
+#define VER_YEAR        2010
+
+#ifndef VER_FIRSTYEAR
+#define VER_FIRSTYEAR   VER_YEAR
+#endif
+
+#include "verinfo.hrc"
+
+#ifdef WIN32
+#define FOR_WIN_X " (32 Bit)"
+#else
+#define FOR_WIN_X ""
+#endif
+
+// -----------------------------------------------------------------------
+//              language/character set specification table
+// -----------------------------------------------------------------------
+
+RCD_LANGUAGE rcdata
+{
+#ifdef LG_D
+    "040704B0",     // Germany -> Unicode
+    "040704E4",     // Germany -> Windows, Multilingual
+#else
+    "040904B0",     // Germany -> Unicode
+    "040904E4",     // USA -> Windows, Multilingual
+#endif
+    "04090000",     // USA -> 7-Bit-ASCII
+    0               // end of table
+}
+
+// version binary entry
+VS_VERSION_INFO rcdata
+{
+    0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,
+    VERSION, SUBVERSION, VERVARIANT, VER_COUNT
+};
+
diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk
index 6acab30cc80d..78f496927899 100644
--- a/solenv/inc/wnt.mk
+++ b/solenv/inc/wnt.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: wnt.mk,v $
-#
-# $Revision: 1.84 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index b45b659d5f84..1d331b7f1e94 100644..100755
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: wntgcci6.mk,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -218,3 +214,4 @@ UNICOWSLIB=$(PSDK_HOME)$/lib$/unicows.lib
 WININETLIB=-lwininet
 OLDNAMESLIB=-lmoldname
 MSIMG32LIB=$(PSDK_HOME)$/lib$/msimg32.lib
+PROPSYSLIB=-lpropsys
diff --git a/solenv/inc/wntmsci10.mk b/solenv/inc/wntmsci10.mk
index 09ec567fbd62..b4221d310b74 100644
--- a/solenv/inc/wntmsci10.mk
+++ b/solenv/inc/wntmsci10.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: wntmsci10.mk,v $
-#
-# $Revision: 1.44 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk
index 1bb994f1ad6f..a04dbd881798 100644..100755
--- a/solenv/inc/wntmsci11.mk
+++ b/solenv/inc/wntmsci11.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: wntmsci11.mk,v $
-#
-# $Revision: 1.25 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -380,4 +376,5 @@ UNICOWSLIB=unicows.lib
 WININETLIB=wininet.lib
 OLDNAMESLIB=oldnames.lib
 MSIMG32LIB=msimg32.lib
+PROPSYSLIB=propsys.lib
 
diff --git a/solenv/makefile.mk b/solenv/makefile.mk
index 85823378e245..31bed765ac7f 100644
--- a/solenv/makefile.mk
+++ b/solenv/makefile.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/src/version.c b/solenv/src/version.c
index dd37580f758c..b06b1510f300 100644
--- a/solenv/src/version.c
+++ b/solenv/src/version.c
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: version.c,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/HIDCompiler/hidclex.l b/soltools/HIDCompiler/hidclex.l
index 700a044555c2..e99618f30225 100755
--- a/soltools/HIDCompiler/hidclex.l
+++ b/soltools/HIDCompiler/hidclex.l
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hidclex.l,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/HIDCompiler/makefile.mk b/soltools/HIDCompiler/makefile.mk
index bba1e136854d..8c65fc09cd21 100644
--- a/soltools/HIDCompiler/makefile.mk
+++ b/soltools/HIDCompiler/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/HIDCompiler/wrap_hidclex.cxx b/soltools/HIDCompiler/wrap_hidclex.cxx
index 0b1f9224590f..1eb79e80a5da 100644
--- a/soltools/HIDCompiler/wrap_hidclex.cxx
+++ b/soltools/HIDCompiler/wrap_hidclex.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wrap_hidclex.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/adjustvisibility/adjustvisibility.cxx b/soltools/adjustvisibility/adjustvisibility.cxx
index 916a55d94102..e67017018b1a 100644
--- a/soltools/adjustvisibility/adjustvisibility.cxx
+++ b/soltools/adjustvisibility/adjustvisibility.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: adjustvisibility.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/adjustvisibility/makefile.mk b/soltools/adjustvisibility/makefile.mk
index 4c8f03942793..ea0d09c2cf96 100755..100644
--- a/soltools/adjustvisibility/makefile.mk
+++ b/soltools/adjustvisibility/makefile.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/checkdll/checkdll.c b/soltools/checkdll/checkdll.c
index 722aa7ba979b..7c5473fb2510 100644
--- a/soltools/checkdll/checkdll.c
+++ b/soltools/checkdll/checkdll.c
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: checkdll.c,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/checkdll/makefile.mk b/soltools/checkdll/makefile.mk
index 0e30fceb7d0e..fc09a566005e 100644
--- a/soltools/checkdll/makefile.mk
+++ b/soltools/checkdll/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/cpp/makefile.mk b/soltools/cpp/makefile.mk
index c64ebf91da7e..818c27028345 100644
--- a/soltools/cpp/makefile.mk
+++ b/soltools/cpp/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.14 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/giparser/gen_info.cxx b/soltools/giparser/gen_info.cxx
index 4b0fd96e0a00..838e46287b0c 100644
--- a/soltools/giparser/gen_info.cxx
+++ b/soltools/giparser/gen_info.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gen_info.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/giparser/gi_list.cxx b/soltools/giparser/gi_list.cxx
index 7b84bc94ef0a..5726a2bf0740 100644
--- a/soltools/giparser/gi_list.cxx
+++ b/soltools/giparser/gi_list.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gi_list.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/giparser/gi_parse.cxx b/soltools/giparser/gi_parse.cxx
index 932958c63150..ad960e48a1e2 100644
--- a/soltools/giparser/gi_parse.cxx
+++ b/soltools/giparser/gi_parse.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gi_parse.cxx,v $
- * $Revision: 1.6.16.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/giparser/makefile.mk b/soltools/giparser/makefile.mk
index fe1b8d2e3dad..bab26d2e7e1b 100644
--- a/soltools/giparser/makefile.mk
+++ b/soltools/giparser/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.14 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/giparser/st_gilrw.cxx b/soltools/giparser/st_gilrw.cxx
index f03957802785..d57d8811cb31 100644
--- a/soltools/giparser/st_gilrw.cxx
+++ b/soltools/giparser/st_gilrw.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: st_gilrw.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/inc/gen_info.hxx b/soltools/inc/gen_info.hxx
index 31e6306fba5e..fae89435bed7 100644
--- a/soltools/inc/gen_info.hxx
+++ b/soltools/inc/gen_info.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gen_info.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/inc/gi_list.hxx b/soltools/inc/gi_list.hxx
index 4d8baf77222f..ad7f8d5e93f8 100644
--- a/soltools/inc/gi_list.hxx
+++ b/soltools/inc/gi_list.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gi_list.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/inc/gi_parse.hxx b/soltools/inc/gi_parse.hxx
index 4d81e2d61666..636e3bffcb9c 100644
--- a/soltools/inc/gi_parse.hxx
+++ b/soltools/inc/gi_parse.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gi_parse.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/inc/gilacces.hxx b/soltools/inc/gilacces.hxx
index 9ccd651c0c03..f9dd4c21f4e3 100644
--- a/soltools/inc/gilacces.hxx
+++ b/soltools/inc/gilacces.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gilacces.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/inc/pch/precompiled_soltools.cxx b/soltools/inc/pch/precompiled_soltools.cxx
index 4ba03f51c6ba..186dcaba7488 100644
--- a/soltools/inc/pch/precompiled_soltools.cxx
+++ b/soltools/inc/pch/precompiled_soltools.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: precompiled_soltools.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/inc/pch/precompiled_soltools.hxx b/soltools/inc/pch/precompiled_soltools.hxx
index 662818e7db12..ef1d1b1f0a1b 100644
--- a/soltools/inc/pch/precompiled_soltools.hxx
+++ b/soltools/inc/pch/precompiled_soltools.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: precompiled_soltools.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/inc/simstr.hxx b/soltools/inc/simstr.hxx
index 34984485ef93..883db0d96bdf 100644
--- a/soltools/inc/simstr.hxx
+++ b/soltools/inc/simstr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: simstr.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/inc/st_gilrw.hxx b/soltools/inc/st_gilrw.hxx
index 725fa1d4811f..b70c52e1e75f 100644
--- a/soltools/inc/st_gilrw.hxx
+++ b/soltools/inc/st_gilrw.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: st_gilrw.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/inc/st_list.hxx b/soltools/inc/st_list.hxx
index d87a232b2310..adc791f7fdf2 100644
--- a/soltools/inc/st_list.hxx
+++ b/soltools/inc/st_list.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: st_list.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/inc/st_types.hxx b/soltools/inc/st_types.hxx
index b64df4b54fb3..29eb7396440c 100644
--- a/soltools/inc/st_types.hxx
+++ b/soltools/inc/st_types.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: st_types.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/javadep/javadep.c b/soltools/javadep/javadep.c
index eeb7e1b62357..d840e6606689 100644
--- a/soltools/javadep/javadep.c
+++ b/soltools/javadep/javadep.c
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: javadep.c,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/javadep/makefile.mk b/soltools/javadep/makefile.mk
index ecd51fe4eb47..1b3b54de6c06 100644
--- a/soltools/javadep/makefile.mk
+++ b/soltools/javadep/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/ldump/hashtbl.cxx b/soltools/ldump/hashtbl.cxx
index c182fb457f45..27d48926f0df 100644
--- a/soltools/ldump/hashtbl.cxx
+++ b/soltools/ldump/hashtbl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hashtbl.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/ldump/hashtbl.hxx b/soltools/ldump/hashtbl.hxx
index 76ca1c73c0e1..62d1f8e9120e 100644
--- a/soltools/ldump/hashtbl.hxx
+++ b/soltools/ldump/hashtbl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hashtbl.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/ldump/ldump.cxx b/soltools/ldump/ldump.cxx
index e9e0991d867f..8c6e85b62594 100644
--- a/soltools/ldump/ldump.cxx
+++ b/soltools/ldump/ldump.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ldump.cxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/ldump/ldump.hxx b/soltools/ldump/ldump.hxx
index b933bbee8cca..c0a1a166b8b2 100644
--- a/soltools/ldump/ldump.hxx
+++ b/soltools/ldump/ldump.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ldump.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/ldump/makefile.mk b/soltools/ldump/makefile.mk
index fccdaac0d34b..51ff42e60772 100644
--- a/soltools/ldump/makefile.mk
+++ b/soltools/ldump/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk
index af4bae825601..630c688faba2 100755..100644
--- a/soltools/mkdepend/makefile.mk
+++ b/soltools/mkdepend/makefile.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.20 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/support/makefile.mk b/soltools/support/makefile.mk
index 42ec0676e702..d3f1095f6eb2 100644
--- a/soltools/support/makefile.mk
+++ b/soltools/support/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/support/simstr.cxx b/soltools/support/simstr.cxx
index b691373c52d8..d2ecf3480677 100644
--- a/soltools/support/simstr.cxx
+++ b/soltools/support/simstr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: simstr.cxx,v $
- * $Revision: 1.5.16.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/testSHL/inc/tlog.hxx b/soltools/testSHL/inc/tlog.hxx
index 393ad6101fb2..acae18be7e9f 100644
--- a/soltools/testSHL/inc/tlog.hxx
+++ b/soltools/testSHL/inc/tlog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tlog.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/testSHL/inc/tstMgr.hxx b/soltools/testSHL/inc/tstMgr.hxx
index d6e41bdb4447..208714322395 100644
--- a/soltools/testSHL/inc/tstMgr.hxx
+++ b/soltools/testSHL/inc/tstMgr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tstMgr.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/testSHL/inc/tutil.hxx b/soltools/testSHL/inc/tutil.hxx
index 8fbfc6d6f504..37398a72381a 100644
--- a/soltools/testSHL/inc/tutil.hxx
+++ b/soltools/testSHL/inc/tutil.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tutil.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/testSHL/makefile.mk b/soltools/testSHL/makefile.mk
index d896ed6764d2..0377137b2274 100644
--- a/soltools/testSHL/makefile.mk
+++ b/soltools/testSHL/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/testSHL/testshl.cxx b/soltools/testSHL/testshl.cxx
index 7b36f19a8b76..9642d8761f50 100644
--- a/soltools/testSHL/testshl.cxx
+++ b/soltools/testSHL/testshl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: testshl.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/testSHL/util/makefile.mk b/soltools/testSHL/util/makefile.mk
index 7e0ec8468ba6..a2582f9c1abd 100644
--- a/soltools/testSHL/util/makefile.mk
+++ b/soltools/testSHL/util/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/testSHL/util/tlog.cxx b/soltools/testSHL/util/tlog.cxx
index b2e3a9d6c925..48eeafc7908a 100644
--- a/soltools/testSHL/util/tlog.cxx
+++ b/soltools/testSHL/util/tlog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tlog.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/testSHL/util/tstMgr.cxx b/soltools/testSHL/util/tstMgr.cxx
index 9fb455cadaed..2aad1c758d41 100644
--- a/soltools/testSHL/util/tstMgr.cxx
+++ b/soltools/testSHL/util/tstMgr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tstMgr.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/testSHL/util/tutil.cxx b/soltools/testSHL/util/tutil.cxx
index 00bef19705ac..60c5f6deba02 100644
--- a/soltools/testSHL/util/tutil.cxx
+++ b/soltools/testSHL/util/tutil.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tutil.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/testhxx/create.pl b/soltools/testhxx/create.pl
index eb9e540f0a82..325d0f896135 100644
--- a/soltools/testhxx/create.pl
+++ b/soltools/testhxx/create.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: create.pl,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/testhxx/makefile.mk b/soltools/testhxx/makefile.mk
index 79811dbebbe2..1b2a0ce42923 100644
--- a/soltools/testhxx/makefile.mk
+++ b/soltools/testhxx/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/testhxx/testhxx.cxx b/soltools/testhxx/testhxx.cxx
index fcded0bd9521..63b15276d523 100644
--- a/soltools/testhxx/testhxx.cxx
+++ b/soltools/testhxx/testhxx.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: testhxx.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk
index a119dd844472..33c04cf547eb 100755..100644
--- a/soltools/util/makefile.pmk
+++ b/soltools/util/makefile.pmk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.pmk,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/soltools/winunistd/makefile.mk b/soltools/winunistd/makefile.mk
index 0e086e119f06..9fb4f512c692 100644
--- a/soltools/winunistd/makefile.mk
+++ b/soltools/winunistd/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/splitbuild/calc.lst b/splitbuild/calc.lst
index 2c13a4c6d503..d9e4a9f180a1 100644
--- a/splitbuild/calc.lst
+++ b/splitbuild/calc.lst
@@ -1 +1 @@
-scaddins sccomp sc
+chart2 scaddins sccomp sc
diff --git a/splitbuild/common.lst b/splitbuild/common.lst
index 7b7214f0d227..a82dc37f0270 100644
--- a/splitbuild/common.lst
+++ b/splitbuild/common.lst
@@ -1 +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
+basebmp basegfx bean comphelper configmgr connectivity embeddedobj 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 xmlhelp xmloff xmlscript wizards
diff --git a/splitbuild/framework.lst b/splitbuild/framework.lst
index 89ed01c617d6..1333e7dc7eec 100644
--- a/splitbuild/framework.lst
+++ b/splitbuild/framework.lst
@@ -1 +1 @@
-automation avmedia basic basctl cui desktop drawinglayer embeddedobj extensions forms formula framework idl scripting sfx2 svx xmlsecurity
+automation avmedia basic basctl cui desktop drawinglayer extensions forms formula framework idl scripting sfx2 svx xmlsecurity vbahelper
diff --git a/splitbuild/gui.lst b/splitbuild/gui.lst
index 55c2e7a20309..d64284379728 100644
--- a/splitbuild/gui.lst
+++ b/splitbuild/gui.lst
@@ -1 +1 @@
-accessibility canvas cppcanvas dtrans fpicker goodies padmin psprint_config setup_native svtools sysui toolkit UnoControls uui vcl
+accessibility canvas cppcanvas dtrans editeng fpicker padmin psprint_config setup_native svtools sysui toolkit UnoControls uui vcl
diff --git a/splitbuild/prj/build.lst b/splitbuild/prj/build.lst
index a2bdbf37c28d..0356e8b8d975 100644
--- a/splitbuild/prj/build.lst
+++ b/splitbuild/prj/build.lst
@@ -1,2 +1 @@
-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 l10ntools 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
-
+spl      splitbuild     ::      postprocess NULL
diff --git a/splitbuild/writer.lst b/splitbuild/writer.lst
index 619d7c52d9c7..28bd99c6372e 100644
--- a/splitbuild/writer.lst
+++ b/splitbuild/writer.lst
@@ -1 +1 @@
-hwpfilter sw writerfilter writerperfect
+hwpfilter starmath sw writerfilter writerperfect
diff --git a/stlport/makefile.mk b/stlport/makefile.mk
index bff4f60fd719..1a2b44343849 100644
--- a/stlport/makefile.mk
+++ b/stlport/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.45.2.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/stlport/systemstl/functional b/stlport/systemstl/functional
index 232cddbef5ad..59b61f95f250 100644
--- a/stlport/systemstl/functional
+++ b/stlport/systemstl/functional
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: functional,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/stlport/systemstl/hash_map b/stlport/systemstl/hash_map
index b969b11b211b..415e39f77926 100644
--- a/stlport/systemstl/hash_map
+++ b/stlport/systemstl/hash_map
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hash_map,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/stlport/systemstl/hash_set b/stlport/systemstl/hash_set
index 89c4b51853dd..11ac7edb5a55 100644
--- a/stlport/systemstl/hash_set
+++ b/stlport/systemstl/hash_set
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hash_set,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/stlport/systemstl/numeric b/stlport/systemstl/numeric
index 5ea17ad0758a..3510ccb5bf57 100644
--- a/stlport/systemstl/numeric
+++ b/stlport/systemstl/numeric
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: numeric,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/stlport/systemstl/rope b/stlport/systemstl/rope
index c6349947ca7b..71ea13a022cf 100644
--- a/stlport/systemstl/rope
+++ b/stlport/systemstl/rope
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rope,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/stlport/systemstl/slist b/stlport/systemstl/slist
index 48a37c2fd512..6535c545e50d 100644
--- a/stlport/systemstl/slist
+++ b/stlport/systemstl/slist
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: slist,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/stlport/systemstl/vector b/stlport/systemstl/vector
index 1b9ab9eef418..f15038f9eaaf 100644
--- a/stlport/systemstl/vector
+++ b/stlport/systemstl/vector
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vector,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify