CWS svxsplit: merge with m71

21 files changed, 10139 insertions, 16001 deletions

diff --git a/configure b/configure
index ca6818eaab0e..56f069032265 100755
--- a/configure
+++ b/configure
@@ -1,82 +1,414 @@
 #! /bin/sh
 # From configure.in Revision: 1.290  .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
+# 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.
 #
-# 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 Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
 fi
-DUALCASE=1; export DUALCASE # for MKS sh
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
 fi
 
+# 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=';'
+  }
+fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+
+# 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
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-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
+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
 do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
+  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."
   else
-    $as_unset $as_var
+    $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
-done
+  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
 
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+# 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
+  fi
+  $as_echo "$as_me: error: $1" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; 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
 
-# Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_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'
@@ -84,146 +416,107 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: 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 |
+  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 |
     sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
       N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
       t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
+      s/-\n.*//
     ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
+  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; }
 
   # 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
+  # original and so on.  Autoconf is especially sensitive 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= ;;
+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';;
 esac
 
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
 else
-  as_expr=false
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
 fi
-
-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
+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
+    as_ln_s='cp -p'
   fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
-as_executable_p="test -f"
+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
 
 # 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'"
@@ -232,38 +525,24 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
+exec 7<&0 </dev/null 6>&1
 
 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
-exec 6>&1
-
 #
 # Initializations.
 #
 ac_default_prefix=/usr/local
+ac_clean_files=
 ac_config_libobj_dir=.
+LIBOBJS=
 cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
 
 # Identity of this package.
 PACKAGE_NAME=
@@ -271,50 +550,627 @@ PACKAGE_TARNAME=
 PACKAGE_VERSION=
 PACKAGE_STRING=
 PACKAGE_BUGREPORT=
+PACKAGE_URL=
 
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
 #else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 # endif
 #endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
 #endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS EGREP AWK SED LOCAL_SOLENV _solenv UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os GNUTAR OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP VC_STANDARD ENABLE_WERROR ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS DISABLE_STRIP ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX DISABLE_ACTIVEX DISABLE_ATL ENABLE_RPATH WITH_MYSPELL_DICTS SYSTEM_DICTS DICT_SYSTEM_DIR HYPH_SYSTEM_DIR THES_SYSTEM_DIR USE_SHELL WITH_MINGWIN SHELLPATH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_LD_BSYMBOLIC_FUNCTIONS ENABLE_PCH NO_HIDS GNUMAKE _cc HAVE_LD_HASH_STYLE PERL MSPDB_PATH COMEX USE_MINGW MIDL_PATH CSC_PATH FRAME_HOME CPP CXX CXXFLAGS ac_ct_CXX CXXCPP SIZEOF_LONG WORDS_BIGENDIAN LFS_CFLAGS ENABLE_VBA VBA_EXTENSION PAM NEW_SHADOW_API PAM_LINK CRYPT_LINK GXX_INCLUDE_PATH MINGW_LIB_INCLUDE_PATH MINGW_BACKWARD_INCLUDE_PATH MINGW_CLIB_DIR MINGW_SHARED_GCCLIB MINGW_GCCLIB_EH MINGW_SHARED_GXXLIB MINGW_GCCDLL MINGW_GXXDLL EXCEPTIONS STLPORT4 STLPORT_VER USE_SYSTEM_STL USE_CCACHE CCACHE HAVE_GCC_VISIBILITY_FEATURE ALLOC BUILD_VER_STRING SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVACISGCJ JAVADOC AWTLIB JAVAAOTCOMPILER JAVA_HOME JDK JAVAFLAGS DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM GPERF MINGWCXX ac_ct_MINGWCXX MINGWSTRIP ac_ct_MINGWSTRIP BUILD_UNOWINREG BUILD_QADEVOOO SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD FREETYPE_CFLAGS FREETYPE_LIBS USE_FT_EMBOLDEN LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC SYSTEM_LIBXSLT LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BZIP2 SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS HOME SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_LUCENE LUCENE_CORE_JAR LUCENE_ANALYZERS_JAR SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SERIALIZER_JAR SYSTEM_SAXON SAXON_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_VIGRA SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZ_NSS_CFLAGS MOZ_NSS_LIBS NSS_LIB MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS NSPR_LIB MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZGTK2_CFLAGS MOZGTK2_LIBS MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB ENABLE_NSS_MODULE MOZILLABUILD SYSTEM_MOZILLA MOZ_FLAVOUR MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_GENCMN SYSTEM_ICU GRAPHITE_CFLAGS GRAPHITE_LIBS ENABLE_GRAPHITE SYSTEM_GRAPHITE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB XAU_LIBS DISABLE_XAW SYSTEM_XRENDER_HEADERS XRENDER_LINK XRANDR_CFLAGS XRANDR_LIBS XRANDR_DLOPEN ENABLE_RANDR DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON NEON_VERSION OPENSSL_CFLAGS OPENSSL_LIBS SYSTEM_OPENSSL ENABLE_AGG AGG_CFLAGS AGG_LIBS SYSTEM_AGG AGG_VERSION REDLAND_CFLAGS REDLAND_LIBS SYSTEM_REDLAND HUNSPELL_CFLAGS HUNSPELL_LIBS SYSTEM_HUNSPELL SYSTEM_HYPH HYPHEN_LIB SYSTEM_MYTHES SYSTEM_LPSOLVE PSDK_HOME WINDOWS_VISTA_PSDK DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH BISON FLEX PATCH GNUCP GNUPATCH CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME ENABLE_GTK ENABLE_KDE ENABLE_KDE4 GCONF_CFLAGS GCONF_LIBS ENABLE_GCONF GNOMEVFS_CFLAGS GNOMEVFS_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS DBUS_CFLAGS DBUS_LIBS GIO_CFLAGS GIO_LIBS ENABLE_GIO ENABLE_DBUS ENABLE_SYSTRAY_GTK CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO BUILD_PIXMAN SYSTEM_CAIRO ENABLE_OPENGL ENABLE_MINIMIZER ENABLE_PRESENTER_SCREEN POPPLER_CFLAGS POPPLER_LIBS ENABLE_PDFIMPORT SYSTEM_POPPLER ENABLE_MEDIAWIKI SYSTEM_SERVLETAPI SERVLETAPI_JAR ENABLE_REPORTBUILDER SYSTEM_JFREEREPORT SAC_JAR LIBXML_JAR FLUTE_JAR JFREEREPORT_JAR LIBBASE_JAR LIBLAYOUT_JAR LIBLOADER_JAR LIBFORMULA_JAR LIBREPOSITORY_JAR LIBFONTS_JAR LIBSERIALIZER_JAR SYSTEM_APACHE_COMMONS COMMONS_CODEC_JAR COMMONS_LANG_JAR COMMONS_HTTPCLIENT_JAR COMMONS_LOGGING_JAR MOC KDE_CFLAGS KDE_LIBS MOC4 KDE4_CFLAGS KDE4_LIBS ENABLE_LOCKDOWN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTS WITHOUT_PPDS WITHOUT_AFMS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_POOR_HELP_LOCALIZATIONS WITH_DICT INTRO_BITMAPS ABOUT_BITMAPS OOO_VENDOR UNIXWRAPPERNAME ENABLE_STATIC_GTK ENABLE_LAYOUT VERBOSE LOCAL_SOLVER BUILD_TYPE LIBOBJS LTLIBOBJS'
+ac_subst_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_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
@@ -337,34 +1193,48 @@ 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'
-datadir='${prefix}/share'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
+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'
 
 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
 
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+  case $ac_option in
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
+  esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
-  case $ac_option in
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
@@ -386,33 +1256,59 @@ do
   --config-cache | -C)
     cache_file=config.cache ;;
 
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+  -datadir | --datadir | --datadi | --datad)
     ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
     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_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    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" ;;
+    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 ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    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 ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
     esac
-    eval "enable_$ac_feature='$ac_optarg'" ;;
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -439,6 +1335,12 @@ 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 ;;
@@ -463,13 +1365,16 @@ 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 | --local | --loca | --loc | --lo)
+  | --localstate | --localstat | --localsta | --localst | --locals)
     ac_prev=localstatedir ;;
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
     localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
@@ -534,6 +1439,16 @@ 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 ;;
@@ -584,26 +1499,36 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    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 ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
     esac
-    eval "with_$ac_package='$ac_optarg'" ;;
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    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" ;;
+    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 ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -623,26 +1548,25 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
+  -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { 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'"
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+    esac
+    eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -651,31 +1575,36 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "missing argument to $ac_option"
 fi
 
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
+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
-done
+fi
 
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
+# 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
 do
-  eval ac_val=$`echo $ac_var`
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   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'
@@ -689,7 +1618,7 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -702,86 +1631,72 @@ 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 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'`
+  # 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'`
   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
-  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
+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
 
 #
 # Report the --help message.
@@ -810,14 +1725,11 @@ 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
@@ -827,18 +1739,25 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --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]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -859,6 +1778,7 @@ 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
@@ -1008,6 +1928,9 @@ Optional Features:
   --disable-randr-link    disable linking with libXrandr, instead dynamically
                            open it at runtime
 
+  --enable-presenter-extra-ui   enables extra functionality during slideshow,
+                                 e.g. selecting pen color, erasing drawings etc.
+
   --enable-minimizer          enables the build of the Presentation Minimizer extension
 
   --enable-presenter-console          enables the build of the Presenter Console extension
@@ -1433,129 +2356,938 @@ 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>
-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-              headers in a nonstandard directory <include 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>
   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 || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
-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 "$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
 
 case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
+  .)  # We are building in place.
     ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
+    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 ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+    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
+    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
 
-# 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;;
+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
-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;;
+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
-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;;
+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;;
 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;;
+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;;
+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
 
-    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
+       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;;
+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;;
+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
+  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
 
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
+  ;
+  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 ()
+{
 
-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.
+  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
-  exit 0
+if ac_fn_c_try_run "$LINENO"; then :
+  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
+else
+  ac_retval=1
 fi
-exec 5>config.log
-cat >&5 <<_ACEOF
+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
+
+# 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;
+}
+_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
+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
 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.59.  Invocation command line was
+generated by GNU Autoconf 2.64.  Invocation command line was
 
   $ $0 $@
 
 _ACEOF
+exec 5>>config.log
 {
 cat <<_ASUNAME
 ## --------- ##
@@ -1574,7 +3306,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`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/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`
@@ -1586,8 +3318,9 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
+    $as_echo "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
 
 } >&5
 
@@ -1609,7 +3342,6 @@ _ACEOF
 ac_configure_args=
 ac_configure_args0=
 ac_configure_args1=
-ac_sep=
 ac_must_keep_next=false
 for ac_pass in 1 2
 do
@@ -1620,13 +3352,13 @@ do
     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
     2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      as_fn_append ac_configure_args1 " '$ac_arg'"
       if test $ac_must_keep_next = true; then
 	ac_must_keep_next=false # Got value, back to normal.
       else
@@ -1642,21 +3374,19 @@ do
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
+      as_fn_append ac_configure_args " '$ac_arg'"
       ;;
     esac
   done
 done
-$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; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset 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: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
+# 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.
 trap 'exit_status=$?
   # Save into config.log some information that might help in debugging.
   {
@@ -1669,20 +3399,35 @@ 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 `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}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 \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
-    esac;
-}
+    esac |
+    sort
+)
     echo
 
     cat <<\_ASBOX
@@ -1693,22 +3438,28 @@ _ASBOX
     echo
     for ac_var in $ac_subst_vars
     do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
+      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'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
       cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
+## ------------------- ##
+## File substitutions. ##
+## ------------------- ##
 _ASBOX
       echo
       for ac_var in $ac_subst_files
       do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
+	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'\''"
       done | sort
       echo
     fi
@@ -1720,26 +3471,26 @@ _ASBOX
 ## ----------- ##
 _ASBOX
       echo
-      sed "/^$/d" confdefs.h | sort
+      cat confdefs.h
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
-     ' 0
+' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
@@ -1747,40 +3498,46 @@ cat >>confdefs.h <<_ACEOF
 #define PACKAGE_NAME "$PACKAGE_NAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION "$PACKAGE_VERSION"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_STRING "$PACKAGE_STRING"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _ACEOF
 
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer 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
+# 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
   if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+    { $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;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
@@ -1790,69 +3547,79 @@ 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
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_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 `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+for ac_var in $ac_precious_vars; 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,)
-      { 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;}
+      { $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;}
       ac_cache_corrupted=: ;;
     ,set)
-      { 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;}
+      { $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;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ 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=:
+	# 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;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_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.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
-  { 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; }; }
+  { $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
 fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -1861,1036 +3628,1026 @@ 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 or --without-gnu-patch was given.
-if test "${with_gnu_patch+set}" = set; then
-  withval="$with_gnu_patch"
-
-fi;
+# Check whether --with-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"
 
-fi;
-# Check whether --enable-graphite or --disable-graphite was given.
-if test "${enable_graphite+set}" = set; then
-  enableval="$enable_graphite"
+# 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 was given.
+if test "${enable_graphite+set}" = set; then :
+  enableval=$enable_graphite;
+fi
 
-# Check whether --with-system-graphite or --without-system-graphite was given.
-if test "${with_system_graphite+set}" = set; then
-  withval="$with_system_graphite"
 
-fi;
-# Check whether --enable-ldap or --disable-ldap was given.
-if test "${enable_ldap+set}" = set; then
-  enableval="$enable_ldap"
+# 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 was given.
+if test "${enable_ldap+set}" = set; then :
+  enableval=$enable_ldap;
+fi
 
-# Check whether --with-openldap or --without-openldap was given.
-if test "${with_openldap+set}" = set; then
-  withval="$with_openldap"
 
-fi;
-# Check whether --enable-lockdown or --disable-lockdown was given.
-if test "${enable_lockdown+set}" = set; then
-  enableval="$enable_lockdown"
+# Check whether --with-openldap was given.
+if test "${with_openldap+set}" = set; then :
+  withval=$with_openldap;
+fi
 
-fi;
-# Check whether --enable-vba or --disable-vba was given.
-if test "${enable_vba+set}" = set; then
-  enableval="$enable_vba"
+# Check whether --enable-lockdown was given.
+if test "${enable_lockdown+set}" = set; then :
+  enableval=$enable_lockdown;
+fi
 
-fi;
+# Check whether --enable-vba was given.
+if test "${enable_vba+set}" = set; then :
+  enableval=$enable_vba;
+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"
 
-fi;
-# Check whether --enable-pch or --disable-pch was given.
-if test "${enable_pch+set}" = set; then
-  enableval="$enable_pch"
+# 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-hids or --disable-hids was given.
-if test "${enable_hids+set}" = set; then
-  enableval="$enable_hids"
+# Check whether --enable-pch was given.
+if test "${enable_pch+set}" = set; then :
+  enableval=$enable_pch;
+fi
 
-fi;
-# Check whether --enable-mozilla or --disable-mozilla was given.
-if test "${enable_mozilla+set}" = set; then
-  enableval="$enable_mozilla"
+# Check whether --enable-hids was given.
+if test "${enable_hids+set}" = set; then :
+  enableval=$enable_hids;
+fi
 
+# 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"
 
-fi;
+# Check whether --with-fonts was given.
+if test "${with_fonts+set}" = set; then :
+  withval=$with_fonts;
+fi
 
-# Check whether --with-ppds or --without-ppds was given.
-if test "${with_ppds+set}" = set; then
-  withval="$with_ppds"
 
-fi;
+# Check whether --with-ppds was given.
+if test "${with_ppds+set}" = set; then :
+  withval=$with_ppds;
+fi
 
-# Check whether --with-afms or --without-afms was given.
-if test "${with_afms+set}" = set; then
-  withval="$with_afms"
 
-fi;
-# Check whether --enable-epm or --disable-epm was given.
-if test "${enable_epm+set}" = set; then
-  enableval="$enable_epm"
+# Check whether --with-afms was given.
+if test "${with_afms+set}" = set; then :
+  withval=$with_afms;
+fi
 
+# 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"
 
-fi;
+# Check whether --with-epm was given.
+if test "${with_epm+set}" = set; then :
+  withval=$with_epm;
+fi
 
-# Check whether --with-package-format or --without-package-format was given.
-if test "${with_package_format+set}" = set; then
-  withval="$with_package_format"
 
-fi;
-# Check whether --enable-odk or --disable-odk was given.
-if test "${enable_odk+set}" = set; then
-  enableval="$enable_odk"
+# Check whether --with-package-format was given.
+if test "${with_package_format+set}" = set; then :
+  withval=$with_package_format;
+fi
 
+# Check whether --enable-odk was given.
+if test "${enable_odk+set}" = set; then :
+  enableval=$enable_odk;
 else
   enable_odk="yes"
-fi;
-# Check whether --enable-qadevooo or --disable-qadevooo was given.
-if test "${enable_qadevooo+set}" = set; then
-  enableval="$enable_qadevooo"
+fi
 
+# Check whether --enable-qadevooo was given.
+if test "${enable_qadevooo+set}" = set; then :
+  enableval=$enable_qadevooo;
 else
   enable_qadevooo="yes"
-fi;
-# Check whether --enable-mathmldtd or --disable-mathmldtd was given.
-if test "${enable_mathmldtd+set}" = set; then
-  enableval="$enable_mathmldtd"
+fi
 
+# Check whether --enable-mathmldtd was given.
+if test "${enable_mathmldtd+set}" = set; then :
+  enableval=$enable_mathmldtd;
 else
   enable_mathmldtd="yes"
-fi;
-# Check whether --enable-evolution2 or --disable-evolution2 was given.
-if test "${enable_evolution2+set}" = set; then
-  enableval="$enable_evolution2"
+fi
 
-fi;
+# Check whether --enable-evolution2 was given.
+if test "${enable_evolution2+set}" = set; then :
+  enableval=$enable_evolution2;
+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;
-# Check whether --enable-cups or --disable-cups was given.
-if test "${enable_cups+set}" = set; then
-  enableval="$enable_cups"
+fi
 
+# Check whether --enable-cups was given.
+if test "${enable_cups+set}" = set; then :
+  enableval=$enable_cups;
 else
   enable_cups=yes
-fi;
-# Check whether --enable-fontconfig or --disable-fontconfig was given.
-if test "${enable_fontconfig+set}" = set; then
-  enableval="$enable_fontconfig"
+fi
 
+# Check whether --enable-fontconfig was given.
+if test "${enable_fontconfig+set}" = set; then :
+  enableval=$enable_fontconfig;
 else
   enable_fontconfig=yes
-fi;
-# Check whether --enable-directx or --disable-directx was given.
-if test "${enable_directx+set}" = set; then
-  enableval="$enable_directx"
+fi
 
+# Check whether --enable-directx was given.
+if test "${enable_directx+set}" = set; then :
+  enableval=$enable_directx;
 else
   enable_directx=yes
-fi;
-# Check whether --enable-activex or --disable-activex was given.
-if test "${enable_activex+set}" = set; then
-  enableval="$enable_activex"
+fi
 
-fi;
+# Check whether --enable-activex was given.
+if test "${enable_activex+set}" = set; then :
+  enableval=$enable_activex;
+fi
 
-# Check whether --enable-atl or --disable-atl was given.
-if test "${enable_atl+set}" = set; then
-  enableval="$enable_atl"
 
-fi;
+# Check whether --enable-atl was given.
+if test "${enable_atl+set}" = set; then :
+  enableval=$enable_atl;
+fi
 
-# Check whether --enable-symbols or --disable-symbols was given.
-if test "${enable_symbols+set}" = set; then
-  enableval="$enable_symbols"
 
-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-symbols was given.
+if test "${enable_symbols+set}" = set; then :
+  enableval=$enable_symbols;
+fi
 
-fi;
-# Check whether --enable-werror or --disable-werror was given.
-if test "${enable_werror+set}" = set; then
-  enableval="$enable_werror"
+# Check whether --enable-strip-solver was given.
+if test "${enable_strip_solver+set}" = set; then :
+  enableval=$enable_strip_solver;
+fi
 
-fi;
-# Check whether --enable-debug or --disable-debug was given.
-if test "${enable_debug+set}" = set; then
-  enableval="$enable_debug"
+# Check whether --enable-werror was given.
+if test "${enable_werror+set}" = set; then :
+  enableval=$enable_werror;
+fi
 
-fi;
-# Check whether --enable-dbgutil or --disable-dbgutil was given.
-if test "${enable_dbgutil+set}" = set; then
-  enableval="$enable_dbgutil"
+# Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then :
+  enableval=$enable_debug;
+fi
 
-fi;
-# Check whether --enable-crashdump or --disable-crashdump was given.
-if test "${enable_crashdump+set}" = set; then
-  enableval="$enable_crashdump"
+# Check whether --enable-dbgutil was given.
+if test "${enable_dbgutil+set}" = set; then :
+  enableval=$enable_dbgutil;
+fi
 
+# Check whether --enable-crashdump was given.
+if test "${enable_crashdump+set}" = set; then :
+  enableval=$enable_crashdump;
 else
   enable_crashdump=no
-fi;
-# Check whether --enable-cl-standard or --disable-cl-standard was given.
-if test "${enable_cl_standard+set}" = set; then
-  enableval="$enable_cl_standard"
+fi
 
-fi;
-# Check whether --enable-gtk or --disable-gtk was given.
-if test "${enable_gtk+set}" = set; then
-  enableval="$enable_gtk"
+# Check whether --enable-cl-standard was given.
+if test "${enable_cl_standard+set}" = set; then :
+  enableval=$enable_cl_standard;
+fi
 
+# Check whether --enable-gtk was given.
+if test "${enable_gtk+set}" = set; then :
+  enableval=$enable_gtk;
 else
   enable_gtk=yes
-fi;
-# Check whether --enable-systray or --disable-systray was given.
-if test "${enable_systray+set}" = set; then
-  enableval="$enable_systray"
+fi
 
+# Check whether --enable-systray was given.
+if test "${enable_systray+set}" = set; then :
+  enableval=$enable_systray;
 else
   enable_systray=yes
-fi;
-# Check whether --enable-cairo or --disable-cairo was given.
-if test "${enable_cairo+set}" = set; then
-  enableval="$enable_cairo"
+fi
 
+# 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"
 
-fi;
-# Check whether --enable-opengl or --disable-opengl was given.
-if test "${enable_opengl+set}" = set; then
-  enableval="$enable_opengl"
+# Check whether --with-system-cairo was given.
+if test "${with_system_cairo+set}" = set; then :
+  withval=$with_system_cairo;
+fi
 
+# Check whether --enable-opengl was given.
+if test "${enable_opengl+set}" = set; then :
+  enableval=$enable_opengl;
 else
   enable_opengl=no
-fi;
-# Check whether --enable-dbus or --disable-dbus was given.
-if test "${enable_dbus+set}" = set; then
-  enableval="$enable_dbus"
+fi
 
+# Check whether --enable-dbus was given.
+if test "${enable_dbus+set}" = set; then :
+  enableval=$enable_dbus;
 else
   enable_dbus=no
-fi;
-# Check whether --enable-gconf or --disable-gconf was given.
-if test "${enable_gconf+set}" = set; then
-  enableval="$enable_gconf"
+fi
 
+# Check whether --enable-gconf was given.
+if test "${enable_gconf+set}" = set; then :
+  enableval=$enable_gconf;
 else
   enable_gconf=yes
-fi;
-# Check whether --enable-gnome-vfs or --disable-gnome-vfs was given.
-if test "${enable_gnome_vfs+set}" = set; then
-  enableval="$enable_gnome_vfs"
+fi
 
+# 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;
-# Check whether --enable-gio or --disable-gio was given.
-if test "${enable_gio+set}" = set; then
-  enableval="$enable_gio"
+fi
 
+# Check whether --enable-gio was given.
+if test "${enable_gio+set}" = set; then :
+  enableval=$enable_gio;
 else
   enable_gio=no
-fi;
-# Check whether --enable-static-gtk or --disable-static-gtk was given.
-if test "${enable_static_gtk+set}" = set; then
-  enableval="$enable_static_gtk"
+fi
 
-fi;
-# Check whether --enable-layout or --disable-layout was given.
-if test "${enable_layout+set}" = set; then
-  enableval="$enable_layout"
+# Check whether --enable-static-gtk was given.
+if test "${enable_static_gtk+set}" = set; then :
+  enableval=$enable_static_gtk;
+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-layout was given.
+if test "${enable_layout+set}" = set; then :
+  enableval=$enable_layout;
+fi
 
-fi;
+# Check whether --enable-build-mozilla was given.
+if test "${enable_build_mozilla+set}" = set; then :
+  enableval=$enable_build_mozilla;
+fi
 
-# Check whether --with-mozilla-version or --without-mozilla-version was given.
-if test "${with_mozilla_version+set}" = set; then
-  withval="$with_mozilla_version"
 
-fi;
+# Check whether --with-mozilla-version was given.
+if test "${with_mozilla_version+set}" = set; then :
+  withval=$with_mozilla_version;
+fi
 
-# Check whether --with-mozilla-toolkit or --without-mozilla-toolkit was given.
-if test "${with_mozilla_toolkit+set}" = set; then
-  withval="$with_mozilla_toolkit"
 
-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 --with-mozilla-toolkit was given.
+if test "${with_mozilla_toolkit+set}" = set; then :
+  withval=$with_mozilla_toolkit;
+fi
 
+# 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;
-# Check whether --enable-kde or --disable-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-kde was given.
+if test "${enable_kde+set}" = set; then :
+  enableval=$enable_kde;
+fi
 
+# 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;
-# Check whether --enable-kde4 or --disable-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-kde4 was given.
+if test "${enable_kde4+set}" = set; then :
+  enableval=$enable_kde4;
+fi
 
+# 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;
-# Check whether --enable-rpath or --disable-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-rpath was given.
+if test "${enable_rpath+set}" = set; then :
+  enableval=$enable_rpath;
+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 was given.
+if test "${enable_pam+set}" = set; then :
+  enableval=$enable_pam;
+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-pam-link was given.
+if test "${enable_pam_link+set}" = set; then :
+  enableval=$enable_pam_link;
+fi
 
+# 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;
-# Check whether --enable-xrender-link or --disable-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-xrender-link was given.
+if test "${enable_xrender_link+set}" = set; then :
+  enableval=$enable_xrender_link;
+fi
 
+# Check whether --enable-randr was given.
+if test "${enable_randr+set}" = set; then :
+  enableval=$enable_randr;
 else
   enable_randr=yes
-fi;
-# Check whether --enable-randr-link or --disable-randr-link was given.
-if test "${enable_randr_link+set}" = set; then
-  enableval="$enable_randr_link"
+fi
 
+# 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;
+fi
+
+
+# Check whether --with-myspell-dicts was given.
+if test "${with_myspell_dicts+set}" = set; then :
+  withval=$with_myspell_dicts;
+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-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-headers was given.
+if test "${with_system_headers+set}" = set; then :
+  withval=$with_system_headers;
+fi
+
+
+# Check whether --with-system-jars was given.
+if test "${with_system_jars+set}" = set; then :
+  withval=$with_system_jars;
+fi
+
+
+# Check whether --with-system-zlib was given.
+if test "${with_system_zlib+set}" = set; then :
+  withval=$with_system_zlib;
+fi
+
+
+# Check whether --with-system-openssl was given.
+if test "${with_system_openssl+set}" = set; then :
+  withval=$with_system_openssl;
+fi
+
+
+# Check whether --with-system-jpeg was given.
+if test "${with_system_jpeg+set}" = set; then :
+  withval=$with_system_jpeg;
+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-system-expat was given.
+if test "${with_system_expat+set}" = set; then :
+  withval=$with_system_expat;
+fi
 
-# Check whether --with-system-dicts or --without-system-dicts was given.
-if test "${with_system_dicts+set}" = set; then
-  withval="$with_system_dicts"
 
-fi;
+# Check whether --with-system-libwpd was given.
+if test "${with_system_libwpd+set}" = set; then :
+  withval=$with_system_libwpd;
+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"
 
-fi;
+# Check whether --with-system-libxml was given.
+if test "${with_system_libxml+set}" = set; then :
+  withval=$with_system_libxml;
+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"
 
-fi;
+# Check whether --with-system-python was given.
+if test "${with_system_python+set}" = set; then :
+  withval=$with_system_python;
+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"
 
-fi;
+# Check whether --with-system-icu was given.
+if test "${with_system_icu+set}" = set; then :
+  withval=$with_system_icu;
+fi
 
-# Check whether --with-system-libs or --without-system-libs was given.
-if test "${with_system_libs+set}" = set; then
-  withval="$with_system_libs"
 
-fi;
+# Check whether --with-system-poppler was given.
+if test "${with_system_poppler+set}" = set; then :
+  withval=$with_system_poppler;
+fi
 
-# Check whether --with-system-headers or --without-system-headers was given.
-if test "${with_system_headers+set}" = set; then
-  withval="$with_system_headers"
 
-fi;
+# Check whether --with-system-db was given.
+if test "${with_system_db+set}" = set; then :
+  withval=$with_system_db;
+fi
 
-# Check whether --with-system-jars or --without-system-jars was given.
-if test "${with_system_jars+set}" = set; then
-  withval="$with_system_jars"
 
-fi;
+# Check whether --with-system-lucene was given.
+if test "${with_system_lucene+set}" = set; then :
+  withval=$with_system_lucene;
+fi
 
-# Check whether --with-system-zlib or --without-system-zlib was given.
-if test "${with_system_zlib+set}" = set; then
-  withval="$with_system_zlib"
 
-fi;
+# 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
 
-# Check whether --with-system-openssl or --without-system-openssl was given.
-if test "${with_system_openssl+set}" = set; then
-  withval="$with_system_openssl"
 
-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"
+
+fi
 
-# Check whether --with-system-jpeg or --without-system-jpeg was given.
-if test "${with_system_jpeg+set}" = set; then
-  withval="$with_system_jpeg"
 
-fi;
+# Check whether --with-system-hsqldb was given.
+if test "${with_system_hsqldb+set}" = set; then :
+  withval=$with_system_hsqldb;
+fi
 
-# Check whether --with-system-expat or --without-system-expat was given.
-if test "${with_system_expat+set}" = set; then
-  withval="$with_system_expat"
 
-fi;
+# Check whether --with-hsqldb-jar was given.
+if test "${with_hsqldb_jar+set}" = set; then :
+  withval=$with_hsqldb_jar;  HSQLDB_JAR="$withval"
 
-# Check whether --with-system-libwpd or --without-system-libwpd was given.
-if test "${with_system_libwpd+set}" = set; then
-  withval="$with_system_libwpd"
+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-beanshell was given.
+if test "${with_system_beanshell+set}" = set; then :
+  withval=$with_system_beanshell;
+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-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-icu or --without-system-icu was given.
-if test "${with_system_icu+set}" = set; then
-  withval="$with_system_icu"
+# 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
 
-fi;
+# Check whether --enable-minimizer was given.
+if test "${enable_minimizer+set}" = set; then :
+  enableval=$enable_minimizer;
+fi
 
-# Check whether --with-system-poppler or --without-system-poppler was given.
-if test "${with_system_poppler+set}" = set; then
-  withval="$with_system_poppler"
+# Check whether --enable-presenter-console was given.
+if test "${enable_presenter_console+set}" = set; then :
+  enableval=$enable_presenter_console;
+fi
 
-fi;
+# Check whether --enable-pdfimport was given.
+if test "${enable_pdfimport+set}" = set; then :
+  enableval=$enable_pdfimport;
+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 --enable-wiki-publisher was given.
+if test "${enable_wiki_publisher+set}" = set; then :
+  enableval=$enable_wiki_publisher;
+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-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-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-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-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
 
-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-httpclient-jar was given.
+if test "${with_commons_httpclient_jar+set}" = set; then :
+  withval=$with_commons_httpclient_jar;  COMMONS_HTTPCLIENT_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-logging-jar was given.
+if test "${with_commons_logging_jar+set}" = set; then :
+  withval=$with_commons_logging_jar;  COMMONS_LOGGING_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-servlet-api-jar was given.
+if test "${with_servlet_api_jar+set}" = set; then :
+  withval=$with_servlet_api_jar;  SERVLETAPI_JAR="$withval"
 
-fi;
-# Check whether --enable-minimizer or --disable-minimizer was given.
-if test "${enable_minimizer+set}" = set; then
-  enableval="$enable_minimizer"
+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"
+# Check whether --enable-report-builder was given.
+if test "${enable_report_builder+set}" = set; then :
+  enableval=$enable_report_builder;
+fi
 
-fi;
-# Check whether --enable-pdfimport or --disable-pdfimport was given.
-if test "${enable_pdfimport+set}" = set; then
-  enableval="$enable_pdfimport"
 
-fi;
-# Check whether --enable-wiki-publisher or --disable-wiki-publisher was given.
-if test "${enable_wiki_publisher+set}" = set; then
-  enableval="$enable_wiki_publisher"
+# Check whether --with-system-jfreereport was given.
+if test "${with_system_jfreereport+set}" = set; then :
+  withval=$with_system_jfreereport;
+fi
 
-fi;
 
-# 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"
+# Check whether --with-sac-jar was given.
+if test "${with_sac_jar+set}" = set; then :
+  withval=$with_sac_jar;  SAC_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"
 
-fi;
+# Check whether --with-libxml-jar was given.
+if test "${with_libxml_jar+set}" = set; then :
+  withval=$with_libxml_jar;  LIBXML_JAR="$withval"
 
-# 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
 
-fi;
 
-# 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"
+# Check whether --with-flute-jar was given.
+if test "${with_flute_jar+set}" = set; then :
+  withval=$with_flute_jar;  FLUTE_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"
 
-fi;
-# Check whether --enable-report-builder or --disable-report-builder was given.
-if test "${enable_report_builder+set}" = set; then
-  enableval="$enable_report_builder"
+# Check whether --with-jfreereport-jar was given.
+if test "${with_jfreereport_jar+set}" = set; then :
+  withval=$with_jfreereport_jar;  JFREEREPORT_JAR="$withval"
 
-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"
 
-fi;
+# Check whether --with-liblayout-jar was given.
+if test "${with_liblayout_jar+set}" = set; then :
+  withval=$with_liblayout_jar;  LIBLAYOUT_JAR="$withval"
 
-# 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
 
-fi;
 
-# 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"
+# 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-flute-jar or --without-flute-jar was given.
-if test "${with_flute_jar+set}" = set; then
-  withval="$with_flute_jar"
-   FLUTE_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-jfreereport-jar or --without-jfreereport-jar was given.
-if test "${with_jfreereport_jar+set}" = set; then
-  withval="$with_jfreereport_jar"
-   JFREEREPORT_JAR="$withval"
+fi
 
-fi;
 
-# 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"
+# Check whether --with-libformula-jar was given.
+if test "${with_libformula_jar+set}" = set; then :
+  withval=$with_libformula_jar;  LIBFORMULA_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-librepository-jar was given.
+if test "${with_librepository_jar+set}" = set; then :
+  withval=$with_librepository_jar;  LIBREPOSITORY_JAR="$withval"
 
-# 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
 
-fi;
 
-# 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"
+# Check whether --with-libfonts-jar was given.
+if test "${with_libfonts_jar+set}" = set; then :
+  withval=$with_libfonts_jar;  LIBFONTS_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"
 
-fi;
+# Check whether --with-libserializer-jar was given.
+if test "${with_libserializer_jar+set}" = set; then :
+  withval=$with_libserializer_jar;  LIBSERIALIZER_JAR="$withval"
 
-# 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
 
-fi;
 
-# 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"
+# Check whether --with-libbase-jar was given.
+if test "${with_libbase_jar+set}" = set; then :
+  withval=$with_libbase_jar;  LIBBASE_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"
 
-fi;
+# Check whether --with-system-saxon was given.
+if test "${with_system_saxon+set}" = set; then :
+  withval=$with_system_saxon;
+fi
 
-# Check whether --with-system-saxon or --without-system-saxon was given.
-if test "${with_system_saxon+set}" = set; then
-  withval="$with_system_saxon"
 
-fi;
+# Check whether --with-saxon-jar was given.
+if test "${with_saxon_jar+set}" = set; then :
+  withval=$with_saxon_jar;  SAXON_JAR="$withval"
 
-# 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
 
-fi;
 
-# Check whether --with-system-libxslt or --without-system-libxslt was given.
-if test "${with_system_libxslt+set}" = set; then
-  withval="$with_system_libxslt"
+# Check whether --with-system-libxslt was given.
+if test "${with_system_libxslt+set}" = set; then :
+  withval=$with_system_libxslt;
+fi
 
-fi;
 
-# Check whether --with-system-odbc or --without-system-odbc was given.
-if test "${with_system_odbc+set}" = set; then
-  withval="$with_system_odbc"
+# Check whether --with-system-odbc was given.
+if test "${with_system_odbc+set}" = set; then :
+  withval=$with_system_odbc;
+fi
 
-fi;
 
-# Check whether --with-system-sane or --without-system-sane was given.
-if test "${with_system_sane+set}" = set; then
-  withval="$with_system_sane"
+# Check whether --with-system-sane was given.
+if test "${with_system_sane+set}" = set; then :
+  withval=$with_system_sane;
+fi
 
-fi;
 
-# Check whether --with-system-xrender or --without-system-xrender was given.
-if test "${with_system_xrender+set}" = set; then
-  withval="$with_system_xrender"
+# Check whether --with-system-xrender was given.
+if test "${with_system_xrender+set}" = set; then :
+  withval=$with_system_xrender;
+fi
 
-fi;
 
-# Check whether --with-system-curl or --without-system-curl was given.
-if test "${with_system_curl+set}" = set; then
-  withval="$with_system_curl"
+# Check whether --with-system-curl was given.
+if test "${with_system_curl+set}" = set; then :
+  withval=$with_system_curl;
+fi
 
-fi;
 
-# Check whether --with-system-boost or --without-system-boost was given.
-if test "${with_system_boost+set}" = set; then
-  withval="$with_system_boost"
+# Check whether --with-system-boost was given.
+if test "${with_system_boost+set}" = set; then :
+  withval=$with_system_boost;
+fi
 
-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 --with-system-vigra was given.
+if test "${with_system_vigra+set}" = set; then :
+  withval=$with_system_vigra;
+fi
 
-fi;
-# Check whether --enable-neon or --disable-neon was given.
-if test "${enable_neon+set}" = set; then
-  enableval="$enable_neon"
+# Check whether --enable-neon was given.
+if test "${enable_neon+set}" = set; then :
+  enableval=$enable_neon;
+fi
 
-fi;
-# Check whether --enable-Xaw or --disable-Xaw was given.
-if test "${enable_Xaw+set}" = set; then
-  enableval="$enable_Xaw"
+# Check whether --enable-Xaw was given.
+if test "${enable_Xaw+set}" = set; then :
+  enableval=$enable_Xaw;
+fi
 
-fi;
 
-# Check whether --with-system-neon or --without-system-neon was given.
-if test "${with_system_neon+set}" = set; then
-  withval="$with_system_neon"
+# Check whether --with-system-neon was given.
+if test "${with_system_neon+set}" = set; then :
+  withval=$with_system_neon;
+fi
 
-fi;
 
-# Check whether --with-system-agg or --without-system-agg was given.
-if test "${with_system_agg+set}" = set; then
-  withval="$with_system_agg"
+# Check whether --with-system-agg was given.
+if test "${with_system_agg+set}" = set; then :
+  withval=$with_system_agg;
+fi
 
-fi;
 
-# Check whether --with-system-hunspell or --without-system-hunspell was given.
-if test "${with_system_hunspell+set}" = set; then
-  withval="$with_system_hunspell"
+# Check whether --with-system-hunspell was given.
+if test "${with_system_hunspell+set}" = set; then :
+  withval=$with_system_hunspell;
+fi
 
-fi;
 
-# Check whether --with-system-mythes or --without-system-mythes was given.
-if test "${with_system_mythes+set}" = set; then
-  withval="$with_system_mythes"
+# Check whether --with-system-mythes was given.
+if test "${with_system_mythes+set}" = set; then :
+  withval=$with_system_mythes;
+fi
 
-fi;
 
-# Check whether --with-system-altlinuxhyph or --without-system-altlinuxhyph was given.
-if test "${with_system_altlinuxhyph+set}" = set; then
-  withval="$with_system_altlinuxhyph"
+# Check whether --with-system-altlinuxhyph was given.
+if test "${with_system_altlinuxhyph+set}" = set; then :
+  withval=$with_system_altlinuxhyph;
+fi
 
-fi;
 
-# Check whether --with-system-lpsolve or --without-system-lpsolve was given.
-if test "${with_system_lpsolve+set}" = set; then
-  withval="$with_system_lpsolve"
+# Check whether --with-system-lpsolve was given.
+if test "${with_system_lpsolve+set}" = set; then :
+  withval=$with_system_lpsolve;
+fi
 
-fi;
 
-# 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
+# Check whether --with-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 or --without-stlport was given.
-if test "${with_stlport+set}" = set; then
-  withval="$with_stlport"
-  WITH_STLPORT=$withval
+# Check whether --with-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 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
+# 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
 else
   WITH_JAVA=java
-fi;
-# Check whether --enable-gcjaot or --disable-gcjaot was given.
-if test "${enable_gcjaot+set}" = set; then
-  enableval="$enable_gcjaot"
+fi
 
-fi;
+# Check whether --enable-gcjaot was given.
+if test "${enable_gcjaot+set}" = set; then :
+  enableval=$enable_gcjaot;
+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-ant-home was given.
+if test "${with_ant_home+set}" = set; then :
+  withval=$with_ant_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-perl-home was given.
+if test "${with_perl_home+set}" = set; then :
+  withval=$with_perl_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-cl-home was given.
+if test "${with_cl_home+set}" = set; then :
+  withval=$with_cl_home;
+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-mspdb-path was given.
+if test "${with_mspdb_path+set}" = set; then :
+  withval=$with_mspdb_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-midl-path was given.
+if test "${with_midl_path+set}" = set; then :
+  withval=$with_midl_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-csc-path was given.
+if test "${with_csc_path+set}" = set; then :
+  withval=$with_csc_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-nsis-path was given.
+if test "${with_nsis_path+set}" = set; then :
+  withval=$with_nsis_path;
+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-frame-home was given.
+if test "${with_frame_home+set}" = set; then :
+  withval=$with_frame_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-psdk-home was given.
+if test "${with_psdk_home+set}" = set; then :
+  withval=$with_psdk_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-directx-home was given.
+if test "${with_directx_home+set}" = set; then :
+  withval=$with_directx_home;
+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-mozilla-build was given.
+if test "${with_mozilla_build+set}" = set; then :
+  withval=$with_mozilla_build; MOZILLABUILD=$withval
+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-solenv was given.
+if test "${with_local_solenv+set}" = set; then :
+  withval=$with_local_solenv;
+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 --with-local-solver was given.
+if test "${with_local_solver+set}" = set; then :
+  withval=$with_local_solver;
+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-check-only was given.
+if test "${enable_check_only+set}" = set; then :
+  enableval=$enable_check_only;
+fi
 
+# 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 or --without-dict was given.
-if test "${with_dict+set}" = set; then
-  withval="$with_dict"
+# Check whether --with-dict was given.
+if test "${with_dict+set}" = set; then :
+  withval=$with_dict;
+fi
 
-fi;
 
-# Check whether --with-intro-bitmaps or --without-intro-bitmaps was given.
-if test "${with_intro_bitmaps+set}" = set; then
-  withval="$with_intro_bitmaps"
+# Check whether --with-intro-bitmaps was given.
+if test "${with_intro_bitmaps+set}" = set; then :
+  withval=$with_intro_bitmaps;
+fi
 
-fi;
 
-# Check whether --with-about-bitmaps or --without-about-bitmaps was given.
-if test "${with_about_bitmaps+set}" = set; then
-  withval="$with_about_bitmaps"
+# Check whether --with-about-bitmaps was given.
+if test "${with_about_bitmaps+set}" = set; then :
+  withval=$with_about_bitmaps;
+fi
 
-fi;
 
-# Check whether --with-vendor or --without-vendor was given.
-if test "${with_vendor+set}" = set; then
-  withval="$with_vendor"
+# Check whether --with-vendor was given.
+if test "${with_vendor+set}" = set; then :
+  withval=$with_vendor;
+fi
 
-fi;
 
-# Check whether --with-unix-wrapper or --without-unix-wrapper was given.
-if test "${with_unix_wrapper+set}" = set; then
-  withval="$with_unix_wrapper"
+# Check whether --with-unix-wrapper was given.
+if test "${with_unix_wrapper+set}" = set; then :
+  withval=$with_unix_wrapper;
+fi
 
-fi;
 
-# Check whether --with-asm-home or --without-asm-home was given.
-if test "${with_asm_home+set}" = set; then
-  withval="$with_asm_home"
+# Check whether --with-asm-home was given.
+if test "${with_asm_home+set}" = set; then :
+  withval=$with_asm_home;
+fi
 
-fi;
 
-# Check whether --with-os-version or --without-os-version was given.
-if test "${with_os_version+set}" = set; then
-  withval="$with_os_version"
+# Check whether --with-os-version was given.
+if test "${with_os_version+set}" = set; then :
+  withval=$with_os_version;
+fi
 
-fi;
 
-# Check whether --with-unzip-home or --without-unzip-home was given.
-if test "${with_unzip_home+set}" = set; then
-  withval="$with_unzip_home"
+# Check whether --with-unzip-home was given.
+if test "${with_unzip_home+set}" = set; then :
+  withval=$with_unzip_home;
+fi
 
-fi;
 
-# Check whether --with-zip-home or --without-zip-home was given.
-if test "${with_zip_home+set}" = set; then
-  withval="$with_zip_home"
+# Check whether --with-zip-home was given.
+if test "${with_zip_home+set}" = set; then :
+  withval=$with_zip_home;
+fi
 
-fi;
 
-# Check whether --with-mingwin or --without-mingwin was given.
-if test "${with_mingwin+set}" = set; then
-  withval="$with_mingwin"
-  WITH_MINGWIN=$withval
+# Check whether --with-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 or --without-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 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 was given.
+if test "${with_build_version+set}" = set; then :
+  withval=$with_build_version; with_build_version=$withval
+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-alloc or --without-alloc was given.
-if test "${with_alloc+set}" = set; then
-  withval="$with_alloc"
+# Check whether --with-alloc was given.
+if test "${with_alloc+set}" = set; then :
+  withval=$with_alloc;
+fi
 
-fi;
-# Check whether --enable-verbose or --disable-verbose was given.
-if test "${enable_verbose+set}" = set; then
-  enableval="$enable_verbose"
+# Check whether --enable-verbose was given.
+if test "${enable_verbose+set}" = set; then :
+  enableval=$enable_verbose;
+fi
 
-fi;
 
 BUILD_TYPE="OOo"
 
@@ -2917,29 +4674,144 @@ echo "*                                                                  *"
 echo "********************************************************************"
 echo ""
 cat /dev/null > warn
-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'
+{ $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
+    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
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
+{ $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"
 
 
 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
-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
+{ $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
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -2949,35 +4821,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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
-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
+{ $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
 else
   case $AWK in
   [\\/]* | ?:[\\/]*)
@@ -2989,42 +4863,41 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_AWK="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 AWK=$ac_cv_path_AWK
-
 if test -n "$AWK"; then
-  echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 if test -z "$AWK"; then
-   { { 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; }; }
+   as_fn_error "install awk to run this script" "$LINENO" 5
 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
-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
+{ $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
 else
   case $SED in
   [\\/]* | ?:[\\/]*)
@@ -3036,47 +4909,46 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 SED=$ac_cv_path_SED
-
 if test -n "$SED"; then
-  echo "$as_me:$LINENO: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
+$as_echo "$SED" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   test -n "$SED" && break
 done
 
 if test -z "$SED"; then
-   { { 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; }; }
+   as_fn_error "install sed to run this script" "$LINENO" 5
 fi
 
-echo "$as_me:$LINENO: checking for solenv environment" >&5
-echo $ECHO_N "checking for solenv environment... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for solenv environment" >&5
+$as_echo_n "checking for solenv environment... " >&6; }
 if test -z "$with_local_solenv"; then
    LOCAL_SOLENV="DEFAULT"
-   echo "$as_me:$LINENO: result: default" >&5
-echo "${ECHO_T}default" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: default" >&5
+$as_echo "default" >&6; }
 else
    LOCAL_SOLENV=$with_local_solenv
-   echo "$as_me:$LINENO: result: $with_local_solenv" >&5
-echo "${ECHO_T}$with_local_solenv" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_local_solenv" >&5
+$as_echo "$with_local_solenv" >&6; }
 fi
 
 
@@ -3094,110 +4966,134 @@ if test -e $_solenv/inc/minor.mk; then
    SOURCEVERSION="`grep SOURCEVERSION= $_solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
 
 else
-   { { 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; }; }
+   as_fn_error "$_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation..." "$LINENO" 5
 fi
 
 ac_aux_dir=
-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
+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
 done
 if test -z "$ac_aux_dir"; then
-  { { 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; }; }
+  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
-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.
+
+# 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.
+
 
 # Make sure we can run config.sub.
-$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
+$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
 build=$ac_cv_build
-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/'`
+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
 
 
-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
+{ $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
-  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; }; }
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
+{ $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
 host=$ac_cv_host
-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/'`
+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
 
 
-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
+{ $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
+else
+  if test "x$target_alias" = x; then
+  ac_cv_target=$ac_cv_host
 else
-  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; }; }
+  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
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6
+{ $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
 target=$ac_cv_target
-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/'`
+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
 
 
 # The aliases save the names the user supplied, while $host etc.
@@ -3206,23 +5102,22 @@ 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
-	{ 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;}
+	{ $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 "cross-compiling by any means is not supported (yet)!" >> warn
 fi
 
 if echo "$build_os" | grep cygwin; then
-   echo "$as_me:$LINENO: checking Cygwin version" >&5
-echo $ECHO_N "checking Cygwin version... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking Cygwin version" >&5
+$as_echo_n "checking Cygwin version... " >&6; }
    CygwinVer=`uname -r`
-   echo "$as_me:$LINENO: result: $CygwinVer" >&5
-echo "${ECHO_T}$CygwinVer" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CygwinVer" >&5
+$as_echo "$CygwinVer" >&6; }
    if test "`echo $CygwinVer | $AWK -F . '{ print $1$2 }'`" -lt "15"; then
-      { { 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; }; }
+      as_fn_error "You need at least Cygwin V1.5.x" "$LINENO" 5
    fi
 else
    CygwinVer="false"
@@ -3239,10 +5134,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
-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
+{ $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
 else
   case $GNUTAR in
   [\\/]* | ?:[\\/]*)
@@ -3255,56 +5150,51 @@ for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GNUTAR="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 GNUTAR=$ac_cv_path_GNUTAR
-
 if test -n "$GNUTAR"; then
-  echo "$as_me:$LINENO: result: $GNUTAR" >&5
-echo "${ECHO_T}$GNUTAR" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUTAR" >&5
+$as_echo "$GNUTAR" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 		if test -z "$GNUTAR"; then
-			{ { echo "$as_me:$LINENO: error: gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." >&5
-echo "$as_me: error: gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." >&2;}
-   { (exit 1); exit 1; }; }
+			as_fn_error "gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." "$LINENO" 5
 		fi
 
 
-						   		echo "$as_me:$LINENO: checking the Solaris operating system release" >&5
-echo $ECHO_N "checking the Solaris operating system release... $ECHO_C" >&6
+						   		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the Solaris operating system release" >&5
+$as_echo_n "checking the Solaris operating system release... " >&6; }
    		_os_release=`echo $build_os | $SED -e s/solaris2\.//`
 		if test "$_os_release" -lt "6"; then
-      			{ { 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; }; }
+      			as_fn_error "use solaris >= 6 to build OpenOffice.org" "$LINENO" 5
    		else
-      			echo "$as_me:$LINENO: result: ok ($_os_release)" >&5
-echo "${ECHO_T}ok ($_os_release)" >&6
+      			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok ($_os_release)" >&5
+$as_echo "ok ($_os_release)" >&6; }
    		fi
 
-   		   		echo "$as_me:$LINENO: checking the processor type" >&5
-echo $ECHO_N "checking the processor type... $ECHO_C" >&6
+   		   		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the processor type" >&5
+$as_echo_n "checking the processor type... " >&6; }
    		if test "$build_cpu" = "sparc" -o "$build_cpu" = "i386"; then
-      			echo "$as_me:$LINENO: result: ok ($build_cpu)" >&5
-echo "${ECHO_T}ok ($build_cpu)" >&6
+      			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok ($build_cpu)" >&5
+$as_echo "ok ($build_cpu)" >&6; }
    		else
-      			{ { 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; }; }
+      			as_fn_error "only sparc and i386 processors are supported" "$LINENO" 5
    		fi
 		;;
 	linux-gnu*)
@@ -3335,8 +5225,8 @@ echo "$as_me: error: only sparc and i386 processors are supported" >&2;}
 		test_freetype=no
 		_os=Darwin
       if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then
-         { 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;}
+         { $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 "Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >>warn
          enable_systray=no
       fi
@@ -3357,17 +5247,17 @@ echo "$as_me: WARNING: Disabling gtk-quickstarter - not supported on Mac. Use --
 		test_cups=yes
         test_randr=yes
 		test_freetype=yes
-		echo "$as_me:$LINENO: checking the FreeBSD operating system release" >&5
-echo $ECHO_N "checking the FreeBSD operating system release... $ECHO_C" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the FreeBSD operating system release" >&5
+$as_echo_n "checking the FreeBSD operating system release... " >&6; }
 		if test -n "$with_os_version"; then
 			OSVERSION="$with_os_version"
 		else
 			OSVERSION=`/sbin/sysctl -n kern.osreldate`
 		fi
-		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
+		{ $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; }
 		if test "$OSVERSION" -lt "500016"; then
 			PTHREAD_CFLAGS="-D_THREAD_SAFE"
 			PTHREAD_LIBS="-pthread"
@@ -3378,8 +5268,8 @@ echo $ECHO_N "checking which thread library to use... $ECHO_C" >&6
 			PTHREAD_CFLAGS=""
 			PTHREAD_LIBS="-pthread"
 		fi
-		echo "$as_me:$LINENO: result: $PTHREAD_LIBS" >&5
-echo "${ECHO_T}$PTHREAD_LIBS" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_LIBS" >&5
+$as_echo "$PTHREAD_LIBS" >&6; }
 		_os=FreeBSD
 		;;
 	osf)
@@ -3408,9 +5298,7 @@ echo "${ECHO_T}$PTHREAD_LIBS" >&6
 		_os=AIX
 		;;
    *)
-   { { 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; }; }
+   as_fn_error "$_os operating system is not suitable to build OpenOffice.org!" "$LINENO" 5
    ;;
 esac
 
@@ -3418,28 +5306,26 @@ esac
 
 
 
-echo "$as_me:$LINENO: checking whether to enable crashdump feature" >&5
-echo $ECHO_N "checking whether to enable crashdump feature... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable crashdump feature" >&5
+$as_echo_n "checking whether to enable crashdump feature... " >&6; }
 if test "$enable_crashdump" = "yes" -o "$enable_crashdump" = "TRUE"; then
    ENABLE_CRASHDUMP="TRUE"
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
    BUILD_TYPE="$BUILD_TYPE CRASHREP"
 else
    if test "$enable_crashdump" = "STATIC"; then
       ENABLE_CRASHDUMP="STATIC"
-      echo "$as_me:$LINENO: result: yes, STATIC" >&5
-echo "${ECHO_T}yes, STATIC" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, STATIC" >&5
+$as_echo "yes, STATIC" >&6; }
       BUILD_TYPE="$BUILD_TYPE CRASHREP"
    else
       if test "$enable_crashdump" = "" -o "$enable_crashdump" = "no"; then
          ENABLE_CRASHDUMP=""
-	 echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
       else
-         { { 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; }; }
+         as_fn_error "--enable-crashdump only accepts yes, no, TRUE or STATIC as parameter." "$LINENO" 5
       fi
    fi
 fi
@@ -3450,90 +5336,88 @@ if test "$_os" = "WINNT"; then
 fi
 
 if test "$_os" = "WINNT"; then
-            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
+            { $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; }
    if test "$enable_cl_standard" = "" -o "$enable_cl_standard" = "no"; then
       VC_STANDARD=""
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
    else
       VC_STANDARD="TRUE"
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
    fi
 
 fi
 
-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
+{ $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; }
 if test -n "$enable_werror" && test "$enable_werror" != "no"; then
    ENABLE_WERROR="TRUE"
-   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;}
+   { $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 "Turning warnings to errors has no effect in modules or on platforms where it has been disabled explicitely" >> warn
 else
    ENABLE_WERROR="FALSE"
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
-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
+{ $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; }
 if test -n "$enable_debug" && test "$enable_debug" != "no"; then
    ENABLE_DEBUG="TRUE"
    if test -z "$enable_symbols"; then
       enable_symbols="yes"
    fi
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
    ENABLE_DEBUG="FALSE"
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
-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
+{ $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; }
 if test -n "$enable_dbgutil" && test "$enable_dbgutil" != "no"; then
    PROEXT=""
    PRODUCT=""
    PROFULLSWITCH=""
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
    PRODUCT="full"
    PROFULLSWITCH="product=full"
    PROEXT=".pro"
-   echo "$as_me:$LINENO: result: no, full product build" >&5
-echo "${ECHO_T}no, full product build" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, full product build" >&5
+$as_echo "no, full product build" >&6; }
 fi
 
 
 
 
-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
+{ $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; }
 if test -n "$enable_symbols" && test "$enable_symbols" != "no"; then
 	if test "$enable_symbols" = "yes" -o "$enable_symbols" = "TRUE"; then
 		ENABLE_SYMBOLS="TRUE"
-		echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	else
 		if test "$enable_symbols" = "SMALL" -o "$enable_symbols" = "small"; then
 			ENABLE_SYMBOLS="SMALL"
-			echo "$as_me:$LINENO: result: yes, small ones" >&5
-echo "${ECHO_T}yes, small ones" >&6
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, small ones" >&5
+$as_echo "yes, small ones" >&6; }
 		else if test "$enable_symbols" != "no" ; then
 			     echo enable symbols is: $enable_symbols
-			     { { 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; }; }
+			     as_fn_error "--enable-symbols only accepts yes, TRUE or SMALL as parameter." "$LINENO" 5
            	     else
               		     ENABLE_SYMBOLS=
 		     fi
@@ -3541,22 +5425,20 @@ echo "$as_me: error: --enable-symbols only accepts yes, TRUE or SMALL as paramet
 	fi
 else
    ENABLE_SYMBOLS=
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
-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
+{ $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; }
 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
-           { { 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; }; }
+           as_fn_error "--disable-strip-solver only accepts yes or no as parameter." "$LINENO" 5
         fi
    fi
 else
@@ -3568,151 +5450,151 @@ else
 fi
 
 
-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
+{ $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; }
 if test "$test_cups" = "yes" -a \( "$enable_cups" = "yes" -o "$enable_cups" = "TRUE" \) ; then
    ENABLE_CUPS="TRUE"
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
    ENABLE_CUPS=""
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
-echo "$as_me:$LINENO: checking whether to enable fontconfig support" >&5
-echo $ECHO_N "checking whether to enable fontconfig support... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable fontconfig support" >&5
+$as_echo_n "checking whether to enable fontconfig support... " >&6; }
 if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a \( "$enable_fontconfig" = "yes" -o "$enable_fontconfig" = "TRUE" \); then
    ENABLE_FONTCONFIG="TRUE"
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
    ENABLE_FONTCONFIG=""
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 
-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
+{ $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; }
 if test "$enable_binfilter" = "no"; then
    WITH_BINFILTER="NO"
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 else
    WITH_BINFILTER="YES"
    BUILD_TYPE="$BUILD_TYPE BINFILTER"
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
 
 
 if test "$_os" = "WINNT"; then
-   echo "$as_me:$LINENO: checking whether to use DirectX" >&5
-echo $ECHO_N "checking whether to use DirectX... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use DirectX" >&5
+$as_echo_n "checking whether to use DirectX... " >&6; }
    if test "$enable_directx" = "yes" -o "$enable_directx" = "TRUE" -o "$enable_directx" = ""; then
       ENABLE_DIRECTX="TRUE"
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
    else
       ENABLE_DIRECTX=""
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
    fi
 
 
-   echo "$as_me:$LINENO: checking whether to use ActiveX" >&5
-echo $ECHO_N "checking whether to use ActiveX... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use ActiveX" >&5
+$as_echo_n "checking whether to use ActiveX... " >&6; }
    if test "$enable_activex" = "yes" -o "$enable_activex" = "TRUE" -o "$enable_activex" = ""; then
       DISABLE_ACTIVEX=""
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
    else
       DISABLE_ACTIVEX="TRUE"
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
    fi
 
 
-   echo "$as_me:$LINENO: checking whether to use ATL" >&5
-echo $ECHO_N "checking whether to use ATL... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use ATL" >&5
+$as_echo_n "checking whether to use ATL... " >&6; }
    if test "$enable_atl" = "yes" -o "$enable_atl" = "TRUE" -o "$enable_atl" = ""; then
       DISABLE_ATL=""
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
    else
       DISABLE_ATL="TRUE"
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
    fi
 
 
 fi
 
-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
+{ $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; }
 if test "$enable_rpath" = "no"; then
    ENABLE_RPATH="no"
 else
    ENABLE_RPATH="yes"
 fi
-echo "$as_me:$LINENO: result: $ENABLE_RPATH" >&5
-echo "${ECHO_T}$ENABLE_RPATH" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_RPATH" >&5
+$as_echo "$ENABLE_RPATH" >&6; }
 
 
-echo "$as_me:$LINENO: checking whether to include MySpell dictionaries" >&5
-echo $ECHO_N "checking whether to include MySpell dictionaries... $ECHO_C" >&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; }
 if test -z "$with_myspell_dicts" || test "$with_myspell_dicts" = "yes"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   WITH_MYSPELL_DICTS=YES
   BUILD_TYPE="$BUILD_TYPE DICTIONARIES"
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   WITH_MYSPELL_DICTS=NO
 fi
 
 
 if test "$WITH_MYSPELL_DICTS" = "NO"; then
-  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
+  { $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; }
   if test -n "$with_system_dicts" -a "$with_system_dicts" = "yes"; then
-	echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	SYSTEM_DICTS=YES
-	echo "$as_me:$LINENO: checking for spelling dictionary directory" >&5
-echo $ECHO_N "checking for spelling dictionary directory... $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for spelling dictionary directory" >&5
+$as_echo_n "checking for spelling dictionary directory... " >&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
-	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
+	{ $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; }
 	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
-	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
+	{ $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; }
 	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
-	echo "$as_me:$LINENO: result: $THES_SYSTEM_DIR" >&5
-echo "${ECHO_T}$THES_SYSTEM_DIR" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $THES_SYSTEM_DIR" >&5
+$as_echo "$THES_SYSTEM_DIR" >&6; }
   else
-  	echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   	SYSTEM_DICTS=NO
   fi
 fi
@@ -3721,22 +5603,16 @@ fi
 
 
 
-echo "$as_me:$LINENO: checking which shell to use" >&5
-echo $ECHO_N "checking which shell to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which shell to use" >&5
+$as_echo_n "checking which shell to use... " >&6; }
 if test $_os = "WINNT"; then
       if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash"; then
-      { { echo "$as_me:$LINENO: error: only \"tcsh\" or \"bash\" are supported options" >&5
-echo "$as_me: error: only \"tcsh\" or \"bash\" are supported options" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "only \"tcsh\" or \"bash\" are supported options" "$LINENO" 5
    fi
                      if test -L $AWK -o -L `which awk` -o -L `which tar` -o -L `which gunzip` ; then
-         { { echo "$as_me:$LINENO: error: $AWK, awk, tar or gunzip is a cygwin symlink!
+         as_fn_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." >&2;}
-   { (exit 1); exit 1; }; }
+link, and copy the program to the name of the link." "$LINENO" 5
       fi
                   CC=`echo $CC | $SED "s/^guw.exe //"`
    CXX=`echo $CXX | $SED "s/^guw.exe //"`
@@ -3756,33 +5632,27 @@ link, and copy the program to the name of the link." >&2;}
    fi
 elif test $_os = "OS2"; then
    if test "$with_use_shell" != "tcsh"; then
-      { { echo "$as_me:$LINENO: error: only \"tcsh\" is supported options" >&5
-echo "$as_me: error: only \"tcsh\" is supported options" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "only \"tcsh\" is supported options" "$LINENO" 5
    fi
 else
             if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash"; then
-      { { echo "$as_me:$LINENO: error: only \"tcsh\" or \"bash\" are supported options" >&5
-echo "$as_me: error: only \"tcsh\" or \"bash\" are supported options" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "only \"tcsh\" or \"bash\" are supported options" "$LINENO" 5
    fi
 fi
 USE_SHELL="$with_use_shell"
-echo "$as_me:$LINENO: result: $USE_SHELL" >&5
-echo "${ECHO_T}$USE_SHELL" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_SHELL" >&5
+$as_echo "$USE_SHELL" >&6; }
 
 
 
 if test "$_os" = "WINNT" ; then
-   echo "$as_me:$LINENO: checking for cygwin gcc/g++" >&5
-echo $ECHO_N "checking for cygwin gcc/g++... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cygwin gcc/g++" >&5
+$as_echo_n "checking for cygwin gcc/g++... " >&6; }
    if which gcc > /dev/null && which g++ > /dev/null ; then
-      echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
    else
-      { { 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; }; }
+      as_fn_error "cygwin gcc and g++ are needed, please install them." "$LINENO" 5
    fi
 fi
 
@@ -3790,10 +5660,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
-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
+{ $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
 else
   case $SHELLPATH in
   [\\/]* | ?:[\\/]*)
@@ -3805,42 +5675,41 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_SHELLPATH="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 SHELLPATH=$ac_cv_path_SHELLPATH
-
 if test -n "$SHELLPATH"; then
-  echo "$as_me:$LINENO: result: $SHELLPATH" >&5
-echo "${ECHO_T}$SHELLPATH" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHELLPATH" >&5
+$as_echo "$SHELLPATH" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
    if test -z "$SHELLPATH"; then
-      { { 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; }; }
+      as_fn_error "tcsh not found in \$PATH" "$LINENO" 5
    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
-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
+{ $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
 else
   case $SHELLPATH in
   [\\/]* | ?:[\\/]*)
@@ -3852,51 +5721,50 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_SHELLPATH="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 SHELLPATH=$ac_cv_path_SHELLPATH
-
 if test -n "$SHELLPATH"; then
-  echo "$as_me:$LINENO: result: $SHELLPATH" >&5
-echo "${ECHO_T}$SHELLPATH" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHELLPATH" >&5
+$as_echo "$SHELLPATH" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
    if test -z "$SHELLPATH"; then
-      { { 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; }; }
+      as_fn_error "bash not found in \$PATH" "$LINENO" 5
    else
       SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/bash$//p"`
    fi
 else
-   { 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;}
+   { $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;}
    SHELLPATH="NO_SHELLPATH_NEEDED"
 fi
 
 
-echo "$as_me:$LINENO: checking gcc home" >&5
-echo $ECHO_N "checking gcc home... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gcc home" >&5
+$as_echo_n "checking gcc home... " >&6; }
 if test -z "$with_gcc_home"; then
 	GCC_HOME=`which gcc | $SED -e s,/bin/gcc,,`
 else
 	GCC_HOME="$with_gcc_home"
 fi
-echo "$as_me:$LINENO: result: $GCC_HOME" >&5
-echo "${ECHO_T}$GCC_HOME" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCC_HOME" >&5
+$as_echo "$GCC_HOME" >&6; }
 
 
 if test -n "$with_gcc_home"; then
@@ -3914,10 +5782,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
-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
+{ $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
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3927,35 +5795,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -3965,39 +5835,50 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-  CC=$ac_ct_CC
+  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
 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
-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
+{ $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
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -4007,77 +5888,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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
 fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -4088,18 +5929,19 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.
@@ -4117,24 +5959,25 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 fi
 if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
+  for ac_prog in cl.exe
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -4144,39 +5987,41 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
     test -n "$CC" && break
   done
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
-  for ac_prog in cl
+  for ac_prog in cl.exe
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -4186,183 +6031,227 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   test -n "$ac_ct_CC" && break
 done
 
-  CC=$ac_ct_CC
+  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
 fi
 
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+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; }
 
 # Provide some information about the compiler.
-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=$?
-  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
+$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
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $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
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
+#include <stdio.h>
 int
 main ()
 {
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
 
   ;
   return 0;
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.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.
-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
+{ $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 ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-	;;
-    conftest.$ac_ext )
-	# This is the source file.
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
 	# certainly right.
 	break;;
     *.* )
-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	# FIXME: I believe we export ac_cv_exeext for Libtool,
-	# but it would be cool to find out if it's true.  Does anybody
-	# maintain Libtool? --akim.
-	export ac_cv_exeext
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
 	break;;
     * )
 	break;;
   esac
 done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
 else
-  echo "$as_me: failed program was:" >&5
+  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
 sed 's/^/| /' conftest.$ac_ext >&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; }; }
+{ { $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; }; }
 fi
-
 ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
 
-# Check the compiler produces executables we can run.  If not, either
+# Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&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_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { 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.
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+See \`config.log' for more details." "$LINENO" 5; }
     fi
   fi
 fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
 ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run.  If not, either
+# Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+{ $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
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; 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
@@ -4370,38 +6259,31 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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 | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  export ac_cv_exeext
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { 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; }; }
+  { { $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; }
 fi
-
 rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-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
+{ $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
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -4413,45 +6295,46 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-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
+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;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&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; }; }
+{ { $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; }
 fi
-
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-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
+{ $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
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -4465,55 +6348,34 @@ main ()
   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
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
+  ac_compiler_gnu=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $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
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-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
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+{ $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
@@ -4524,39 +6386,49 @@ main ()
   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
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
 
-ac_cv_prog_cc_g=no
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+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; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -4572,18 +6444,14 @@ else
     CFLAGS=
   fi
 fi
-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
+{ $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
 else
-  ac_cv_prog_cc_stdc=no
+  ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
@@ -4611,12 +6479,17 @@ 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 -std1 is added to get
+   as 'x'.  The following induces an error, until -std is added to get
    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
    array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
+   that's true only with -std.  */
 int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
@@ -4631,205 +6504,37 @@ return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
   return 0;
 }
 _ACEOF
-# 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__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (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
-
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
 fi
-rm -f conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
-rm -f conftest.$ac_ext conftest.$ac_objext
+rm -f conftest.$ac_ext
 CC=$ac_save_CC
 
 fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
+# 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; } ;;
   *)
-    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" ;;
+    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; } ;;
 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'
@@ -4844,10 +6549,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
-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
+{ $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
 else
   case $COMPATH in
   [\\/]* | ?:[\\/]*)
@@ -4859,28 +6564,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_COMPATH="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 COMPATH=$ac_cv_path_COMPATH
-
 if test -n "$COMPATH"; then
-  echo "$as_me:$LINENO: result: $COMPATH" >&5
-echo "${ECHO_T}$COMPATH" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPATH" >&5
+$as_echo "$COMPATH" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   test -n "$COMPATH" && break
 done
 
@@ -4890,54 +6596,44 @@ COMPATH=`echo $COMPATH | $SED "s@/[Bb][Ii][Nn]\\\$@@"`;
 echo $COMPATH
 GCCVER=20995
 if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; then
-    echo "$as_me:$LINENO: checking the GNU gcc compiler version" >&5
-echo $ECHO_N "checking the GNU gcc compiler version... $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking the GNU gcc compiler version" >&5
+$as_echo_n "checking the GNU gcc compiler version... " >&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
-      { { 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; }; }
+      as_fn_error "found version \"$_gcc_version\", use version 3+ of the gcc compiler" "$LINENO" 5
    else
       if test "$GCCVER" -eq "030203"; then
 	    if test "$ENABLE_SYMBOLS" = "SMALL"; then
-           { { 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; }; }
+           as_fn_error "version \"$_gcc_version\" gives internal error with small." "$LINENO" 5
 	    fi
       fi
    fi
-   echo "$as_me:$LINENO: result: checked (gcc $_gcc_version)" >&5
-echo "${ECHO_T}checked (gcc $_gcc_version)" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (gcc $_gcc_version)" >&5
+$as_echo "checked (gcc $_gcc_version)" >&6; }
    if test "$_os" = "SunOS"; then
-      echo "$as_me:$LINENO: checking gcc linker" >&5
-echo $ECHO_N "checking gcc linker... $ECHO_C" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking gcc linker" >&5
+$as_echo_n "checking gcc linker... " >&6; }
       if $CC -Wl,--version 2>&1 |head -n 1| grep -v GNU > /dev/null;then
-          { { 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; }; }
+          as_fn_error "failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris" "$LINENO" 5
       fi
-      echo "$as_me:$LINENO: result: ok (GNU ld)" >&5
-echo "${ECHO_T}ok (GNU ld)" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (GNU ld)" >&5
+$as_echo "ok (GNU ld)" >&6; }
    fi
 fi
 
 
 HAVE_LD_BSYMBOLIC_FUNCTIONS=
 if test "$GCC" = "yes"; then
-   echo "$as_me:$LINENO: checking for -Bsymbolic-functions linker support " >&5
-echo $ECHO_N "checking for -Bsymbolic-functions linker support ... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Bsymbolic-functions linker support " >&5
+$as_echo_n "checking for -Bsymbolic-functions linker support ... " >&6; }
    bsymbolic_functions_ldflags_save=$LDFLAGS
    LDFLAGS="$LDFLAGS -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo"
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
    #include <stdio.h>
@@ -4952,85 +6648,60 @@ 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_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
+if ac_fn_c_try_link "$LINENO"; then :
   HAVE_LD_BSYMBOLIC_FUNCTIONS=TRUE
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
    if test "z$HAVE_LD_BSYMBOLIC_FUNCTIONS" = "zTRUE"; then
-     echo "$as_me:$LINENO: result: found " >&5
-echo "${ECHO_T}found " >&6
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: found " >&5
+$as_echo "found " >&6; }
    else
-     echo "$as_me:$LINENO: result: not found " >&5
-echo "${ECHO_T}not found " >&6
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found " >&5
+$as_echo "not found " >&6; }
    fi
    LDFLAGS=$bsymbolic_functions_ldflags_save
 fi
 
 
-echo "$as_me:$LINENO: checking whether to enable pch feature" >&5
-echo $ECHO_N "checking whether to enable pch feature... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable pch feature" >&5
+$as_echo_n "checking whether to enable pch feature... " >&6; }
 if test -n "$enable_pch" && test "$enable_pch" != "no"; then
    if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
 	   ENABLE_PCH="TRUE"
-	   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
    elif test "$GCC" = "yes" -a "$GCCVER" -gt "030400"; then
 	   ENABLE_PCH="TRUE"
-	   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
    else
 	   ENABLE_PCH=""
-	   { 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;}
+	   { $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;}
    fi
 else
    ENABLE_PCH=""
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
-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
+{ $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; }
 if test -n "$enable_hids" && test "$enable_hids" != "no"; then
    NO_HIDS=""
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
    NO_HIDS="TRUE"
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
-echo "$as_me:$LINENO: checking for GNU make" >&5
-echo $ECHO_N "checking for GNU make... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU make" >&5
+$as_echo_n "checking for GNU make... " >&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
@@ -5038,40 +6709,36 @@ for a in "$MAKE" $GNUMAKE make gmake gnumake; do
            break
       fi
 done
-echo "$as_me:$LINENO: result: $GNUMAKE" >&5
-echo "${ECHO_T}$GNUMAKE" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUMAKE" >&5
+$as_echo "$GNUMAKE" >&6; }
 if test -z "$GNUMAKE"; then
-    { { 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; }; }
+    as_fn_error "not found. install GNU make." "$LINENO" 5
 fi
 
-echo "$as_me:$LINENO: checking the GNU make version" >&5
-echo $ECHO_N "checking the GNU make version... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the GNU make version" >&5
+$as_echo_n "checking the GNU make version... " >&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
-   echo "$as_me:$LINENO: result: $GNUMAKE $_make_version" >&5
-echo "${ECHO_T}$GNUMAKE $_make_version" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUMAKE $_make_version" >&5
+$as_echo "$GNUMAKE $_make_version" >&6; }
 else
    if test "$_os" = "Darwin"; then
        if test "$_make_longver" -ge "037900" ; then
-		   echo "$as_me:$LINENO: result: $GNUMAKE $_make_version" >&5
-echo "${ECHO_T}$GNUMAKE $_make_version" >&6
+		   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUMAKE $_make_version" >&5
+$as_echo "$GNUMAKE $_make_version" >&6; }
        else
-           { 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;}
+           { $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;}
        fi
    else
-       { { 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; }; }
+       as_fn_error "failed ($GNUMAKE $_make_version need 3.79.1+)" "$LINENO" 5
    fi
 fi
 
 
-echo "$as_me:$LINENO: checking for GNU tar" >&5
-echo $ECHO_N "checking for GNU tar... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU tar" >&5
+$as_echo_n "checking for GNU tar... " >&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
@@ -5079,12 +6746,10 @@ for a in $GNUTAR gtar gnutar tar; do
            break
       fi
 done
-echo "$as_me:$LINENO: result: $GNUTAR" >&5
-echo "${ECHO_T}$GNUTAR" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUTAR" >&5
+$as_echo "$GNUTAR" >&6; }
 if test -z "$GNUTAR"; then
-    { { echo "$as_me:$LINENO: error: not found. install GNU tar." >&5
-echo "$as_me: error: not found. install GNU tar." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "not found. install GNU tar." "$LINENO" 5
 fi
 
 
@@ -5095,10 +6760,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
-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
+{ $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
 else
   case $_cc in
   [\\/]* | ?:[\\/]*)
@@ -5110,65 +6775,58 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path__cc="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 _cc=$ac_cv_path__cc
-
 if test -n "$_cc"; then
-  echo "$as_me:$LINENO: result: $_cc" >&5
-echo "${ECHO_T}$_cc" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_cc" >&5
+$as_echo "$_cc" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   test -n "$_cc" && break
 done
 
       COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
-      echo "$as_me:$LINENO: checking the SunStudio C/C++ compiler version" >&5
-echo $ECHO_N "checking the SunStudio C/C++ compiler version... $ECHO_C" >&6
+      { $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; }
             _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
-         { { 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; }; }
+         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
       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
-            { { 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; }; }
+            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
          else
-                        echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
+$as_echo "checked" >&6; }
          fi
       fi
    fi
 fi
 
 if test "$GCC" = "yes"; then
-   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
+   { $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; }
    hash_style_ldflags_save=$LDFLAGS
    LDFLAGS="$LDFLAGS -Wl,--hash-style=both"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
    #include <stdio.h>
@@ -5183,43 +6841,19 @@ 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_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
+if ac_fn_c_try_link "$LINENO"; then :
   HAVE_LD_HASH_STYLE=TRUE
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-HAVE_LD_HASH_STYLE=FALSE
+  HAVE_LD_HASH_STYLE=FALSE
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
    if test "z$HAVE_LD_HASH_STYLE" = "zTRUE"; then
-     echo "$as_me:$LINENO: result: found " >&5
-echo "${ECHO_T}found " >&6
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: found " >&5
+$as_echo "found " >&6; }
    else
-     echo "$as_me:$LINENO: result: not found " >&5
-echo "${ECHO_T}not found " >&6
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found " >&5
+$as_echo "not found " >&6; }
    fi
    LDFLAGS=$hash_style_ldflags_save
 fi
@@ -5231,10 +6865,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
-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
+{ $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
 else
   case $_cc in
   [\\/]* | ?:[\\/]*)
@@ -5246,45 +6880,44 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path__cc="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 _cc=$ac_cv_path__cc
-
 if test -n "$_cc"; then
-  echo "$as_me:$LINENO: result: $_cc" >&5
-echo "${ECHO_T}$_cc" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_cc" >&5
+$as_echo "$_cc" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   test -n "$_cc" && break
 done
 
       COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
-      { echo "$as_me:$LINENO: WARNING: ******* $_cc , $COMPATH" >&5
-echo "$as_me: WARNING: ******* $_cc , $COMPATH" >&2;}
-      echo "$as_me:$LINENO: checking the Compaq C compiler version" >&5
-echo $ECHO_N "checking the Compaq C compiler version... $ECHO_C" >&6
+      { $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; }
             _compaqc_version=`$CC -V 2>&1 | $AWK '{ print $3 }'`
       _compaqc_major=`echo $_compaqc_version | $AWK -F. '{ print $1 }'`
       if test "$_compaqc_major" != "T6"; then
-         { { 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; }; }
+         as_fn_error "found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" "$LINENO" 5
       else
-                  echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
+$as_echo "checked" >&6; }
       fi
    fi
 fi
@@ -5292,10 +6925,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
-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
+{ $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
 else
   case $PERL in
   [\\/]* | ?:[\\/]*)
@@ -5307,28 +6940,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 PERL=$ac_cv_path_PERL
-
 if test -n "$PERL"; then
-  echo "$as_me:$LINENO: result: $PERL" >&5
-echo "${ECHO_T}$PERL" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
+$as_echo "$PERL" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 else
    if test "$_os" = "WINNT"; then
       with_perl_home=`cygpath -u "$with_perl_home"`
@@ -5337,46 +6971,38 @@ else
    if test -x "$_perl_path"; then
       PERL=$_perl_path
    else
-      { { echo "$as_me:$LINENO: error: $_perl_path not found" >&5
-echo "$as_me: error: $_perl_path not found" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "$_perl_path not found" "$LINENO" 5
    fi
 fi
 
 if test "$PERL"; then
-   echo "$as_me:$LINENO: checking the Perl version" >&5
-echo $ECHO_N "checking the Perl version... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking the Perl version" >&5
+$as_echo_n "checking the Perl version... " >&6; }
    ${PERL} -e "exit($]);"
    _perl_version=$?
    if test "$_perl_version" -lt 5; then
-      { { 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; }; }
+      as_fn_error "found Perl version \"$_perl_version\", use version 5 of Perl" "$LINENO" 5
    fi
-   echo "$as_me:$LINENO: result: checked (perl $_perl_version)" >&5
-echo "${ECHO_T}checked (perl $_perl_version)" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (perl $_perl_version)" >&5
+$as_echo "checked (perl $_perl_version)" >&6; }
 else
-   { { 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; }; }
+   as_fn_error "Perl not found, install version 5 of Perl" "$LINENO" 5
 fi
 
 
-echo "$as_me:$LINENO: checking for required Perl modules" >&5
-echo $ECHO_N "checking for required Perl modules... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for required Perl modules" >&5
+$as_echo_n "checking for required Perl modules... " >&6; }
 if `$PERL -e 'use Archive::Zip;'`; then
-	echo "$as_me:$LINENO: result: all modules found" >&5
-echo "${ECHO_T}all modules found" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: all modules found" >&5
+$as_echo "all modules found" >&6; }
 else
-	{ { 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; }; }
+	as_fn_error "Failed to find some modules" "$LINENO" 5
 fi
 
 if test "$_os" = "WINNT"; then
 	if test "$WITH_MINGWIN" != "yes"; then
-		echo "$as_me:$LINENO: checking for friendly registry keys" >&5
-echo $ECHO_N "checking for friendly registry keys... $ECHO_C" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for friendly registry keys" >&5
+$as_echo_n "checking for friendly registry keys... " >&6; }
 		# VS.Net 2003, VS.Net 2005
 		if test -z "$with_cl_home"; then
 			vctest=`./oowintool --msvc-productdir`;
@@ -5386,8 +7012,8 @@ echo $ECHO_N "checking for friendly registry keys... $ECHO_C" >&6
 		else
 			with_cl_home=`cygpath -u "$with_cl_home"`
 		fi
-		echo "$as_me:$LINENO: result: done" >&5
-echo "${ECHO_T}done" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
 
 										if test -n "$with_mspdb_path";then
 			with_mspdb_path=`cygpath -u "$with_mspdb_path"`
@@ -5408,10 +7034,10 @@ echo "${ECHO_T}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
-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
+{ $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
 else
   case $MSPDB_PATH in
   [\\/]* | ?:[\\/]*)
@@ -5423,34 +7049,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_MSPDB_PATH="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 MSPDB_PATH=$ac_cv_path_MSPDB_PATH
-
 if test -n "$MSPDB_PATH"; then
-  echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5
-echo "${ECHO_T}$MSPDB_PATH" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSPDB_PATH" >&5
+$as_echo "$MSPDB_PATH" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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
-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
+{ $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
 else
   case $MSPDB_PATH in
   [\\/]* | ?:[\\/]*)
@@ -5462,51 +7089,50 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_MSPDB_PATH="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 MSPDB_PATH=$ac_cv_path_MSPDB_PATH
-
 if test -n "$MSPDB_PATH"; then
-  echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5
-echo "${ECHO_T}$MSPDB_PATH" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSPDB_PATH" >&5
+$as_echo "$MSPDB_PATH" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 			MSPDB_PATH=`dirname "$MSPDB_PATH"`
 		fi
 
 		if test -z "$MSPDB_PATH"; then
-			{ { 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; }; }
+			as_fn_error "You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path" "$LINENO" 5
 		fi
 		MSPDB_PATH=`cygpath -d "$MSPDB_PATH"`
 		MSPDB_PATH=`cygpath -u "$MSPDB_PATH"`
 				PATH="$MSPDB_PATH:$PATH"
 
-		echo "$as_me:$LINENO: checking the Microsoft C/C++ Compiler" >&5
-echo $ECHO_N "checking the Microsoft C/C++ Compiler... $ECHO_C" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the Microsoft C/C++ Compiler" >&5
+$as_echo_n "checking the Microsoft C/C++ Compiler... " >&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
-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
+{ $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
 else
   case $CC in
   [\\/]* | ?:[\\/]*)
@@ -5518,40 +7144,41 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_CC="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 CC=$ac_cv_path_CC
-
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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
-			echo "$as_me:$LINENO: result: found ($CC)" >&5
-echo "${ECHO_T}found ($CC)" >&6
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found ($CC)" >&5
+$as_echo "found ($CC)" >&6; }
 			COMPATH=`echo $CC | $SED 's@\/[Bb][Ii][Nn]\/[cC][lL]\.[eE][xX][eE]@@'`
 			export INCLUDE=`cygpath -d "$COMPATH/Include"`
-						echo "$as_me:$LINENO: checking the Version of Microsoft C/C++ Compiler" >&5
-echo $ECHO_N "checking the Version of Microsoft C/C++ Compiler... $ECHO_C" >&6
+						{ $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; }
 			CCNUMVER=`$CC 2>&1 | $AWK "/Microsoft/ && /..\\...\\...../ {
 							x = match( \\\$0, /..\\...\\...../ )
 							CCversion = substr( \\\$0, RSTART, RLENGTH)
@@ -5560,48 +7187,42 @@ echo $ECHO_N "checking the Version of Microsoft C/C++ Compiler... $ECHO_C" >&6
 								printf (\"%04d\",vertoken[i] )
 							}
 							}"`
-			echo "$as_me:$LINENO: result: found Compiler version $CCNUMVER." >&5
-echo "${ECHO_T}found Compiler version $CCNUMVER." >&6
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found Compiler version $CCNUMVER." >&5
+$as_echo "found Compiler version $CCNUMVER." >&6; }
 			if test "$CCNUMVER" -ge "001500000000"; then
 				COMEX=12
 				MSVSVER=2008
-				echo "$as_me:$LINENO: result: found .NET 2008 / VS 9.0." >&5
-echo "${ECHO_T}found .NET 2008 / VS 9.0." >&6
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found .NET 2008 / VS 9.0." >&5
+$as_echo "found .NET 2008 / VS 9.0." >&6; }
 			elif test "$CCNUMVER" -ge "001400000000"; then
 				COMEX=11
 				MSVSVER=2005
-				echo "$as_me:$LINENO: result: found .NET 2005." >&5
-echo "${ECHO_T}found .NET 2005." >&6
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found .NET 2005." >&5
+$as_echo "found .NET 2005." >&6; }
 			elif test "$CCNUMVER" -ge "001300102240"; then
 				COMEX=10
 				MSVSVER=2003
-				echo "$as_me:$LINENO: result: found .NET 2003." >&5
-echo "${ECHO_T}found .NET 2003." >&6
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found .NET 2003." >&5
+$as_echo "found .NET 2003." >&6; }
 			else
-				{ { 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; }; }
+				as_fn_error "Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler." "$LINENO" 5
 			fi
 		else
-			{ { 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; }; }
+			as_fn_error "Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe." "$LINENO" 5
 		fi
 	else
-		echo "$as_me:$LINENO: checking the Mingwin32 C++ Compiler" >&5
-echo $ECHO_N "checking the Mingwin32 C++ Compiler... $ECHO_C" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the Mingwin32 C++ Compiler" >&5
+$as_echo_n "checking the Mingwin32 C++ Compiler... " >&6; }
 		if test `$CC -dumpmachine | $SED -e 's/^.*-//'` = "mingw32"; then
-			echo "$as_me:$LINENO: result: found." >&5
-echo "${ECHO_T}found." >&6
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found." >&5
+$as_echo "found." >&6; }
 			if $CC -dumpspecs | grep -q "mno-cygwin"; then
 				USE_MINGW="cygwin"
 			else
 				USE_MINGW="pure-mingw"
 			fi
 		else
-			{ { 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; }; }
+			as_fn_error "Mingwin32 C++ Compiler not found." "$LINENO" 5
 		fi
 	fi
 fi
@@ -5613,10 +7234,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
-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
+{ $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
 else
   case $MIDL_PATH in
   [\\/]* | ?:[\\/]*)
@@ -5628,28 +7249,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_MIDL_PATH="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 MIDL_PATH=$ac_cv_path_MIDL_PATH
-
 if test -n "$MIDL_PATH"; then
-  echo "$as_me:$LINENO: result: $MIDL_PATH" >&5
-echo "${ECHO_T}$MIDL_PATH" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MIDL_PATH" >&5
+$as_echo "$MIDL_PATH" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 	if test -n "$MIDL_PATH";then
 		MIDL_PATH=`dirname "$MIDL_PATH"`
 	fi
@@ -5675,9 +7297,7 @@ fi
 		fi
 	fi
 	if test ! -x "$MIDL_PATH/midl.exe"; then
-		{ { 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; }; }
+		as_fn_error "midl.exe not found. Make sure it's in the path or use --with-midl-path" "$LINENO" 5
 	fi
 	# Convert to posix path with 8.3 filename restrictions ( No spaces )
 	MIDL_PATH=`cygpath -d "$MIDL_PATH"`
@@ -5685,10 +7305,10 @@ echo "$as_me: error: midl.exe not found. Make sure it's in the path or use --wit
 
 		# Extract the first word of "csc.exe", so it can be a program name with args.
 set dummy csc.exe; 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_CSC_PATH+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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
 else
   case $CSC_PATH in
   [\\/]* | ?:[\\/]*)
@@ -5700,28 +7320,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_CSC_PATH="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 CSC_PATH=$ac_cv_path_CSC_PATH
-
 if test -n "$CSC_PATH"; then
-  echo "$as_me:$LINENO: result: $CSC_PATH" >&5
-echo "${ECHO_T}$CSC_PATH" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CSC_PATH" >&5
+$as_echo "$CSC_PATH" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 	if test -n "$CSC_PATH";then
 		CSC_PATH=`dirname "$CSC_PATH"`
 	fi
@@ -5737,16 +7358,14 @@ fi
 	   fi
 	fi
 	if test ! -x "$CSC_PATH/csc.exe"; then
-		{ { 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; }; }
+		as_fn_error "csc.exe not found. Make sure it's in the path or use --with-csc-path" "$LINENO" 5
 	fi
 	# Convert to posix path with 8.3 filename restrictions ( No spaces )
 	CSC_PATH=`cygpath -d "$CSC_PATH"`
 	CSC_PATH=`cygpath -u "$CSC_PATH"`
 
-               echo "$as_me:$LINENO: checking .NET Framework" >&5
-echo $ECHO_N "checking .NET Framework... $ECHO_C" >&6
+               { $as_echo "$as_me:${as_lineno-$LINENO}: checking .NET Framework" >&5
+$as_echo_n "checking .NET Framework... " >&6; }
 	    if test -n "$with_frame_home"; then
 		with_frame_home=`cygpath -u "$with_frame_home"`
 	    fi
@@ -5768,12 +7387,10 @@ echo $ECHO_N "checking .NET Framework... $ECHO_C" >&6
           fi
 	    fi
 	    if test ! -f "$FRAME_HOME/lib/mscoree.lib"; then
-		{ { 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; }; }
+		as_fn_error "mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home" "$LINENO" 5
 	    fi
-	    echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "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"`
@@ -5789,15 +7406,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
-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
+{ $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; }
 # 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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if test "${ac_cv_prog_CPP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -5811,11 +7428,7 @@ 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 >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -5824,68 +7437,24 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _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
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.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
+if ac_fn_c_try_cpp "$LINENO"; 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
@@ -5895,7 +7464,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
 
@@ -5907,8 +7476,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -5918,11 +7487,7 @@ 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 >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -5931,68 +7496,24 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _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
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.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
+if ac_fn_c_try_cpp "$LINENO"; 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
@@ -6002,14 +7523,13 @@ 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
-  { { 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; }; }
+  { { $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; }
 fi
 
 ac_ext=c
@@ -6019,16 +7539,12 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-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
+{ $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
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -6043,51 +7559,23 @@ main ()
   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
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_stdc=no
+  ac_cv_header_stdc=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
@@ -6097,18 +7585,14 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
@@ -6118,16 +7602,13 @@ 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 >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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))
@@ -6147,61 +7628,50 @@ main ()
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
 	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
+      return 2;
+  return 0;
 }
 _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
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
 
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+  ac_cv_header_stdc=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
+
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
 fi
 
 if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
-   ac_ext=cc
+   ac_ext=cpp
 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 -n "$ac_tool_prefix"; then
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+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
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -6211,39 +7681,41 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
     test -n "$CXX" && break
   done
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe 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
-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
+{ $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
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -6253,64 +7725,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   test -n "$ac_ct_CXX" && break
 done
-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
 
-  CXX=$ac_ct_CXX
+  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
 fi
 
-
+  fi
+fi
 # Provide some information about the compiler.
-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=$?
-  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
+$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
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $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: 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
+{ $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
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -6324,55 +7809,34 @@ main ()
   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_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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
+  ac_compiler_gnu=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 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`
+{ $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
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-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
+{ $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
 /* end confdefs.h.  */
 
 int
@@ -6383,176 +7847,80 @@ main ()
   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_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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_prog_cxx_g=yes
 else
-  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
+  CXXFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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_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
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_cxx_try_compile "$LINENO"; then :
 
-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
+else
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+	 CXXFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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_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
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes
 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
+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
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
 fi
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-ac_ext=cc
+ac_ext=cpp
 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 how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
+{ $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; }
 if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CXXCPP needs to be expanded
     for CXXCPP in "$CXX -E" "/lib/cpp"
@@ -6566,11 +7934,7 @@ 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 >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -6579,68 +7943,24 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _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
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.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
+if ac_fn_cxx_try_cpp "$LINENO"; 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
@@ -6650,7 +7970,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
 
@@ -6662,8 +7982,8 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
@@ -6673,11 +7993,7 @@ 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 >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -6686,68 +8002,24 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _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
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.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
+if ac_fn_cxx_try_cpp "$LINENO"; 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
@@ -6757,14 +8029,13 @@ 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
-  { { 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; }; }
+  { { $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; }
 fi
 
 ac_ext=c
@@ -6782,15 +8053,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
-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
+{ $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; }
 # 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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if test "${ac_cv_prog_CPP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -6804,11 +8075,7 @@ 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 >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -6817,68 +8084,24 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _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
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.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
+if ac_fn_c_try_cpp "$LINENO"; 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
@@ -6888,7 +8111,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
 
@@ -6900,8 +8123,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -6911,11 +8134,7 @@ 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 >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -6924,68 +8143,24 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _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
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.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
+if ac_fn_c_try_cpp "$LINENO"; 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
@@ -6995,14 +8170,13 @@ 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
-  { { 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; }; }
+  { { $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; }
 fi
 
 ac_ext=c
@@ -7015,70 +8189,16 @@ 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=`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
+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 :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -7086,678 +8206,288 @@ fi
 done
 
 
-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
+# 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
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((long *) 0)
-  return 0;
-if (sizeof (long))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
 
-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
-  # 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
+     { { $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
 
-  ;
-  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
+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_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 >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
 _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
 
-  ;
-  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
+SIZEOF_LONG=$ac_cv_sizeof_long
 
-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
+ { $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
 else
-  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
+  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
 fi
-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
+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
 /* end confdefs.h.  */
-$ac_includes_default
+#include <sys/types.h>
+	     #include <sys/param.h>
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+		     && LITTLE_ENDIAN)
+	      bogus endian macros
+	     #endif
 
   ;
   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
-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
+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.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (long)); }
-unsigned long ulongval () { return (long) (sizeof (long)); }
-#include <stdio.h>
-#include <stdlib.h>
+#include <sys/types.h>
+		#include <sys/param.h>
+
 int
 main ()
 {
-
-  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);
+#if BYTE_ORDER != BIG_ENDIAN
+		 not big endian
+		#endif
 
   ;
   return 0;
 }
 _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
-  ac_cv_sizeof_long=`cat conftest.val`
-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: 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 *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_bigendian=yes
 else
-  ac_cv_sizeof_long=0
+  ac_cv_c_bigendian=no
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 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
+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
 /* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/param.h>
+#include <limits.h>
 
 int
 main ()
 {
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
- bogus endian macros
-#endif
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	      bogus endian macros
+	     #endif
 
   ;
   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
-  # 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
+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>
+#include <limits.h>
 
 int
 main ()
 {
-#if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
 
   ;
   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
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_bigendian=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_c_bigendian=no
+  ac_cv_c_bigendian=no
 fi
-rm -f 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
+rm -f core conftest.err 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
+      # 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 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; }
+short int ascii_mm[] =
+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		short int ascii_ii[] =
+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		  return ascii_mm[i] + ascii_ii[i];
+		}
+		short int ebcdic_ii[] =
+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		short int ebcdic_mm[] =
+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		  return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		extern int foo;
+
 int
 main ()
 {
- _ascii (); _ebcdic ();
+return use_ascii (foo) == use_ebcdic (foo);
   ;
   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
-  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
-
+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
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+$ac_includes_default
 int
 main ()
 {
-  /* 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);
+
+	     /* 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;
 }
 _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
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_c_bigendian=no
 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 )
-ac_cv_c_bigendian=yes
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+  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
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+    fi
 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_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)
 
-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
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+
+     ;; #(
+   *)
+     as_fn_error "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ esac
 
 WORDS_BIGENDIAN=$ac_cv_c_bigendian
 
 
-# Check whether --enable-largefile or --disable-largefile was given.
-if test "${enable_largefile+set}" = set; then
-  enableval="$enable_largefile"
+# Check whether --enable-largefile was given.
+if test "${enable_largefile+set}" = set; then :
+  enableval=$enable_largefile;
+fi
 
-fi;
 if test "$enable_largefile" != no; then
 
-  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
+  { $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
 else
   ac_cv_sys_largefile_CC=no
      if test "$GCC" != yes; then
        ac_save_CC=$CC
        while :; do
-     	 # IRIX 6.2 and later do not support large files by default,
-     	 # so use the C compiler's -n32 option if that helps.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 # IRIX 6.2 and later do not support large files by default,
+	 # so use the C compiler's -n32 option if that helps.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -7776,89 +8506,34 @@ main ()
   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
+	 if ac_fn_c_try_compile "$LINENO"; then :
   break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 fi
-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
+rm -f core conftest.err conftest.$ac_objext
+	 CC="$CC -n32"
+	 if ac_fn_c_try_compile "$LINENO"; 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 conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext
 	 break
        done
        CC=$ac_save_CC
        rm -f conftest.$ac_ext
     fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
-echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  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
+  { $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
 else
   while :; do
-  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
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -7877,40 +8552,11 @@ main ()
   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
-
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_file_offset_bits=no; break
 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
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -7930,60 +8576,33 @@ main ()
   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
+if ac_fn_c_try_compile "$LINENO"; 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 conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_file_offset_bits=unknown
   break
 done
 fi
-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
-
+{ $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) ;;
+  *)
 cat >>confdefs.h <<_ACEOF
 #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
 _ACEOF
-
-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
+;;
+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
 else
   while :; do
-  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
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -8002,40 +8621,11 @@ main ()
   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
-
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=no; break
 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
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -8055,48 +8645,26 @@ main ()
   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
+if ac_fn_c_try_compile "$LINENO"; 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 conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_large_files=unknown
   break
 done
 fi
-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
-
+{ $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) ;;
+  *)
 cat >>confdefs.h <<_ACEOF
 #define _LARGE_FILES $ac_cv_sys_large_files
 _ACEOF
-
-fi
-rm -f conftest*
+;;
+esac
+rm -rf conftest*
+  fi
 fi
 
 if test -n "$ac_cv_sys_file_offset_bits"; then
@@ -8107,44 +8675,42 @@ if test -n "$ac_cv_sys_large_files" && test "$ac_cv_sys_large_files" != "no"; th
 fi
 
 
-echo "$as_me:$LINENO: checking whether to disable vba feature" >&5
-echo $ECHO_N "checking whether to disable vba feature... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to disable vba feature" >&5
+$as_echo_n "checking whether to disable vba feature... " >&6; }
 if test -n "$enable_vba" && test "$enable_vba" = "no"; then
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
    ENABLE_VBA=NO
 else
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
    ENABLE_VBA=YES
 fi
 
 
 if test "$ENABLE_VBA" = "YES"; then
-   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
+   { $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; }
    if test -n "$with_vba_package_format"; then
       if test "$with_vba_package_format" = "extn"; then
          VBA_EXTENSION=YES
-         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;}
+         { $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;}
       else if test "$with_vba_package_format" = "builtin"; then
             VBA_EXTENSION=NO
-            echo "$as_me:$LINENO: result: build into installset" >&5
-echo "${ECHO_T}build into installset" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: build into installset" >&5
+$as_echo "build into installset" >&6; }
          else
-            { { echo "$as_me:$LINENO: error: unknown packaging method" >&5
-echo "$as_me: error: unknown packaging method" >&2;}
-   { (exit 1); exit 1; }; }
+            as_fn_error "unknown packaging method" "$LINENO" 5
          fi
       fi
 
    else
       VBA_EXTENSION=NO
-      echo "$as_me:$LINENO: result: defaulting to build into installset" >&5
-echo "${ECHO_T}defaulting to build into installset" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: defaulting to build into installset" >&5
+$as_echo "defaulting to build into installset" >&6; }
    fi
 else
       VBA_EXTENSION=NO
@@ -8154,379 +8720,74 @@ fi
 
 
 if test "$test_cups" = "yes" -a "$ENABLE_CUPS" = "TRUE" ; 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_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 :
 
-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
-  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; }; }
+  as_fn_error "cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?" "$LINENO" 5
 fi
 
 
 fi
 
 if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "GNU"; then
-  echo "$as_me:$LINENO: checking whether to enable pam support" >&5
-echo $ECHO_N "checking whether to enable pam support... $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable pam support" >&5
+$as_echo_n "checking whether to enable pam support... " >&6; }
   if test -z "$enable_pam" || test "$enable_pam" != "no"; then
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     PAM=YES
-    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_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 :
 
-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
-  { { 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; }; }
+  as_fn_error "pam_appl.h could not be found. libpam-dev or pam-devel missing?" "$LINENO" 5
 fi
 
 
-    echo "$as_me:$LINENO: checking whether to link to libpam" >&5
-echo $ECHO_N "checking whether to link to libpam... $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to link to libpam" >&5
+$as_echo_n "checking whether to link to libpam... " >&6; }
     if test -n "$enable_pam_link" -a "$enable_pam_link" != "no"; then
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       PAM_LINK=YES
-
-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
+      { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpam  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-pam_start ();
+return pam_start ();
   ;
   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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pam_pam_start=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pam_pam_start=no
+  ac_cv_lib_pam_pam_start=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_pam_pam_start" >&5
-echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6
-if test $ac_cv_lib_pam_pam_start = yes; then
+{ $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 :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBPAM 1
 _ACEOF
@@ -8534,19 +8795,17 @@ _ACEOF
   LIBS="-lpam $LIBS"
 
 else
-  { { 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; }; }
+  as_fn_error "libpam not found or functional" "$LINENO" 5
 fi
 
     else
-      echo "$as_me:$LINENO: result: no, dynamically open it" >&5
-echo "${ECHO_T}no, dynamically open it" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, dynamically open it" >&5
+$as_echo "no, dynamically open it" >&6; }
       PAM_LINK=NO
     fi
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     PAM=NO
     PAM_LINK=NO
 
@@ -8557,11 +8816,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
 
-    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
+    { $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; }
 
-    if test "${ac_cv_func_which_getspnam_r+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    if test "${ac_cv_func_which_getspnam_r+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -8578,11 +8837,7 @@ 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 >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	    #include <sys/types.h>
@@ -8599,35 +8854,10 @@ main ()
   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
+if ac_fn_c_try_compile "$LINENO"; 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 conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 #
 # FIVE ARGUMENTS
@@ -8635,11 +8865,7 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test "$ac_cv_func_which_getspnam_r" = "unknown"; then
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	    #include <sys/types.h>
@@ -8658,35 +8884,10 @@ main ()
   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
+if ac_fn_c_try_compile "$LINENO"; 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 conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
@@ -8696,11 +8897,7 @@ fi
 
 if test "$ac_cv_func_which_getspnam_r" = "unknown"; then
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	    #include <sys/types.h>
@@ -8719,35 +8916,10 @@ main ()
   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
+if ac_fn_c_try_compile "$LINENO"; 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 conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
@@ -8758,30 +8930,28 @@ fi
 
 case "$ac_cv_func_which_getspnam_r" in
     five)
-    echo "$as_me:$LINENO: result: five" >&5
-echo "${ECHO_T}five" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: five" >&5
+$as_echo "five" >&6; }
     NEW_SHADOW_API=YES
     ;;
 
     four)
-    echo "$as_me:$LINENO: result: four" >&5
-echo "${ECHO_T}four" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: four" >&5
+$as_echo "four" >&6; }
     ;;
 
     no)
-    echo "$as_me:$LINENO: result: cannot find function declaration in shadow.h" >&5
-echo "${ECHO_T}cannot find function declaration in shadow.h" >&6
+    { $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; }
     ;;
 
     unknown)
-    echo "$as_me:$LINENO: result: can't tell" >&5
-echo "${ECHO_T}can't tell" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: can't tell" >&5
+$as_echo "can't tell" >&6; }
     ;;
 
     *)
-    { { echo "$as_me:$LINENO: error: internal error" >&5
-echo "$as_me: error: internal error" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "internal error" "$LINENO" 5
     ;;
 esac
 
@@ -8800,78 +8970,49 @@ fi
 
 
 if test "$_os" = "Linux"; then
-    echo "$as_me:$LINENO: checking whether to link to libcrypt" >&5
-echo $ECHO_N "checking whether to link to libcrypt... $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to link to libcrypt" >&5
+$as_echo_n "checking whether to link to libcrypt... " >&6; }
     if test -n "$enable_crypt_link" -a "$enable_crypt_link" != "no"; then
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
         CRYPT_LINK=YES
-
-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
+        { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-crypt ();
+return crypt ();
   ;
   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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_crypt_crypt=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_crypt_crypt=no
+  ac_cv_lib_crypt_crypt=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_crypt_crypt" >&5
-echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
-if test $ac_cv_lib_crypt_crypt = yes; then
+{ $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 :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBCRYPT 1
 _ACEOF
@@ -8879,14 +9020,12 @@ _ACEOF
   LIBS="-lcrypt $LIBS"
 
 else
-  { { 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; }; }
+  as_fn_error "libcrypt not found or functional" "$LINENO" 5
 fi
 
     else
-        echo "$as_me:$LINENO: result: no, dynamically open it" >&5
-echo "${ECHO_T}no, dynamically open it" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, dynamically open it" >&5
+$as_echo "no, dynamically open it" >&6; }
         CRYPT_LINK=NO
     fi
 fi
@@ -8905,20 +9044,24 @@ if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
 fi
 
 if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
-   ac_ext=cc
+   ac_ext=cpp
 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 -n "$ac_tool_prefix"; then
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+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
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -8928,39 +9071,41 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
     test -n "$CXX" && break
   done
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe 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
-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
+{ $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
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -8970,64 +9115,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   test -n "$ac_ct_CXX" && break
 done
-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
 
-  CXX=$ac_ct_CXX
+  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
 fi
 
-
+  fi
+fi
 # Provide some information about the compiler.
-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=$?
-  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
+$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
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $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: 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
+{ $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
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -9041,55 +9199,34 @@ main ()
   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_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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
+  ac_compiler_gnu=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 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`
+{ $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
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-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
+{ $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
 /* end confdefs.h.  */
 
 int
@@ -9100,160 +9237,64 @@ main ()
   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_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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_prog_cxx_g=yes
 else
-  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
+  CXXFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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_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
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_cxx_try_compile "$LINENO"; then :
 
-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
+else
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+	 CXXFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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_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
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes
 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
+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
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
 fi
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -9263,32 +9304,27 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 fi
 
 if test "$GXX" = "yes"; then
-   echo "$as_me:$LINENO: checking the GNU C++ compiler version" >&5
-echo $ECHO_N "checking the GNU C++ compiler version... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking the GNU C++ compiler version" >&5
+$as_echo_n "checking the GNU C++ compiler version... " >&6; }
 
    _gpp_version=`$CXX -dumpversion`
    _gpp_major=`echo $_gpp_version | $AWK -F. '{ print \$1 }'`
    _gpp_minor=`echo $_gpp_version | $AWK -F. '{ print \$2 }'`
 
-   echo "$as_me:$LINENO: result: checked (g++ $_gpp_version)" >&5
-echo "${ECHO_T}checked (g++ $_gpp_version)" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (g++ $_gpp_version)" >&5
+$as_echo "checked (g++ $_gpp_version)" >&6; }
 
    if test "$_gpp_major" = "3"; then
       if test "$_gpp_minor" = "4"; then
-         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
+         { $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
 /* end confdefs.h.  */
 
 extern "C" void abort (void);
@@ -9313,31 +9349,16 @@ main (void)
 }
 
 _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: 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
+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; }
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
+
       fi
    fi
 fi
@@ -9345,8 +9366,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
-   echo "$as_me:$LINENO: checking for g++ include path" >&5
-echo $ECHO_N "checking for g++ include path... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for g++ include path" >&5
+$as_echo_n "checking for g++ include path... " >&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
@@ -9364,18 +9385,18 @@ echo $ECHO_N "checking for g++ include path... $ECHO_C" >&6
 fi
 if test -z "$with_gxx_include_path"; then
    with_gxx_include_path="NO_GXX_INCLUDE"
-   echo "$as_me:$LINENO: result: no g++ includes" >&5
-echo "${ECHO_T}no g++ includes" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no g++ includes" >&5
+$as_echo "no g++ includes" >&6; }
 else
-   echo "$as_me:$LINENO: result: $with_gxx_include_path" >&5
-echo "${ECHO_T}$with_gxx_include_path" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_gxx_include_path" >&5
+$as_echo "$with_gxx_include_path" >&6; }
 fi
 GXX_INCLUDE_PATH="$with_gxx_include_path"
 
 
 if test "$WITH_MINGWIN" = "yes"; then
-   echo "$as_me:$LINENO: checking for mingwin runtime include path" >&5
-echo $ECHO_N "checking for mingwin runtime include path... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mingwin runtime include path" >&5
+$as_echo_n "checking for mingwin runtime include path... " >&6; }
    cat >conftest.$ac_ext <<_ACEOF
 #include <stddef.h>
 #include <bits/c++config.h>
@@ -9393,16 +9414,16 @@ _ACEOF
    fi
    if test -z "$_mingw_lib_include_path"; then
       _mingw_lib_include_path="NO_LIB_INCLUDE"
-      echo "$as_me:$LINENO: result: no mingwin runtime includes" >&5
-echo "${ECHO_T}no mingwin runtime includes" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no mingwin runtime includes" >&5
+$as_echo "no mingwin runtime includes" >&6; }
    else
-      echo "$as_me:$LINENO: result: $_mingw_lib_include_path" >&5
-echo "${ECHO_T}$_mingw_lib_include_path" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_mingw_lib_include_path" >&5
+$as_echo "$_mingw_lib_include_path" >&6; }
    fi
   MINGW_LIB_INCLUDE_PATH="$_mingw_lib_include_path"
 
-   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
+   { $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; }
    cat >conftest.$ac_ext <<_ACEOF
 #include <hash_set>
 _ACEOF
@@ -9411,57 +9432,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`
-      echo "$as_me:$LINENO: result: $_mingw_backward_include_path" >&5
-echo "${ECHO_T}$_mingw_backward_include_path" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_mingw_backward_include_path" >&5
+$as_echo "$_mingw_backward_include_path" >&6; }
    else
       _mingw_backward_include_path="NO_BACKWARD_INCLUDE"
-      echo "$as_me:$LINENO: result: no mingwin c++ backward includes" >&5
-echo "${ECHO_T}no mingwin c++ backward includes" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no mingwin c++ backward includes" >&5
+$as_echo "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`
-  echo "$as_me:$LINENO: checking whether to use dynamic libgcc" >&5
-echo $ECHO_N "checking whether to use dynamic libgcc... $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use dynamic libgcc" >&5
+$as_echo_n "checking whether to use dynamic libgcc... " >&6; }
   if test -e "$MINGW_CLIB_DIR/libgcc_s.a"; then
-    echo "$as_me:$LINENO: checking dynamic libgcc name" >&5
-echo $ECHO_N "checking dynamic libgcc name... $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic libgcc name" >&5
+$as_echo_n "checking dynamic libgcc name... " >&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
-        echo "$as_me:$LINENO: result: use $MINGW_GCCDLL" >&5
-echo "${ECHO_T}use $MINGW_GCCDLL" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: use $MINGW_GCCDLL" >&5
+$as_echo "use $MINGW_GCCDLL" >&6; }
     else
-        echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   if test -e "$MINGW_CLIB_DIR/libgcc_eh.a"; then
       MINGW_GCCLIB_EH=YES
   fi
-  echo "$as_me:$LINENO: checking whether to use dynamic libstdc++" >&5
-echo $ECHO_N "checking whether to use dynamic libstdc++... $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use dynamic libstdc++" >&5
+$as_echo_n "checking whether to use dynamic libstdc++... " >&6; }
   if test -e "$MINGW_CLIB_DIR/libstdc++_s.a" ; then
-    echo "$as_me:$LINENO: checking dynamic libstdc++ name" >&5
-echo $ECHO_N "checking dynamic libstdc++ name... $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic libstdc++ name" >&5
+$as_echo_n "checking dynamic libstdc++ name... " >&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
-        echo "$as_me:$LINENO: result: use $MINGW_GXXDLL" >&5
-echo "${ECHO_T}use $MINGW_GXXDLL" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: use $MINGW_GXXDLL" >&5
+$as_echo "use $MINGW_GXXDLL" >&6; }
     else
-        echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   MINGW_CLIB_DIR=`cygpath $MINGW_CLIB_DIR`
 
@@ -9474,50 +9495,50 @@ fi
 
 if test "$_os" = "SunOS"; then
       if test "$CC" = "cc"; then
-   echo "$as_me:$LINENO: checking SunStudio C++ Compiler" >&5
-echo $ECHO_N "checking SunStudio C++ Compiler... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking SunStudio C++ Compiler" >&5
+$as_echo_n "checking SunStudio C++ Compiler... " >&6; }
       if test "$CXX" != "CC"; then
-         { echo "$as_me:$LINENO: WARNING: SunStudio C++ was not found" >&5
-echo "$as_me: WARNING: SunStudio C++ was not found" >&2;}
+         { $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 "SunStudio C++ was not found" >> warn
       else
-         echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
+$as_echo "checked" >&6; }
       fi
    fi
 fi
 if test "$_os" = "Darwin"; then
       if test "$CC" = "cc"; then
-      echo "$as_me:$LINENO: checking Macosx c++ Compiler" >&5
-echo $ECHO_N "checking Macosx c++ Compiler... $ECHO_C" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking Macosx c++ Compiler" >&5
+$as_echo_n "checking Macosx c++ Compiler... " >&6; }
       if test "$CXX" != "c++"; then
-         { echo "$as_me:$LINENO: WARNING: Macosx C++ was not found" >&5
-echo "$as_me: WARNING: Macosx C++ was not found" >&2;}
+         { $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 "Macosx C++ was not found" >> warn
       else
-         echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
+$as_echo "checked" >&6; }
       fi
    fi
 fi
 if test "$_os" = "OSF1"; then
-   echo "$as_me:$LINENO: checking Compaq C++ compiler version" >&5
-echo $ECHO_N "checking Compaq C++ compiler version... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking Compaq C++ compiler version" >&5
+$as_echo_n "checking Compaq C++ compiler version... " >&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
-      { 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;}
+      { $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 "found version $_compaqc_version, use version 6 of the Compaq C++ compiler" >> warn
    else
-            echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
+$as_echo "checked" >&6; }
    fi
 fi
 
-echo "$as_me:$LINENO: checking exception type" >&5
-echo $ECHO_N "checking exception type... $ECHO_C" >&6
-ac_ext=cc
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking exception type" >&5
+$as_echo_n "checking exception type... " >&6; }
+ac_ext=cpp
 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'
@@ -9525,11 +9546,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 if test "$WITH_MINGWIN" = "yes"; then
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <iostream>
 
@@ -9544,42 +9561,18 @@ _Unwind_SjLj_RaiseException()
   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
+if ac_fn_cxx_try_link "$LINENO"; then :
   exceptions_type="sjlj"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-exceptions_type="dwarf2"
+  exceptions_type="dwarf2"
 
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:$LINENO: result: $exceptions_type" >&5
-echo "${ECHO_T}$exceptions_type" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $exceptions_type" >&5
+$as_echo "$exceptions_type" >&6; }
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -9592,8 +9585,8 @@ EXCEPTIONS="$exceptions_type"
 if test "$_os" = "SunOS"; then
    _temp=`showrev -p | $AWK -F" " '{ print $2 }'`
    if test "$_os_release" = "7"; then
-                        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
+                        { $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; }
       _patch=`echo $_temp | $AWK '/106327-06/ { print "found" }'`
       _patch="false"
       for i in $_temp
@@ -9607,15 +9600,15 @@ echo $ECHO_N "checking for patch 106327-06 or greater... $ECHO_C" >&6
         fi
       done
       if test "$_patch" = "found"; then
-         echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
       else
-         { 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;}
+         { $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 "patch 106327-06 not found, please install compiler patch 106327-06 or greater" >> warn
       fi
-                        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
+                        { $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; }
       _patch=`echo $_temp | $AWK '/106950-11/ { print "found" }'`
       _patch="false"
       for i in $_temp
@@ -9629,17 +9622,17 @@ echo $ECHO_N "checking for patch 106950-11 or greater... $ECHO_C" >&6
          fi
       done
       if test "$_patch" = "found"; then
-         echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
       else
-         { 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;}
+         { $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 "patch 106950-11 not found, please install linker patch 106950-11 or greater" >> warn
       fi
    else
       if test "$_os_release" = "6"; then
-                                    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
+                                    { $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; }
          _patch=`echo $_temp | $AWK '/105591-09/ { print "found" }'`
          _patch="false"
          for i in $_temp
@@ -9653,15 +9646,15 @@ echo $ECHO_N "checking for patch 105591-09 or greater... $ECHO_C" >&6
            fi
          done
          if test "$_patch" = "found"; then
-            echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
          else
-            { 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;}
+            { $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 "patch 105591-09 not found, please install compiler patch 105591-09 or greater" >> warn
          fi
-                                    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
+                                    { $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; }
          _patch=`echo $_temp | $AWK '/107733-08/ { print "found" }'`
          _patch="false"
          for i in $_temp
@@ -9675,19 +9668,19 @@ echo $ECHO_N "checking for patch 107733-08 or greater... $ECHO_C" >&6
            fi
          done
          if test "$_patch" = "found"; then
-            echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
          else
-            { 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;}
+            { $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 "patch 107733-06 not found, please install linker patch 107733-08 or greater" >> warn
          fi
       fi
    fi
 fi
 
-   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
+   { $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; }
    DEFAULT_TO_STLPORT="no"
    if test "$_os" = "Linux"; then
      case "$build_cpu" in
@@ -9708,134 +9701,100 @@ echo $ECHO_N "checking what the default STL should be... $ECHO_C" >&6
       DEFAULT_TO_STLPORT="yes"
    fi
    if test "$DEFAULT_TO_STLPORT" = "yes"; then
-      echo "$as_me:$LINENO: result: stlport" >&5
-echo "${ECHO_T}stlport" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: stlport" >&5
+$as_echo "stlport" >&6; }
    else
-      echo "$as_me:$LINENO: result: system" >&5
-echo "${ECHO_T}system" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: system" >&5
+$as_echo "system" >&6; }
    fi
    if test "$WITH_STLPORT" = "auto"; then
       WITH_STLPORT=$DEFAULT_TO_STLPORT
    fi
 
-   echo "$as_me:$LINENO: checking for STL providing headers" >&5
-echo $ECHO_N "checking for STL providing headers... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for STL providing headers" >&5
+$as_echo_n "checking for STL providing headers... " >&6; }
    STLPORT4=""
    USE_SYSTEM_STL=""
    if test "$WITH_STLPORT" = "yes"; then
-      echo "$as_me:$LINENO: result: using internal stlport." >&5
-echo "${ECHO_T}using internal stlport." >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: using internal stlport." >&5
+$as_echo "using internal stlport." >&6; }
       if test "$DEFAULT_TO_STLPORT" != "yes"; then
-         { 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;}
+         { $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 "using stlport. Warning, breaks your ABI compatability!" >>warn
       fi
    elif test "$WITH_STLPORT" = "no"; then
-      echo "$as_me:$LINENO: result: using system STL" >&5
-echo "${ECHO_T}using system STL" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: using system STL" >&5
+$as_echo "using system STL" >&6; }
       USE_SYSTEM_STL="YES"
       if test "$DEFAULT_TO_STLPORT" != "no"; then
-         { 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;}
+         { $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 "using system STL. Warning, breaks your ABI compatability!" >>warn
       fi
    else
       STLPORT4=$WITH_STLPORT
       if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
-         cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $STLPORT4/stlport/hash_map
 _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
-  echo "$as_me:$LINENO: result: checked." >&5
-echo "${ECHO_T}checked." >&6
+if ac_fn_c_try_cpp "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked." >&5
+$as_echo "checked." >&6; }
 else
-  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; }; }
+  as_fn_error "STLport headers not found." "$LINENO" 5
 fi
 rm -f conftest.err conftest.$ac_ext
       else
                   if test -f "$STLPORT4/stlport/hash_map"; then
-            echo "$as_me:$LINENO: result: checked." >&5
-echo "${ECHO_T}checked." >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked." >&5
+$as_echo "checked." >&6; }
          else
-            { { echo "$as_me:$LINENO: error: STLport headers not found." >&5
-echo "$as_me: error: STLport headers not found." >&2;}
-   { (exit 1); exit 1; }; }
+            as_fn_error "STLport headers not found." "$LINENO" 5
          fi
       fi
       if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
-         echo "$as_me:$LINENO: checking for STLport libraries" >&5
-echo $ECHO_N "checking for STLport libraries... $ECHO_C" >&6
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for STLport libraries" >&5
+$as_echo_n "checking for STLport libraries... " >&6; }
          if test "$_os" = "SunOS"; then
 		      if test -f "$STLPORT4/lib/libstlport_sunpro.so"; then
-			      echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
+			      { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
+$as_echo "checked" >&6; }
 		      elif test -f "$STLPORT4/lib/libstlport.so"; then
-			      echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
+			      { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
+$as_echo "checked" >&6; }
 			      STLPORT_VER=500
 		      else
-			      { { echo "$as_me:$LINENO: error: STLport libraries not found" >&5
-echo "$as_me: error: STLport libraries not found" >&2;}
-   { (exit 1); exit 1; }; }
+			      as_fn_error "STLport libraries not found" "$LINENO" 5
 		      fi
 	      elif test "$_os" = "Darwin"; then
 		      if test -f "$STLPORT4/lib/libstlport_gcc.dylib"; then
-			      echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
+			      { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
+$as_echo "checked" >&6; }
 		      elif test -f "$STLPORT4/lib/libstlport.dylib"; then
-			      echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
+			      { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
+$as_echo "checked" >&6; }
 			      STLPORT_VER=500
 		      else
-			      { { echo "$as_me:$LINENO: error: STLport libraries not found" >&5
-echo "$as_me: error: STLport libraries not found" >&2;}
-   { (exit 1); exit 1; }; }
+			      as_fn_error "STLport libraries not found" "$LINENO" 5
 		      fi
 		   else
 			   if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
-				   echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
+				   { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
+$as_echo "checked" >&6; }
 			   elif test -f "$STLPORT4/lib/libstlport.so"; then
-				   echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
+				   { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
+$as_echo "checked" >&6; }
 				   STLPORT_VER=500
 			   else
-				   { { echo "$as_me:$LINENO: error: STLport libraries not found" >&5
-echo "$as_me: error: STLport libraries not found" >&2;}
-   { (exit 1); exit 1; }; }
+				   as_fn_error "STLport libraries not found" "$LINENO" 5
 			   fi
 		   fi
 	   fi
       if test "$DEFAULT_TO_STLPORT" != "yes"; then
-         { 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;}
+         { $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 "using stlport. Warning, breaks your ABI compatability!" >>warn
       fi
    fi
@@ -9851,15 +9810,11 @@ fi
 
 
 if test "$GCC" = "yes"; then
-   echo "$as_me:$LINENO: checking whether $CC supports -fvisibility=hidden" >&5
-echo $ECHO_N "checking whether $CC supports -fvisibility=hidden... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -fvisibility=hidden" >&5
+$as_echo_n "checking whether $CC supports -fvisibility=hidden... " >&6; }
    save_CFLAGS=$CFLAGS
    CFLAGS="$CFLAGS -fvisibility=hidden"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -9870,72 +9825,47 @@ 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_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
+if ac_fn_c_try_link "$LINENO"; then :
    HAVE_GCC_VISIBILITY_FEATURE=TRUE
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
    CFLAGS=$save_CFLAGS
    if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
    else
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
    fi
 fi
 
 # ===================================================================
 # use --ccache-skip?
 # ===================================================================
-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
+{ $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; }
 if test "$_os" != "Darwin" ; then
-   echo "$as_me:$LINENO: result: only used on Mac currently, skipping" >&5
-echo "${ECHO_T}only used on Mac currently, skipping" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: only used on Mac currently, skipping" >&5
+$as_echo "only used on Mac currently, skipping" >&6; }
 elif test "$enable_ccache_skip" = "no" ; then
-   echo "$as_me:$LINENO: result: no - diabled explicitly" >&5
-echo "${ECHO_T}no - diabled explicitly" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - diabled explicitly" >&5
+$as_echo "no - diabled explicitly" >&6; }
 elif test "$enable_ccache_skip" = "yes" ; then
-   echo "$as_me:$LINENO: result: yes - enabled explicitly, skipping checks" >&5
-echo "${ECHO_T}yes - enabled explicitly, skipping checks" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - enabled explicitly, skipping checks" >&5
+$as_echo "yes - enabled explicitly, skipping checks" >&6; }
    USE_CCACHE=YES
 
 elif test "$enable_ccache_skip" = "auto" ; then
    # checking for ccache presence/version
-   echo "$as_me:$LINENO: result: probing..." >&5
-echo "${ECHO_T}probing..." >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: probing..." >&5
+$as_echo "probing..." >&6; }
    # Extract the first word of "ccache", so it can be a program name with args.
 set dummy ccache; 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_CCACHE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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
 else
   case $CCACHE in
   [\\/]* | ?:[\\/]*)
@@ -9947,43 +9877,44 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_CCACHE="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_CCACHE" && ac_cv_path_CCACHE="not_found"
   ;;
 esac
 fi
 CCACHE=$ac_cv_path_CCACHE
-
 if test -n "$CCACHE"; then
-  echo "$as_me:$LINENO: result: $CCACHE" >&5
-echo "${ECHO_T}$CCACHE" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CCACHE" >&5
+$as_echo "$CCACHE" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
    if test "$CCACHE" = "not_found" ; then
-      { echo "$as_me:$LINENO: not enabling --ccache-skip (ccache not found)" >&5
-echo "$as_me: not enabling --ccache-skip (ccache not found)" >&6;}
+      { $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;}
    else
       # check ccache version
-      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
+      { $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; }
       CCACHE_VERSION=`"$CCACHE" -V | "$AWK" '/^ccache version/{print $3}'`
       if test "$CCACHE_VERSION" = "2.4_OOo"; then
-         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
+         { $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
 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'
@@ -9991,11 +9922,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
          save_CXXFLAGS=$CXXFLAGS
          CXXFLAGS="$CXXFLAGS --ccache-skip -O2"
-                  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+                  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -10006,44 +9933,20 @@ main ()
   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_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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   use_ccache=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-use_ccache=no
+  use_ccache=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
          if test $use_ccache = yes ; then
-            echo "$as_me:$LINENO: result: yes, will enable --ccache-skip" >&5
-echo "${ECHO_T}yes, will enable --ccache-skip" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, will enable --ccache-skip" >&5
+$as_echo "yes, will enable --ccache-skip" >&6; }
             USE_CCACHE=YES
 
          else
-            echo "$as_me:$LINENO: result: no, will not enable --ccache-skip" >&5
-echo "${ECHO_T}no, will not enable --ccache-skip" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, will not enable --ccache-skip" >&5
+$as_echo "no, will not enable --ccache-skip" >&6; }
          fi
          CXXFLAGS=$save_CXXFLAGS
          ac_ext=c
@@ -10053,33 +9956,27 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
       else
-         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;}
+         { $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;}
       fi
    fi
 else
-   { { 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; }; }
+   as_fn_error "invalid option to --enable-ccache-skip. Valid values are \"auto\", \"yes\" and \"no\"" "$LINENO" 5
 fi
 
 if test "$USE_SYSTEM_STL" = "YES"; then
-   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
+   { $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
 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 >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ext/hash_map>
 using namespace __gnu_cxx;
@@ -10092,72 +9989,42 @@ hash_map<int, int> t; 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_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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_cxx_have_ext_hash_map=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_cxx_have_ext_hash_map=no
+  ac_cv_cxx_have_ext_hash_map=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
    if test "$ac_cv_cxx_have_ext_hash_map" = "no"; then
-      { { 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; }; }
+      as_fn_error "Can't find hash_map. Try with --with-stlport" "$LINENO" 5
    else
-      echo "$as_me:$LINENO: result: $ac_cv_cxx_have_ext_hash_map" >&5
-echo "${ECHO_T}$ac_cv_cxx_have_ext_hash_map" >&6
+      { $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; }
    fi
 
    if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
-      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
+      { $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; }
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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*
 
-      echo "$as_me:$LINENO: result: $stlvisok" >&5
-echo "${ECHO_T}$stlvisok" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $stlvisok" >&5
+$as_echo "$stlvisok" >&6; }
       if test "$stlvisok" = "no"; then
-         { 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;}
+         { $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 "Your gcc STL headers are not visibility safe. Disabling visibility" >> warn
          unset HAVE_GCC_VISIBILITY_FEATURE
       fi
@@ -10167,13 +10034,9 @@ echo "$as_me: WARNING: Your gcc STL headers are not visibility safe. Disabling v
       sharedlink_ldflags_save=$LDFLAGS
       LDFLAGS="$LDFLAGS -fvisibility-inlines-hidden -fpic -shared"
 
-      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
+      { $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
 /* end confdefs.h.  */
 #include <sstream>
 using namespace std;
@@ -10186,43 +10049,19 @@ istringstream strm( "test" ); return 0;
   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
+if ac_fn_cxx_try_link "$LINENO"; then :
   $EGREP -q  unresolvable conftest.err;
       if test $? -eq 0; then gccvisok=no; else gccvisok=yes; fi
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gccvisok=no
+  gccvisok=no
 fi
-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
+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; }
       if test "$gccvisok" = "no"; then
-         { 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;}
+         { $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 "Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >> warn
          unset HAVE_GCC_VISIBILITY_FEATURE
       fi
@@ -10231,8 +10070,8 @@ echo "$as_me: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Disabli
    fi
 
    if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
-      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
+      { $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; }
       cat >visibility.cxx <<_ACEOF
 #pragma GCC visibility push(hidden)
 struct __attribute__ ((visibility ("default"))) TestStruct {
@@ -10260,11 +10099,11 @@ _ACEOF
       fi
       rm -f visibility.s
 
-      echo "$as_me:$LINENO: result: $gccvisbroken" >&5
-echo "${ECHO_T}$gccvisbroken" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gccvisbroken" >&5
+$as_echo "$gccvisbroken" >&6; }
       if test "$gccvisbroken" = "yes"; then
-         { 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;}
+         { $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 "Your gcc is not -fvisibility=hidden safe. Disabling visibility" >> warn
          unset HAVE_GCC_VISIBILITY_FEATURE
       fi
@@ -10280,112 +10119,20 @@ fi
 
 
 
-echo "$as_me:$LINENO: checking which memory allocator to use" >&5
-echo $ECHO_N "checking which memory allocator to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which memory allocator to use" >&5
+$as_echo_n "checking which memory allocator to use... " >&6; }
 if test "$with_alloc" = "system"; then
-    echo "$as_me:$LINENO: result: system" >&5
-echo "${ECHO_T}system" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: system" >&5
+$as_echo "system" >&6; }
     ALLOC="SYS_ALLOC";
-
-
-
-
-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
+    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 :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -10393,79 +10140,48 @@ done
 
 fi
 if test "$with_alloc" = "tcmalloc"; then
-    echo "$as_me:$LINENO: result: tcmalloc" >&5
-echo "${ECHO_T}tcmalloc" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: tcmalloc" >&5
+$as_echo "tcmalloc" >&6; }
     if ! echo $build_cpu | grep -E 'i[3456]86' 2>/dev/null >/dev/null; then
-        { { 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; }; }
+        as_fn_error "tcmalloc only available/usable on ix86" "$LINENO" 5
     fi
-
-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
+    { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltcmalloc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-malloc ();
+return malloc ();
   ;
   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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_tcmalloc_malloc=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_tcmalloc_malloc=no
+  ac_cv_lib_tcmalloc_malloc=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_tcmalloc_malloc" >&5
-echo "${ECHO_T}$ac_cv_lib_tcmalloc_malloc" >&6
-if test $ac_cv_lib_tcmalloc_malloc = yes; then
+{ $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 :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBTCMALLOC 1
 _ACEOF
@@ -10473,46 +10189,44 @@ _ACEOF
   LIBS="-ltcmalloc $LIBS"
 
 else
-  { { 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; }; }
+  as_fn_error "tcmalloc not found or functional. Install the Google Profiling Tools" "$LINENO" 5
 fi
 
     ALLOC="TCMALLOC";
 fi
 if test "$with_alloc" = "internal" -o -z "$with_alloc"; then
-   echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
 fi
 
 
 
-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
+{ $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; }
 if test "z$with_build_version" != "z"; then
    BUILD_VER_STRING=$with_build_version
-   echo "$as_me:$LINENO: result: yes, $BUILD_VER_STRING" >&5
-echo "${ECHO_T}yes, $BUILD_VER_STRING" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, $BUILD_VER_STRING" >&5
+$as_echo "yes, $BUILD_VER_STRING" >&6; }
 else
    BUILD_VER_STRING=
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
-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
+{ $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; }
 if test "$WITH_JAVA" != "no"; then
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
    SOLAR_JAVA="TRUE"
 else
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
    SOLAR_JAVA=""
 
-   { 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;}
+   { $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 "building without java will mean some features will not be available" >>warn
 fi
 
@@ -10539,10 +10253,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
-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
+{ $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
 else
   case $JAVAINTERPRETER in
   [\\/]* | ?:[\\/]*)
@@ -10554,36 +10268,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_JAVAINTERPRETER="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 JAVAINTERPRETER=$ac_cv_path_JAVAINTERPRETER
-
 if test -n "$JAVAINTERPRETER"; then
-  echo "$as_me:$LINENO: result: $JAVAINTERPRETER" >&5
-echo "${ECHO_T}$JAVAINTERPRETER" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAINTERPRETER" >&5
+$as_echo "$JAVAINTERPRETER" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
    else
       _java_path="$with_jdk_home/bin/$WITH_JAVA"
             if test -x "$_java_path"; then
          JAVAINTERPRETER=$_java_path
       else
-         { { 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; }; }
+         as_fn_error "$_java_path not found set with_jdk_home" "$LINENO" 5
       fi
    fi
    if test "$_os" = "WINNT"; then
@@ -10597,13 +10310,11 @@ fi
 
 if test "$SOLAR_JAVA" != ""; then
    _gij_longver=0
-   echo "$as_me:$LINENO: checking the installed JDK" >&5
-echo $ECHO_N "checking the installed JDK... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking the installed JDK" >&5
+$as_echo_n "checking the installed JDK... " >&6; }
    if test -n "$JAVAINTERPRETER"; then
             if test `$JAVAINTERPRETER -version 2>&1 | grep -c "Kaffe"` -gt 0; then
-         { { 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; }; }
+         as_fn_error "No valid check available. Please check the block for your desired java in configure.in" "$LINENO" 5
 #        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
@@ -10623,15 +10334,13 @@ echo "$as_me: error: No valid check available. Please check the block for your d
 #        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
-        echo "$as_me:$LINENO: result: checked (gcj)" >&5
-echo "${ECHO_T}checked (gcj)" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (gcj)" >&5
+$as_echo "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
-         { { 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; }; }
+         as_fn_error "No valid check available. Please check the block for your desired java in configure.in" "$LINENO" 5
 #        JDK=bea
 #
 #        dnl BEA JDK specific tests
@@ -10661,20 +10370,15 @@ echo "$as_me: error: No valid check available. Please check the block for your d
         _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
 
         if test "$_jdk_ver" -lt 10500; then
-             { { echo "$as_me:$LINENO: error: IBM JDK is too old, you need at least 1.5" >&5
-echo "$as_me: error: IBM JDK is too old, you need at least 1.5" >&2;}
-   { (exit 1); exit 1; }; }
+             as_fn_error "IBM JDK is too old, you need at least 1.5" "$LINENO" 5
         fi
 
-        echo "$as_me:$LINENO: result: checked (IBM JDK $_jdk)" >&5
-echo "${ECHO_T}checked (IBM JDK $_jdk)" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (IBM JDK $_jdk)" >&5
+$as_echo "checked (IBM JDK $_jdk)" >&6; }
 
         if test "$with_jdk_home" = ""; then
-             { { 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; }; }
+             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
         fi
 
         JAVA_HOME=$with_jdk_home
@@ -10686,12 +10390,10 @@ you must use the \"--with-jdk-home\" configure option explicitly" >&2;}
         _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
 
         if test "$_jdk_ver" -lt 10500; then
-             { { 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; }; }
+             as_fn_error "JDK is too old, you need at least 1.5" "$LINENO" 5
         fi
-        echo "$as_me:$LINENO: result: checked (JDK $_jdk)" >&5
-echo "${ECHO_T}checked (JDK $_jdk)" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (JDK $_jdk)" >&5
+$as_echo "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]$,,"`
@@ -10701,9 +10403,7 @@ echo "${ECHO_T}checked (JDK $_jdk)" >&6
         fi
       fi
    else
-      { { 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; }; }
+      as_fn_error "JAVA not found. You need at least jdk-1.5, or gcj-4" "$LINENO" 5
    fi
 else
       JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME
@@ -10723,10 +10423,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
-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
+{ $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
 else
   case $JAVACOMPILER in
   [\\/]* | ?:[\\/]*)
@@ -10738,28 +10438,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_JAVACOMPILER="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 JAVACOMPILER=$ac_cv_path_JAVACOMPILER
-
 if test -n "$JAVACOMPILER"; then
-  echo "$as_me:$LINENO: result: $JAVACOMPILER" >&5
-echo "${ECHO_T}$JAVACOMPILER" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVACOMPILER" >&5
+$as_echo "$JAVACOMPILER" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
     else
         _javac_path="$with_jdk_home/bin/$javacompiler"
                 if test -x "$_javac_path"; then
@@ -10767,9 +10468,7 @@ fi
         fi
     fi
     if test -z "$JAVACOMPILER"; then
-      { { 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; }; }
+      as_fn_error "$javacompiler not found set with_jdk_home" "$LINENO" 5
     fi
     if test "$_os" = "WINNT"; then
        if test x`echo "$JAVACOMPILER" | grep -i '\.exe$'` = x; then
@@ -10785,11 +10484,11 @@ echo "$as_me: error: $javacompiler not found set with_jdk_home" >&2;}
     fi
 
     if test `$JAVACOMPILER -version 2>&1 | grep -c "Eclipse Java Compiler"` -gt 0; then
-        echo "$as_me:$LINENO: checking re-checking JDK" >&5
-echo $ECHO_N "checking re-checking JDK... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking re-checking JDK" >&5
+$as_echo_n "checking re-checking JDK... " >&6; }
         JDK=gcj
-        echo "$as_me:$LINENO: result: checked (ecj)" >&5
-echo "${ECHO_T}checked (ecj)" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (ecj)" >&5
+$as_echo "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"
@@ -10808,10 +10507,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
-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
+{ $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
 else
   case $JAVADOC in
   [\\/]* | ?:[\\/]*)
@@ -10823,28 +10522,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_JAVADOC="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 JAVADOC=$ac_cv_path_JAVADOC
-
 if test -n "$JAVADOC"; then
-  echo "$as_me:$LINENO: result: $JAVADOC" >&5
-echo "${ECHO_T}$JAVADOC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVADOC" >&5
+$as_echo "$JAVADOC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
     else
         _javadoc_path="$with_jdk_home/bin/javadoc"
         if test "$_os" = "OS2"; then
@@ -10857,10 +10557,10 @@ fi
         else
             # Extract the first word of "javadoc", so it can be a program name with args.
 set dummy javadoc; 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_JAVADOC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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
 else
   case $JAVADOC in
   [\\/]* | ?:[\\/]*)
@@ -10872,34 +10572,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_JAVADOC="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 JAVADOC=$ac_cv_path_JAVADOC
-
 if test -n "$JAVADOC"; then
-  echo "$as_me:$LINENO: result: $JAVADOC" >&5
-echo "${ECHO_T}$JAVADOC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVADOC" >&5
+$as_echo "$JAVADOC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
         fi
     fi
     if test -z "$JAVADOC"; then
-      { { 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; }; }
+      as_fn_error "$_javadoc_path not found set with_jdk_home" "$LINENO" 5
     fi
     if test "$_os" = "WINNT"; then
         if test x`echo "$JAVADOC" | grep -i '\.exe$'` = x; then
@@ -10931,37 +10630,33 @@ class findhome
     }
 }
 _ACEOF
-        echo "$as_me:$LINENO: checking if javac works" >&5
-echo $ECHO_N "checking if javac works... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if javac works" >&5
+$as_echo_n "checking if javac works... " >&6; }
         javac_cmd="$JAVACOMPILER findhome.java 1>&2"
-        { (eval echo "$as_me:$LINENO: \"$javac_cmd\"") >&5
+        { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$javac_cmd\""; } >&5
   (eval $javac_cmd) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
         if test $? = 0 && test -f ./findhome.class ; then
-          echo "$as_me:$LINENO: result: javac works" >&5
-echo "${ECHO_T}javac works" >&6
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: javac works" >&5
+$as_echo "javac works" >&6; }
         else
           echo "configure: javac test failed" >&5
           cat findhome.java >&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; }; }
+          as_fn_error "javac does not work - java projects will not build!" "$LINENO" 5
         fi
 
-        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
+        { $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; }
         JAVA_HOME=`$JAVAINTERPRETER findhome`
         if test $? = 0 && test "$JAVA_HOME" != "" ; then
-          echo "$as_me:$LINENO: result: $JAVA_HOME" >&5
-echo "${ECHO_T}$JAVA_HOME" >&6
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVA_HOME" >&5
+$as_echo "$JAVA_HOME" >&6; }
         else
           echo "configure: java test failed" >&5
           cat findhome.java >&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; }; }
+          as_fn_error "gij does not know its java.home - use --with-jdk-home" "$LINENO" 5
         fi
       else
         JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*$WITH_JAVA,,p"`
@@ -10983,10 +10678,10 @@ echo "$as_me: error: gij does not know its java.home - use --with-jdk-home" >&2;
             JAVA_HOME=$(readlink $JAVACOMPILER)
          else
           # else warn
-          { 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;}
+          { $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 "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
@@ -11008,12 +10703,12 @@ echo "$as_me: WARNING: if this is the case, please inform the correct JAVA_HOME
          JAVA_HOME_OK="NO"
       fi
       if test "$JAVA_HOME_OK" = "NO"; then
-         { 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;}
+         { $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 "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
@@ -11026,225 +10721,59 @@ fi
 
 AWTLIB=
 if test "$SOLAR_JAVA" != ""; then
-   echo "$as_me:$LINENO: checking for jawt lib name" >&5
-echo $ECHO_N "checking for jawt lib name... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jawt lib name" >&5
+$as_echo_n "checking for jawt lib name... " >&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
-      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_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 :
 
-  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
-  { { 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; }; }
+  as_fn_error "jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?" "$LINENO" 5
 fi
 
 
-      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
+      { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgcjawt  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-JAWT_GetAWT ();
+return JAWT_GetAWT ();
   ;
   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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gcjawt_JAWT_GetAWT=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_gcjawt_JAWT_GetAWT=no
+  ac_cv_lib_gcjawt_JAWT_GetAWT=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_gcjawt_JAWT_GetAWT" >&5
-echo "${ECHO_T}$ac_cv_lib_gcjawt_JAWT_GetAWT" >&6
-if test $ac_cv_lib_gcjawt_JAWT_GetAWT = yes; then
+{ $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 :
    AWTLIB="-lgcjawt -lgcj"
 fi
 
@@ -11263,287 +10792,93 @@ 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
-      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_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 :
 
-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
-  { { 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; }; }
+  as_fn_error "jni.h could not be found." "$LINENO" 5
 fi
 
 
-      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
+      { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ljawt  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-JAWT_GetAWT ();
+return JAWT_GetAWT ();
   ;
   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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_jawt_JAWT_GetAWT=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_jawt_JAWT_GetAWT=no
+  ac_cv_lib_jawt_JAWT_GetAWT=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_jawt_JAWT_GetAWT" >&5
-echo "${ECHO_T}$ac_cv_lib_jawt_JAWT_GetAWT" >&6
-if test $ac_cv_lib_jawt_JAWT_GetAWT = yes; then
+{ $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 :
    AWTLIB="-ljawt"
 fi
 
       if test -z "$AWTLIB"; then
          LDFLAGS="$LDFLAGS -L$JAVA_HOME/jre/bin/xawt -ljawt"
-         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
+         { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmawt  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-JAWT_GetAWT ();
+return JAWT_GetAWT ();
   ;
   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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_mawt_JAWT_GetAWT=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_mawt_JAWT_GetAWT=no
+  ac_cv_lib_mawt_JAWT_GetAWT=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_mawt_JAWT_GetAWT" >&5
-echo "${ECHO_T}$ac_cv_lib_mawt_JAWT_GetAWT" >&6
-if test $ac_cv_lib_mawt_JAWT_GetAWT = yes; then
+{ $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 :
    AWTLIB="-L$JAVA_HOME/jre/bin/xawt -ljawt -lmawt"
 fi
 
@@ -11556,24 +10891,24 @@ fi
    if test -z "$AWTLIB"; then
       AWTLIB=-ljawt
    fi
-   echo "$as_me:$LINENO: result: $AWTLIB" >&5
-echo "${ECHO_T}$AWTLIB" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWTLIB" >&5
+$as_echo "$AWTLIB" >&6; }
 
 fi
 
 if test "$SOLAR_JAVA" != ""; then
-  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
+  { $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; }
   if test -n "$enable_gcjaot" && test "$enable_gcjaot" != "no"; then
-     echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "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
-     echo "$as_me:$LINENO: result: $gcjaot" >&5
-echo "${ECHO_T}$gcjaot" >&6
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcjaot" >&5
+$as_echo "$gcjaot" >&6; }
      if test -n "$with_jdk_home"; then
         _javac_path="$with_jdk_home/bin/$gcjaot"
                 if test -x "$_javac_path"; then
@@ -11583,10 +10918,10 @@ echo "${ECHO_T}$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
-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
+{ $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
 else
   case $JAVAAOTCOMPILER in
   [\\/]* | ?:[\\/]*)
@@ -11598,36 +10933,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_JAVAAOTCOMPILER="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 JAVAAOTCOMPILER=$ac_cv_path_JAVAAOTCOMPILER
-
 if test -n "$JAVAAOTCOMPILER"; then
-  echo "$as_me:$LINENO: result: $JAVAAOTCOMPILER" >&5
-echo "${ECHO_T}$JAVAAOTCOMPILER" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAAOTCOMPILER" >&5
+$as_echo "$JAVAAOTCOMPILER" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
      fi
      if test -z "$JAVAAOTCOMPILER"; then
-        { 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;}
+        { $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;}
      fi
   else
-     echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 fi
 
@@ -11643,10 +10979,10 @@ fi
 
 # Extract the first word of "dmake", so it can be a program name with args.
 set dummy dmake; 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_DMAKE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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
 else
   case $DMAKE in
   [\\/]* | ?:[\\/]*)
@@ -11658,35 +10994,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_DMAKE="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_DMAKE" && ac_cv_path_DMAKE="no"
   ;;
 esac
 fi
 DMAKE=$ac_cv_path_DMAKE
-
 if test -n "$DMAKE"; then
-  echo "$as_me:$LINENO: result: $DMAKE" >&5
-echo "${ECHO_T}$DMAKE" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DMAKE" >&5
+$as_echo "$DMAKE" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 if test "$DMAKE" = "no"; then
     BUILD_DMAKE=YES
     echo "dmake will be built on ./bootstrap"
 else
-    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
+    { $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; }
     # 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
@@ -11695,48 +11032,48 @@ echo $ECHO_N "checking whether the found dmake is the right dmake... $ECHO_C" >&
     $DMAKE -V 2>/dev/null | grep 'dmake .* Version .*' >/dev/null
     if test $? -eq 0; then
        BUILD_DMAKE=NO
-       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
+       { $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; }
        DMAKE_VERSION=`$DMAKE -V | $AWK '$3 == "Version" {print $4}'`
        if test "`echo $DMAKE_VERSION | cut -d'.' -f1`" -gt "4"; then
-	 echo "$as_me:$LINENO: result: OK, >= 4.11" >&5
-echo "${ECHO_T}OK, >= 4.11" >&6
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK, >= 4.11" >&5
+$as_echo "OK, >= 4.11" >&6; }
        elif test "`echo $DMAKE_VERSION | cut -d'.' -f1`" = "4" && \
 	    test "`echo $DMAKE_VERSION | cut -d'.' -f2`" -ge "11"; then
-	 echo "$as_me:$LINENO: result: OK, >= 4.11" >&5
-echo "${ECHO_T}OK, >= 4.11" >&6
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK, >= 4.11" >&5
+$as_echo "OK, >= 4.11" >&6; }
        else
-	 echo "$as_me:$LINENO: result: too old. >= 4.11 is needed" >&5
-echo "${ECHO_T}too old. >= 4.11 is needed" >&6
+	 { $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 "A newer dmake will be built on ./bootstrap"
 	 BUILD_DMAKE=YES
        fi
     else
-       echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        echo "dmake will be built on ./bootstrap"
        BUILD_DMAKE=YES
     fi
 fi
 
 
-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
+{ $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; }
 if test "$_os" != "WINNT" -a \( "z$enable_epm" = "z" -o "$enable_epm" != "no" \) ; then
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "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
-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
+{ $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
 else
   case $EPM in
   [\\/]* | ?:[\\/]*)
@@ -11748,29 +11085,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_EPM="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_EPM" && ac_cv_path_EPM="no"
   ;;
 esac
 fi
 EPM=$ac_cv_path_EPM
-
 if test -n "$EPM"; then
-  echo "$as_me:$LINENO: result: $EPM" >&5
-echo "${ECHO_T}$EPM" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EPM" >&5
+$as_echo "$EPM" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
       fi
       if test "$EPM" = "no" || test "$EPM" = "internal"; then
          echo "EPM will be built."
@@ -11778,44 +11116,38 @@ fi
          BUILD_TYPE="$BUILD_TYPE EPM"
       else
          # Gentoo has some epm which is something different...
-         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
+         { $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; }
          if $EPM | grep "ESP Package Manager" >/dev/null 2>/dev/null; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
          else
-            { { 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; }; }
+            as_fn_error "no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm" "$LINENO" 5
          fi
-         echo "$as_me:$LINENO: checking epm version" >&5
-echo $ECHO_N "checking epm version... $ECHO_C" >&6
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking epm version" >&5
+$as_echo_n "checking epm version... " >&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
-           echo "$as_me:$LINENO: result: OK, >= 3.7" >&5
-echo "${ECHO_T}OK, >= 3.7" >&6
+           { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK, >= 3.7" >&5
+$as_echo "OK, >= 3.7" >&6; }
            BUILD_EPM=NO
 	        if test "$_os" = "Darwin"; then
-               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
+               { $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; }
         	      _pm=`strings $EPM | grep PackageMaker | cut -d" " -f1`
         	      if test "$_pm" = "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker"; then
-          		      { { 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; }; }
+          		      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
         	      elif test "$_pm" = "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"; then
-          		    echo "$as_me:$LINENO: result: $_pm, ok" >&5
-echo "${ECHO_T}$_pm, ok" >&6
+          		    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_pm, ok" >&5
+$as_echo "$_pm, ok" >&6; }
         	      else # we never should get here, but go safe
-			          { { 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; }; }
+			          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
 		          fi
 	       fi
 	 else
-           echo "$as_me:$LINENO: result: too old. epm >= 3.7 is required." >&5
-echo "${ECHO_T}too old. epm >= 3.7 is required." >&6
+           { $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 "EPM will be built."
            BUILD_EPM=YES
            BUILD_TYPE="$BUILD_TYPE EPM"
@@ -11824,8 +11156,8 @@ echo "${ECHO_T}too old. epm >= 3.7 is required." >&6
    fi
 
    # test which package format to use
-   echo "$as_me:$LINENO: checking which package format to use" >&5
-echo $ECHO_N "checking which package format to use... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking which package format to use" >&5
+$as_echo_n "checking which package format to use... " >&6; }
    # epm supports the following formats:
    # aix - AIX software distribution
    # bsd - FreeBSD, NetBSD, or OpenBSD software distribution
@@ -11870,9 +11202,7 @@ echo $ECHO_N "checking which package format to use... $ECHO_C" >&6
 	# we never should get here since we check the arciecture/os at the beginning,
 	# but go sure...
 	*)
-		{ { echo "$as_me:$LINENO: error: unknown system" >&5
-echo "$as_me: error: unknown system" >&2;}
-   { (exit 1); exit 1; }; }
+		as_fn_error "unknown system" "$LINENO" 5
    esac
    if test -n "$with_package_format"; then
 	for i in $with_package_format; do
@@ -11880,20 +11210,7 @@ echo "$as_me: error: unknown system" >&2;}
 			aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | portable)
 			;;
 		*)
-			{ { 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:
+			as_fn_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
@@ -11905,18 +11222,17 @@ rpm - RedHat software distribution
 setld - Tru64 (setld) software distribution
 native - \"Native\" software distribution for the platform
 portable - Portable software distribution
-			" >&2;}
-   { (exit 1); exit 1; }; }
+			" "$LINENO" 5
 			;;
 		esac
 	done
 	PKGFORMAT="$with_package_format"
    fi
-   echo "$as_me:$LINENO: result: $PKGFORMAT" >&5
-echo "${ECHO_T}$PKGFORMAT" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGFORMAT" >&5
+$as_echo "$PKGFORMAT" >&6; }
    if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null; then
-      echo "$as_me:$LINENO: checking for rpm" >&5
-echo $ECHO_N "checking for rpm... $ECHO_C" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rpm" >&5
+$as_echo_n "checking for rpm... " >&6; }
       for a in "$RPM" rpmbuild rpm; do
          $a --usage >/dev/null 2> /dev/null
          if test $? -eq 0; then
@@ -11931,22 +11247,20 @@ echo $ECHO_N "checking for rpm... $ECHO_C" >&6
          fi
        done
        if test -z "$RPM" ; then
-          { { echo "$as_me:$LINENO: error: not found" >&5
-echo "$as_me: error: not found" >&2;}
-   { (exit 1); exit 1; }; }
+          as_fn_error "not found" "$LINENO" 5
        else
 	  RPM_PATH=`which $RPM`
-          echo "$as_me:$LINENO: result: $RPM_PATH" >&5
-echo "${ECHO_T}$RPM_PATH" >&6
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RPM_PATH" >&5
+$as_echo "$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
-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
+{ $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
 else
   case $DPKG in
   [\\/]* | ?:[\\/]*)
@@ -11958,81 +11272,76 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_DPKG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_DPKG" && ac_cv_path_DPKG="no"
   ;;
 esac
 fi
 DPKG=$ac_cv_path_DPKG
-
 if test -n "$DPKG"; then
-  echo "$as_me:$LINENO: result: $DPKG" >&5
-echo "${ECHO_T}$DPKG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DPKG" >&5
+$as_echo "$DPKG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
       if test "$DPKG" = "no"; then
-         { { 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; }; }
+         as_fn_error "dpkg needed for deb creation. Install dpkg." "$LINENO" 5
       fi
    fi
    if echo "PKGFORMAT" | $EGREP osx 2>&1 >/dev/null; then
       if test "$_os" = "Darwin"; then
-         echo "$as_me:$LINENO: checking for PackageMaker availability" >&5
-echo $ECHO_N "checking for PackageMaker availability... $ECHO_C" >&6
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PackageMaker availability" >&5
+$as_echo_n "checking for PackageMaker availability... " >&6; }
          if ! test -x /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; then
-            { { 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; }; }
+            as_fn_error "not installed. Please install Apples Dev Tools" "$LINENO" 5
          else
-            echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
          fi
       else
-         { { 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; }; }
+         as_fn_error "PackageMaker needed to build OSX packages and you are not on OSX..." "$LINENO" 5
        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
-               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
+               { $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; }
                if grep "Patched for OpenOffice.org" $EPM >/dev/null 2>/dev/null; then
-                  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
                else
-                  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
                   if echo "$PKGFORMAT" | grep -q rpm; then
                       _pt="rpm"
-                      { 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;}
+                      { $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 "the rpms will need to be installed with --nodeps" >> warn
                   else
                       _pt="pkg"
                   fi
-                  { 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;}
+                  { $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 "the ${_pt}s will not be relocateable" >> warn
-                  { echo "$as_me:$LINENO: WARNING: if you want to make sure installation without --nodeps and
+                  { $as_echo "$as_me:${as_lineno-$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
-echo "$as_me: WARNING: if you want to make sure installation without --nodeps and
+$as_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;}
@@ -12043,10 +11352,10 @@ echo "$as_me: WARNING: if you want to make sure installation without --nodeps an
    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
-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
+{ $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
 else
   case $PKGMK in
   [\\/]* | ?:[\\/]*)
@@ -12058,33 +11367,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKGMK="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKGMK" && ac_cv_path_PKGMK="no"
   ;;
 esac
 fi
 PKGMK=$ac_cv_path_PKGMK
-
 if test -n "$PKGMK"; then
-  echo "$as_me:$LINENO: result: $PKGMK" >&5
-echo "${ECHO_T}$PKGMK" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGMK" >&5
+$as_echo "$PKGMK" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
       if test "$PKGMK" = "no"; then
-         { { 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; }; }
+         as_fn_error "pkgmk needed for Solaris pkg creation. Install it." "$LINENO" 5
       fi
    fi
 
@@ -12093,18 +11401,18 @@ echo "$as_me: error: pkgmk needed for Solaris pkg creation. Install it." >&2;}
 
 
 else
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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
-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
+{ $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
 else
   case $GPERF in
   [\\/]* | ?:[\\/]*)
@@ -12116,82 +11424,74 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GPERF="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 GPERF=$ac_cv_path_GPERF
-
 if test -n "$GPERF"; then
-  echo "$as_me:$LINENO: result: $GPERF" >&5
-echo "${ECHO_T}$GPERF" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPERF" >&5
+$as_echo "$GPERF" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 if test -z "$GPERF"; then
-	{ { 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; }; }
+	as_fn_error "gperf not found but needed. Install it." "$LINENO" 5
 fi
-echo "$as_me:$LINENO: checking gperf version" >&5
-echo $ECHO_N "checking gperf version... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gperf version" >&5
+$as_echo_n "checking gperf version... " >&6; }
 if test "`$GPERF --version | $EGREP ^GNU\ gperf | $AWK '{ print $3 }' | cut -d. -f1`" -ge "3"; then
-	echo "$as_me:$LINENO: result: OK" >&5
-echo "${ECHO_T}OK" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
+$as_echo "OK" >&6; }
 else
-	{ { 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; }; }
+	as_fn_error "too old, you need at least 3.0.0" "$LINENO" 5
 fi
 
-echo "$as_me:$LINENO: checking whether to build the ODK" >&5
-echo $ECHO_N "checking whether to build the ODK... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the ODK" >&5
+$as_echo_n "checking whether to build the ODK... " >&6; }
 if test "z$enable_odk" = "z" -o "$enable_odk" != "no"; then
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
    if test "$WITH_JAVA" != "no"; then
-   echo "$as_me:$LINENO: checking for external/unowinreg/unowinreg.dll" >&5
-echo $ECHO_N "checking for external/unowinreg/unowinreg.dll... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for external/unowinreg/unowinreg.dll" >&5
+$as_echo_n "checking for external/unowinreg/unowinreg.dll... " >&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
-      echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
       BUILD_UNOWINREG=NO
    else
       if test "$_os" = "WINNT"; then
-         echo "$as_me:$LINENO: result: not found, will be built" >&5
-echo "${ECHO_T}not found, will be built" >&6
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found, will be built" >&5
+$as_echo "not found, will be built" >&6; }
       else
-         { 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;}
+         { $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;}
       fi
       BUILD_UNOWINREG=YES
    fi
    if test "$_os" != "WINNT" && test "$BUILD_UNOWINREG" = "YES"; then
       if test -z "$WITH_MINGWIN" || test "$WITH_MINGWIN" = "0"; then
-         { { 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.
+         as_fn_error "for rebuilding unowinreg.dll you need the mingw32 C++ compiler.
          Specify mingw32 g++ executable name with --with-mingwin.
          Or use prebuilt one from http://tools.openoffice.org/unowinreg_prebuild/680/ and
-         put it into external/unowinreg" >&2;}
-   { (exit 1); exit 1; }; }
+         put it into external/unowinreg" "$LINENO" 5
       fi
       if echo "$WITH_MINGWIN" | $EGREP -q "/"; then
          if ! test -x "$WITH_MINGWIN"; then MINGWCXX=false; else MINGWCXX=`basename $WITH_MINGWIN`; fi
@@ -12199,10 +11499,10 @@ echo "$as_me: error: for rebuilding unowinreg.dll you need the mingw32 C++ compi
          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
-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
+{ $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
 else
   if test -n "$MINGWCXX"; then
   ac_cv_prog_MINGWCXX="$MINGWCXX" # Let the user override the test.
@@ -12212,35 +11512,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_MINGWCXX="${ac_tool_prefix}$WITH_MINGWIN"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 MINGWCXX=$ac_cv_prog_MINGWCXX
 if test -n "$MINGWCXX"; then
-  echo "$as_me:$LINENO: result: $MINGWCXX" >&5
-echo "${ECHO_T}$MINGWCXX" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MINGWCXX" >&5
+$as_echo "$MINGWCXX" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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
-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
+{ $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
 else
   if test -n "$ac_ct_MINGWCXX"; then
   ac_cv_prog_ac_ct_MINGWCXX="$ac_ct_MINGWCXX" # Let the user override the test.
@@ -12250,47 +11552,53 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_MINGWCXX="$WITH_MINGWIN"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_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
-  echo "$as_me:$LINENO: result: $ac_ct_MINGWCXX" >&5
-echo "${ECHO_T}$ac_ct_MINGWCXX" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MINGWCXX" >&5
+$as_echo "$ac_ct_MINGWCXX" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-  MINGWCXX=$ac_ct_MINGWCXX
+  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
 else
   MINGWCXX="$ac_cv_prog_MINGWCXX"
 fi
 
       fi
       if test "$MINGWCXX" = "false"; then
-         { { 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; }; }
+         as_fn_error "specified MinGW32 C++ cross-compiler not found. Install it or correct name." "$LINENO" 5
       fi
-      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
+      { $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; }
       if ! echo "`$MINGWCXX -dumpmachine`" | grep -q mingw32; then
-         { { echo "$as_me:$LINENO: error: no" >&5
-echo "$as_me: error: no" >&2;}
-   { (exit 1); exit 1; }; }
+         as_fn_error "no" "$LINENO" 5
       else
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "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
@@ -12298,10 +11606,10 @@ echo "${ECHO_T}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
-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
+{ $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
 else
   if test -n "$MINGWSTRIP"; then
   ac_cv_prog_MINGWSTRIP="$MINGWSTRIP" # Let the user override the test.
@@ -12311,35 +11619,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_MINGWSTRIP="${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/`"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 MINGWSTRIP=$ac_cv_prog_MINGWSTRIP
 if test -n "$MINGWSTRIP"; then
-  echo "$as_me:$LINENO: result: $MINGWSTRIP" >&5
-echo "${ECHO_T}$MINGWSTRIP" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MINGWSTRIP" >&5
+$as_echo "$MINGWSTRIP" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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
-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
+{ $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
 else
   if test -n "$ac_ct_MINGWSTRIP"; then
   ac_cv_prog_ac_ct_MINGWSTRIP="$ac_ct_MINGWSTRIP" # Let the user override the test.
@@ -12349,39 +11659,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_MINGWSTRIP="`echo $WITH_MINGWIN | $SED -e s/g++/strip/`"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_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
-  echo "$as_me:$LINENO: result: $ac_ct_MINGWSTRIP" >&5
-echo "${ECHO_T}$ac_ct_MINGWSTRIP" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MINGWSTRIP" >&5
+$as_echo "$ac_ct_MINGWSTRIP" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-  MINGWSTRIP=$ac_ct_MINGWSTRIP
+  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
 else
   MINGWSTRIP="$ac_cv_prog_MINGWSTRIP"
 fi
 
       fi
       if test "$MINGWSTRIP" = "false"; then
-         { { 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; }; }
+         as_fn_error "MinGW32 binutils needed. Install them." "$LINENO" 5
       fi
-      ac_ext=cc
+      ac_ext=cpp
 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'
@@ -12399,66 +11717,37 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
       # do not make sense here (and 'd make the check fail)
       save_LIBS=$LIBS
       LIBS=""
-
-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
+      { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkernel32  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
 main ()
 {
-main ();
+return 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
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_kernel32_main=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_kernel32_main=no
+  ac_cv_lib_kernel32_main=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_kernel32_main" >&5
-echo "${ECHO_T}$ac_cv_lib_kernel32_main" >&6
-if test $ac_cv_lib_kernel32_main = yes; then
+{ $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 :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBKERNEL32 1
 _ACEOF
@@ -12468,66 +11757,37 @@ _ACEOF
 fi
 ac_cv_lib_kernel32=ac_cv_lib_kernel32_main
 
-
-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
+      { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ladvapi32  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
 main ()
 {
-main ();
+return 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
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_advapi32_main=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_advapi32_main=no
+  ac_cv_lib_advapi32_main=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_advapi32_main" >&5
-echo "${ECHO_T}$ac_cv_lib_advapi32_main" >&6
-if test $ac_cv_lib_advapi32_main = yes; then
+{ $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 :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBADVAPI32 1
 _ACEOF
@@ -12537,149 +11797,11 @@ _ACEOF
 fi
 ac_cv_lib_advapi32=ac_cv_lib_advapi32_main
 
-      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
+      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 :
 
-# 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
-  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; }; }
+  as_fn_error "windows.h missing" "$LINENO" 5
 fi
 
 
@@ -12698,54 +11820,54 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
    fi
    BUILD_TYPE="$BUILD_TYPE ODK"
 else
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
    BUILD_UNOWINREG=NO
 fi
 
 
 
 
-echo "$as_me:$LINENO: checking whether to build qadevOOo" >&5
-echo $ECHO_N "checking whether to build qadevOOo... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build qadevOOo" >&5
+$as_echo_n "checking whether to build qadevOOo... " >&6; }
 if test "z$enable_qadevooo" = "z" -o "$enable_qadevooo" != "no"; then
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
    BUILD_QADEVOOO="YES"
    BUILD_TYPE="$BUILD_TYPE QADEVOOO"
 else
    BUILD_QADEVOOO="NO"
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
-if test -z "$with_system_stdlibs" -a -z "$with_system_libs"; then
+if test "$_os" = "Linux" -a -z "$with_system_stdlibs" -a -z "$with_system_libs"; then
   if test -n "$checkforstdlibproblems"; then
     if test -f /etc/rpm/macros.prelink; then
       with_system_stdlibs=yes
-      { echo "$as_me:$LINENO: WARNING: prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&5
-echo "$as_me: WARNING: prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&2;}
+      { $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 "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn
     elif test "$GCC" = "yes" -a ! -e `$CC -print-file-name=libgcc_s.so.1`; then
       with_system_stdlibs=yes
-      { echo "$as_me:$LINENO: WARNING: platform doesn't have a libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&5
-echo "$as_me: WARNING: platform doesn't have a libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&2;}
+      { $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 "platform doesn't have a libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn
     fi
   fi
 fi
 
-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
+{ $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; }
 if test -n "$with_system_stdlibs" -o -n "$with_system_libs" && \
    test "$with_system_stdlibs" != "no"; then
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
    SYSTEM_STDLIBS=YES
 else
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
    SYSTEM_STDLIBS=NO
 fi
 
@@ -12753,690 +11875,189 @@ fi
 if test "$_os" = "Darwin" && test "$with_system_zlib" != "no"; then
    with_system_zlib=yes
 fi
-echo "$as_me:$LINENO: checking which zlib to use" >&5
-echo $ECHO_N "checking which zlib to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which zlib to use" >&5
+$as_echo_n "checking which zlib to use... " >&6; }
 if test -n "$with_system_zlib" -o -n "$with_system_libs" && \
 	test "$with_system_zlib" != "no"; then
-    echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
     SYSTEM_ZLIB=YES
-    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_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 :
 
-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
-  { { 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; }; }
+  as_fn_error "zlib.h not found. install zlib" "$LINENO" 5
 fi
 
 
-    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
+    { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lz  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-deflate ();
+return deflate ();
   ;
   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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_z_deflate=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_z_deflate=no
+  ac_cv_lib_z_deflate=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_z_deflate" >&5
-echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6
-if test $ac_cv_lib_z_deflate = yes; then
+{ $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 :
    ZLIB=-lz
 else
-  { { 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; }; }
+  as_fn_error "zlib not found or functional" "$LINENO" 5
 fi
 
 else
-    echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
     SYSTEM_ZLIB=NO
     BUILD_TYPE="$BUILD_TYPE ZLIB"
 fi
 
 
-echo "$as_me:$LINENO: checking which jpeg to use" >&5
-echo $ECHO_N "checking which jpeg to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which jpeg to use" >&5
+$as_echo_n "checking which jpeg to use... " >&6; }
 if test -n "$with_system_jpeg" -o -n "$with_system_libs" && \
 	test "$with_system_jpeg" != "no"; then
-    echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
     SYSTEM_JPEG=YES
-    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
+    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 :
 
-fi
-if test $ac_cv_header_jpeglib_h = yes; then
-  :
 else
-  { { 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; }; }
+  as_fn_error "jpeg.h not found. install libjpeg" "$LINENO" 5
 fi
 
 
-    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
+    { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ljpeg  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-jpeg_resync_to_restart ();
+return jpeg_resync_to_restart ();
   ;
   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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_jpeg_jpeg_resync_to_restart=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_jpeg_jpeg_resync_to_restart=no
+  ac_cv_lib_jpeg_jpeg_resync_to_restart=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_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
+{ $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 :
    JPEG3RDLIB=-ljpeg
 else
-  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
+  { $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; }
 fi
 
 else
-    echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
     SYSTEM_JPEG=NO
     BUILD_TYPE="$BUILD_TYPE JPEG"
 fi
 
 
-echo "$as_me:$LINENO: checking which expat to use" >&5
-echo $ECHO_N "checking which expat to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which expat to use" >&5
+$as_echo_n "checking which expat to use... " >&6; }
 if test -n "$with_system_expat" -o -n "$with_system_libs" && \
 	test "$with_system_expat" != "no"; then
-    echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
     SYSTEM_EXPAT=YES
-    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_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 :
 
-  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
+  as_fn_error "expat.h not found. install expat" "$LINENO" 5
 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
-  { { 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
-
 
 
-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
+    { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lexpat  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-XML_ParserCreate ();
+return XML_ParserCreate ();
   ;
   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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_expat_XML_ParserCreate=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_expat_XML_ParserCreate=no
+  ac_cv_lib_expat_XML_ParserCreate=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_expat_XML_ParserCreate" >&5
-echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6
-if test $ac_cv_lib_expat_XML_ParserCreate = yes; then
+{ $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 :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBEXPAT 1
 _ACEOF
@@ -13444,24 +12065,24 @@ _ACEOF
   LIBS="-lexpat $LIBS"
 
 else
-  echo "$as_me:$LINENO: result: expat library not found or functional." >&5
-echo "${ECHO_T}expat library not found or functional." >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: expat library not found or functional." >&5
+$as_echo "expat library not found or functional." >&6; }
 fi
 
 else
-    echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
     SYSTEM_EXPAT=NO
     BUILD_TYPE="$BUILD_TYPE EXPAT"
 fi
 
 
-echo "$as_me:$LINENO: checking which libwpd to use" >&5
-echo $ECHO_N "checking which libwpd to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libwpd to use" >&5
+$as_echo_n "checking which libwpd to use... " >&6; }
 if test -n "$with_system_libwpd" -o -n "$with_system_libs" && \
         test "$with_system_libwpd" != "no"; then
-    echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
     SYSTEM_LIBWPD=YES
 
   succeeded=no
@@ -13469,10 +12090,10 @@ echo "${ECHO_T}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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -13484,29 +12105,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -13517,25 +12139,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for libwpd-0.8 " >&5
-echo $ECHO_N "checking for libwpd-0.8 ... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libwpd-0.8 " >&5
+$as_echo_n "checking for libwpd-0.8 ... " >&6; }
 
         if $PKG_CONFIG --exists "libwpd-0.8 " ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking LIBWPD_CFLAGS" >&5
-echo $ECHO_N "checking LIBWPD_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBWPD_CFLAGS" >&5
+$as_echo_n "checking LIBWPD_CFLAGS... " >&6; }
             LIBWPD_CFLAGS=`$PKG_CONFIG --cflags "libwpd-0.8 "`
-            echo "$as_me:$LINENO: result: $LIBWPD_CFLAGS" >&5
-echo "${ECHO_T}$LIBWPD_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBWPD_CFLAGS" >&5
+$as_echo "$LIBWPD_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking LIBWPD_LIBS" >&5
-echo $ECHO_N "checking LIBWPD_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBWPD_LIBS" >&5
+$as_echo_n "checking LIBWPD_LIBS... " >&6; }
             LIBWPD_LIBS=`$PKG_CONFIG --libs "libwpd-0.8 "`
-            echo "$as_me:$LINENO: result: $LIBWPD_LIBS" >&5
-echo "${ECHO_T}$LIBWPD_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBWPD_LIBS" >&5
+$as_echo "$LIBWPD_LIBS" >&6; }
         else
             LIBWPD_CFLAGS=""
             LIBWPD_LIBS=""
@@ -13556,14 +12178,12 @@ echo "${ECHO_T}$LIBWPD_LIBS" >&6
   if test $succeeded = yes; then
      :
   else
-     { { 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; }; }
+     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
   fi
 
 else
-    echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
     SYSTEM_LIBWPD=NO
     BUILD_TYPE="$BUILD_TYPE LIBWPD"
 fi
@@ -13572,18 +12192,18 @@ fi
 
 
 if test  "$test_freetype" = "yes"; then
-   echo "$as_me:$LINENO: checking whether freetype is available" >&5
-echo $ECHO_N "checking whether freetype is available... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether freetype is available" >&5
+$as_echo_n "checking whether freetype is available... " >&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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -13595,29 +12215,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -13628,25 +12249,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for freetype2 >= 2.0 " >&5
-echo $ECHO_N "checking for freetype2 >= 2.0 ... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype2 >= 2.0 " >&5
+$as_echo_n "checking for freetype2 >= 2.0 ... " >&6; }
 
         if $PKG_CONFIG --exists "freetype2 >= 2.0 " ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking FREETYPE_CFLAGS" >&5
-echo $ECHO_N "checking FREETYPE_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking FREETYPE_CFLAGS" >&5
+$as_echo_n "checking FREETYPE_CFLAGS... " >&6; }
             FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2 >= 2.0 "`
-            echo "$as_me:$LINENO: result: $FREETYPE_CFLAGS" >&5
-echo "${ECHO_T}$FREETYPE_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_CFLAGS" >&5
+$as_echo "$FREETYPE_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking FREETYPE_LIBS" >&5
-echo $ECHO_N "checking FREETYPE_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking FREETYPE_LIBS" >&5
+$as_echo_n "checking FREETYPE_LIBS... " >&6; }
             FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2 >= 2.0 "`
-            echo "$as_me:$LINENO: result: $FREETYPE_LIBS" >&5
-echo "${ECHO_T}$FREETYPE_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_LIBS" >&5
+$as_echo "$FREETYPE_LIBS" >&6; }
         else
             FREETYPE_CFLAGS=""
             FREETYPE_LIBS=""
@@ -13667,9 +12288,7 @@ echo "${ECHO_T}$FREETYPE_LIBS" >&6
   if test $succeeded = yes; then
      :
   else
-     { { 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; }; }
+     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
   fi
 
 fi
@@ -13682,71 +12301,43 @@ if test  "$test_freetype" = "yes"; then
     save_LIBS="$LIBS"
     CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
     LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
-    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
+    { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfreetype  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-FT_GlyphSlot_Embolden ();
+return FT_GlyphSlot_Embolden ();
   ;
   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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_freetype_FT_GlyphSlot_Embolden=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_freetype_FT_GlyphSlot_Embolden=no
+  ac_cv_lib_freetype_FT_GlyphSlot_Embolden=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_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
+{ $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 :
   USE_FT_EMBOLDEN="YES"
 else
   USE_FT_EMBOLDEN="NO"
@@ -13779,26 +12370,26 @@ if test -n "$with_system_libxml" -o -n "$with_system_libs" && \
     fi
 fi
 
-echo "$as_me:$LINENO: checking which libxslt to use" >&5
-echo $ECHO_N "checking which libxslt to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libxslt to use" >&5
+$as_echo_n "checking which libxslt to use... " >&6; }
 if test -n "$with_system_libxslt" -o -n "$with_system_libs" -o \
        "$_os" = "Darwin" && \
    test "$with_system_libxslt" != "no"; then
-   echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
    SYSTEM_LIBXSLT=YES
 
    if test "$_os" = "Darwin"; then
-   echo "$as_me:$LINENO: checking LIBXSLT_CFLAGS" >&5
-echo $ECHO_N "checking LIBXSLT_CFLAGS... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXSLT_CFLAGS" >&5
+$as_echo_n "checking LIBXSLT_CFLAGS... " >&6; }
    LIBXSLT_CFLAGS=`xslt-config --cflags`
-   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
+   { $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; }
    LIBXSLT_LIBS=`xslt-config --libs`
-   echo "$as_me:$LINENO: result: $LIBXSLT_LIBS" >&5
-echo "${ECHO_T}$LIBXSLT_LIBS" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXSLT_LIBS" >&5
+$as_echo "$LIBXSLT_LIBS" >&6; }
 
 
  else
@@ -13808,10 +12399,10 @@ echo "${ECHO_T}$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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -13823,29 +12414,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -13856,25 +12448,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for libxslt" >&5
-echo $ECHO_N "checking for libxslt... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxslt" >&5
+$as_echo_n "checking for libxslt... " >&6; }
 
         if $PKG_CONFIG --exists "libxslt" ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking LIBXSLT_CFLAGS" >&5
-echo $ECHO_N "checking LIBXSLT_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXSLT_CFLAGS" >&5
+$as_echo_n "checking LIBXSLT_CFLAGS... " >&6; }
             LIBXSLT_CFLAGS=`$PKG_CONFIG --cflags "libxslt"`
-            echo "$as_me:$LINENO: result: $LIBXSLT_CFLAGS" >&5
-echo "${ECHO_T}$LIBXSLT_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXSLT_CFLAGS" >&5
+$as_echo "$LIBXSLT_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking LIBXSLT_LIBS" >&5
-echo $ECHO_N "checking LIBXSLT_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXSLT_LIBS" >&5
+$as_echo_n "checking LIBXSLT_LIBS... " >&6; }
             LIBXSLT_LIBS=`$PKG_CONFIG --libs "libxslt"`
-            echo "$as_me:$LINENO: result: $LIBXSLT_LIBS" >&5
-echo "${ECHO_T}$LIBXSLT_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXSLT_LIBS" >&5
+$as_echo "$LIBXSLT_LIBS" >&6; }
         else
             LIBXSLT_CFLAGS=""
             LIBXSLT_LIBS=""
@@ -13895,9 +12487,7 @@ echo "${ECHO_T}$LIBXSLT_LIBS" >&6
   if test $succeeded = yes; then
      :
   else
-     { { 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; }; }
+     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
   fi
 
  fi
@@ -13905,10 +12495,10 @@ echo "$as_me: error: Library requirements (libxslt) not met; consider adjusting
 
       # Extract the first word of "xsltproc", so it can be a program name with args.
 set dummy xsltproc; 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_XSLTPROC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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
 else
   case $XSLTPROC in
   [\\/]* | ?:[\\/]*)
@@ -13920,37 +12510,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_XSLTPROC" && ac_cv_path_XSLTPROC="no"
   ;;
 esac
 fi
 XSLTPROC=$ac_cv_path_XSLTPROC
-
 if test -n "$XSLTPROC"; then
-  echo "$as_me:$LINENO: result: $XSLTPROC" >&5
-echo "${ECHO_T}$XSLTPROC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5
+$as_echo "$XSLTPROC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
    if test "$XSLTPROC" = "no"; then
-      { { echo "$as_me:$LINENO: error: xsltproc is required" >&5
-echo "$as_me: error: xsltproc is required" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "xsltproc is required" "$LINENO" 5
    fi
 else
-   echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
    SYSTEM_LIBXSLT=NO
    BUILD_TYPE="$BUILD_TYPE LIBXSLT"
 fi
@@ -13959,25 +12548,25 @@ fi
 
 
 
-echo "$as_me:$LINENO: checking which libxml to use" >&5
-echo $ECHO_N "checking which libxml to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libxml to use" >&5
+$as_echo_n "checking which libxml to use... " >&6; }
 if test -n "$with_system_libxml" -o -n "$with_system_libs" -o \
             "$_os" = "Darwin" && \
 	test "$with_system_libxml" != "no"; then
-    echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
     SYSTEM_LIBXML=YES
     if test "$_os" = "Darwin"; then
-   echo "$as_me:$LINENO: checking LIBXML_CFLAGS" >&5
-echo $ECHO_N "checking LIBXML_CFLAGS... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXML_CFLAGS" >&5
+$as_echo_n "checking LIBXML_CFLAGS... " >&6; }
    LIBXML_CFLAGS=`xml2-config --cflags`
-   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
+   { $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; }
    LIBXML_LIBS=`xml2-config --libs`
-   echo "$as_me:$LINENO: result: $LIBXML_LIBS" >&5
-echo "${ECHO_T}$LIBXML_LIBS" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML_LIBS" >&5
+$as_echo "$LIBXML_LIBS" >&6; }
 
 
  else
@@ -13987,10 +12576,10 @@ echo "${ECHO_T}$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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -14002,29 +12591,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -14035,25 +12625,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        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
+        { $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; }
 
         if $PKG_CONFIG --exists "libxml-2.0 >= 2.0" ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking LIBXML_CFLAGS" >&5
-echo $ECHO_N "checking LIBXML_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXML_CFLAGS" >&5
+$as_echo_n "checking LIBXML_CFLAGS... " >&6; }
             LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.0"`
-            echo "$as_me:$LINENO: result: $LIBXML_CFLAGS" >&5
-echo "${ECHO_T}$LIBXML_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML_CFLAGS" >&5
+$as_echo "$LIBXML_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking LIBXML_LIBS" >&5
-echo $ECHO_N "checking LIBXML_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXML_LIBS" >&5
+$as_echo_n "checking LIBXML_LIBS... " >&6; }
             LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.0"`
-            echo "$as_me:$LINENO: result: $LIBXML_LIBS" >&5
-echo "${ECHO_T}$LIBXML_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML_LIBS" >&5
+$as_echo "$LIBXML_LIBS" >&6; }
         else
             LIBXML_CFLAGS=""
             LIBXML_LIBS=""
@@ -14074,17 +12664,15 @@ echo "${ECHO_T}$LIBXML_LIBS" >&6
   if test $succeeded = yes; then
      :
   else
-     { { 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; }; }
+     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
   fi
 
  fi
 
     BUILD_TYPE="$BUILD_TYPE LIBXMLSEC"
 else
-    echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
     SYSTEM_LIBXML=NO
     BUILD_TYPE="$BUILD_TYPE LIBXML2 LIBXMLSEC"
 fi
@@ -14095,21 +12683,21 @@ fi
 if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then
    with_system_python=yes
 fi
-echo "$as_me:$LINENO: checking which python to use" >&5
-echo $ECHO_N "checking which python to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which python to use" >&5
+$as_echo_n "checking which python to use... " >&6; }
 if test -n "$with_system_python" -o -n "$with_system_libs" && \
 	test "$with_system_python" != "no"; then
    SYSTEM_PYTHON=YES
-   echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
 
 
 
 
         if test -n "$PYTHON"; then
       # If the user set $PYTHON, use it and don't search something else.
-      echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.2" >&5
-echo $ECHO_N "checking whether $PYTHON version >= 2.2... $ECHO_C" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.2" >&5
+$as_echo_n "checking whether $PYTHON version >= 2.2... " >&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.
@@ -14121,23 +12709,20 @@ sys.exit(sys.hexversion < minverhex)"
    ($PYTHON -c "$prog") >&5 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
+   (exit $ac_status); }; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { { echo "$as_me:$LINENO: error: too old" >&5
-echo "$as_me: error: too old" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "too old" "$LINENO" 5
 fi
-
       am_display_PYTHON=$PYTHON
     else
       # Otherwise, try each interpreter until we find one that satisfies
       # VERSION.
-      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
+      { $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
 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
@@ -14153,24 +12738,23 @@ 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
-echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5
-echo "${ECHO_T}$am_cv_pathless_PYTHON" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5
+$as_echo "$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
-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
+{ $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
 else
   case $PYTHON in
   [\\/]* | ?:[\\/]*)
@@ -14182,49 +12766,48 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 PYTHON=$ac_cv_path_PYTHON
-
 if test -n "$PYTHON"; then
-  echo "$as_me:$LINENO: result: $PYTHON" >&5
-echo "${ECHO_T}$PYTHON" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
+$as_echo "$PYTHON" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
       fi
       am_display_PYTHON=$am_cv_pathless_PYTHON
     fi
 
 
   if test "$PYTHON" = :; then
-      { { 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; }; }
+      as_fn_error "no suitable Python interpreter found" "$LINENO" 5
   else
 
 
-  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
+  { $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
 else
   am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`
 fi
-echo "$as_me:$LINENO: result: $am_cv_python_version" >&5
-echo "${ECHO_T}$am_cv_python_version" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+$as_echo "$am_cv_python_version" >&6; }
   PYTHON_VERSION=$am_cv_python_version
 
 
@@ -14235,30 +12818,30 @@ echo "${ECHO_T}$am_cv_python_version" >&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
+  { $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
 else
   am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`
 fi
-echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
-echo "${ECHO_T}$am_cv_python_platform" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
+$as_echo "$am_cv_python_platform" >&6; }
   PYTHON_PLATFORM=$am_cv_python_platform
 
 
 
 
-                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
+                { $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
 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
-echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
-echo "${ECHO_T}$am_cv_python_pythondir" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
+$as_echo "$am_cv_python_pythondir" >&6; }
   pythondir=$am_cv_python_pythondir
 
 
@@ -14266,16 +12849,16 @@ echo "${ECHO_T}$am_cv_python_pythondir" >&6
   pkgpythondir=\${pythondir}/$PACKAGE
 
 
-            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
+            { $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
 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
-echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
-echo "${ECHO_T}$am_cv_python_pyexecdir" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
+$as_echo "$am_cv_python_pyexecdir" >&6; }
   pyexecdir=$am_cv_python_pyexecdir
 
 
@@ -14300,149 +12883,11 @@ echo "${ECHO_T}$am_cv_python_pyexecdir" >&6
 
       save_CPPFLAGS="$CPPFLAGS"
    CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
-   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
+   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 :
 
-# 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
-  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; }; }
+  as_fn_error "Python headers not found" "$LINENO" 5
 fi
 
 
@@ -14450,8 +12895,8 @@ fi
 else
    SYSTEM_PYTHON=NO
    BUILD_TYPE="$BUILD_TYPE PYTHON"
-   echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
    # Embedded python dies without Home set
    if test "z$HOME" = "z"; then
       export HOME="";
@@ -14460,10 +12905,10 @@ echo "${ECHO_T}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
-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
+{ $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
 else
   case $BZIP2 in
   [\\/]* | ?:[\\/]*)
@@ -14475,32 +12920,31 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_BZIP2="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 BZIP2=$ac_cv_path_BZIP2
-
 if test -n "$BZIP2"; then
-  echo "$as_me:$LINENO: result: $BZIP2" >&5
-echo "${ECHO_T}$BZIP2" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BZIP2" >&5
+$as_echo "$BZIP2" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 	if test -z "$BZIP2"; then
-   		{ { 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; }; }
+   		as_fn_error "the internal Python module has a .tar.bz2. You need bzip2" "$LINENO" 5
    	fi
    fi
 fi
@@ -14510,121 +12954,27 @@ fi
 HOME=`echo $HOME | sed 's:\\\\:/:g'`
 
 
-echo "$as_me:$LINENO: checking which db to use" >&5
-echo $ECHO_N "checking which db to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which db to use" >&5
+$as_echo_n "checking which db to use... " >&6; }
 if test -n "$with_system_db" -o -n "$with_system_libs" && \
 	test "$with_system_db" != "no"; then
     SYSTEM_DB=YES
-    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.  */
+    { $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" "
 
-
-
-#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
-
-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
+"
+if test "x$ac_cv_header_db_h" = x""yes; then :
    DB_INCLUDES=/usr/include
 else
 
              CFLAGS=-I/usr/include/db4
-             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
+             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 :
    DB_INCLUDES=/usr/include/db4
 else
-   { { 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; }; }
+   as_fn_error "no. install the db4 libraries" "$LINENO" 5
 fi
 
 
@@ -14632,20 +12982,15 @@ fi
 fi
 
 
-    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; }; }
+    { $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; }
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <db.h>
@@ -14656,91 +13001,47 @@ int main(int argc, char **argv) {
 }
 
 _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: yes" >&5
-echo "${ECHO_T}yes" >&6
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&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: 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; }; }
+  as_fn_error "no. you need at least db 4.1" "$LINENO" 5
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-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
+    { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldb  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
 main ()
 {
-main ();
+return 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_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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_db_main=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_db_main=no
+  ac_cv_lib_db_main=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_db_main" >&5
-echo "${ECHO_T}$ac_cv_lib_db_main" >&6
-if test $ac_cv_lib_db_main = yes; then
+{ $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 :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBDB 1
 _ACEOF
@@ -14748,16 +13049,14 @@ _ACEOF
   LIBS="-ldb $LIBS"
 
 else
-  { { 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; }; }
+  as_fn_error "db not installed or functional" "$LINENO" 5
 fi
 ac_cv_lib_db=ac_cv_lib_db_main
 
     SCPDEFS="$SCPDEFS -DSYSTEM_DB"
 else
-    echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
     SYSTEM_DB=NO
     BUILD_TYPE="$BUILD_TYPE BERKELEYDB"
 fi
@@ -14766,58 +13065,52 @@ fi
 
 
 
-echo "$as_me:$LINENO: checking which lucene to use" >&5
-echo $ECHO_N "checking which lucene to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which lucene to use" >&5
+$as_echo_n "checking which lucene to use... " >&6; }
 if test -n "$with_system_lucene" -o -n "$with_system_libs" && \
        test "$with_system_lucene" != "no" && test "$with_system_jars" != "no"; then
-        echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
         SYSTEM_LUCENE=YES
         if test -z $LUCENE_CORE_JAR; then
-          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
+          { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 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
-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
+{ $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 :
    LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.3.jar
 else
 
-              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
+              { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 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
-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
+{ $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 :
    LUCENE_CORE_JAR=/usr/share/java/lucene.jar
 else
-   { { 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; }; }
+   as_fn_error "lucene-core.jar replacement not found" "$LINENO" 5
 
 fi
 
@@ -14826,79 +13119,71 @@ fi
 fi
 
         else
-          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
+          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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$LUCENE_CORE_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-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
-  :
+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 :
+
 else
-  { { 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; }; }
+  as_fn_error "lucene-core.jar not found." "$LINENO" 5
 fi
 
         fi
 
         if test -z $LUCENE_ANALYZERS_JAR; then
-          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
+          { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 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
-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
+{ $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 :
    LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-analyzers-2.3.jar
 else
 
-              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
+              { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 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
-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
+{ $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 :
    LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-contrib/lucene-analyzers.jar
 else
-   { { 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; }; }
+   as_fn_error "lucene-analyzers.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -14907,36 +13192,34 @@ fi
 fi
 
         else
-          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
+          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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$LUCENE_CORE_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-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
-  :
+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 :
+
 else
-   { { 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; }; }
+   as_fn_error "lucene-analyzers.jar not found." "$LINENO" 5
 fi
 
         fi
 else
-    echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
     SYSTEM_LUCENE=NO
     BUILD_TYPE="$BUILD_TYPE LUCENE"
 fi
@@ -14944,44 +13227,42 @@ fi
 
 
 
-echo "$as_me:$LINENO: checking which hsqldb to use" >&5
-echo $ECHO_N "checking which hsqldb to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which hsqldb to use" >&5
+$as_echo_n "checking which hsqldb to use... " >&6; }
 if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \
        test "$with_system_hsqldb" != "no" && test "$with_system_jars" != "no"; then
-        echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
         SYSTEM_HSQLDB=YES
         if test -z $HSQLDB_JAR; then
                HSQLDB_JAR=/usr/share/java/hsqldb.jar
         fi
-        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
+        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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$HSQLDB_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-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
-  :
+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 :
+
 else
-  { { echo "$as_me:$LINENO: error: hsqldb.jar not found." >&5
-echo "$as_me: error: hsqldb.jar not found." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "hsqldb.jar not found." "$LINENO" 5
 fi
 
-        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
+        { $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; }
         export HSQLDB_JAR
         if $PERL -e 'use Archive::Zip;
             my $file = "$ENV{'HSQLDB_JAR'}";
@@ -15004,61 +13285,57 @@ echo $ECHO_N "checking whether hsqldb is >= 1.8.0.9... $ECHO_C" >&6
 	    } else {
 	        exit 1;
             }'; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
          else
-            { { 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; }; }
+            as_fn_error "no, hsqldb >= 1.8.0.9 is needed" "$LINENO" 5
          fi
 else
-    echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
     SYSTEM_HSQLDB=NO
     BUILD_TYPE="$BUILD_TYPE HSQLDB"
 fi
 
 
 
-echo "$as_me:$LINENO: checking which beanshell to use" >&5
-echo $ECHO_N "checking which beanshell to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which beanshell to use" >&5
+$as_echo_n "checking which beanshell to use... " >&6; }
 if test -n "$with_system_beanshell" -o -n "$with_system_libs" && \
        test "$with_system_beanshell" != "no" && test "$with_system_jars" != "no"; then
-        echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
         SYSTEM_BSH=YES
         if test -z $BSH_JAR; then
                BSH_JAR=/usr/share/java/bsh.jar
         fi
-        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
+        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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$BSH_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-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
-  :
+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 :
+
 else
-  { { echo "$as_me:$LINENO: error: bsh.jar not found." >&5
-echo "$as_me: error: bsh.jar not found." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "bsh.jar not found." "$LINENO" 5
 fi
 
 else
-    echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
     SYSTEM_BSH=NO
     BUILD_TYPE="$BUILD_TYPE BSH"
 fi
@@ -15066,78 +13343,70 @@ fi
 
 
 
-echo "$as_me:$LINENO: checking which saxon to use" >&5
-echo $ECHO_N "checking which saxon to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which saxon to use" >&5
+$as_echo_n "checking which saxon to use... " >&6; }
 if test -n "$with_system_saxon" -o -n "$with_system_libs" && \
        test "$with_system_saxon" != "no" && test "$with_system_jars" != "no"; then
-        echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
         SYSTEM_SAXON=YES
         if test -z $SAXON_JAR; then
-          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
+          { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 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
-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
+{ $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 :
    SAXON_JAR=/usr/share/java/saxon9.jar
 else
 
-              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
+              { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 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
-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
+{ $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 :
    SAXON_JAR=/usr/share/java/saxon.jar
 else
-   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
+   { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 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
-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
+{ $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 :
    SAXON_JAR=/usr/share/java/saxon9.jar
 else
-   { { 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; }; }
+   as_fn_error "saxon.jar replacement not found" "$LINENO" 5
 
 fi
 
@@ -15150,65 +13419,61 @@ fi
 fi
 
         else
-          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
+          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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$SAXON_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-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
-  :
+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 :
+
 else
-  { { 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; }; }
+  as_fn_error "saxon.jar replacement not found." "$LINENO" 5
 fi
 
         fi
         if test -n "$SERIALIZER_JAR"; then
-          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
+          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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$SERIALIZER_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-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
-  :
+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 :
+
 else
-  { { echo "$as_me:$LINENO: error: serializer.jar not found." >&5
-echo "$as_me: error: serializer.jar not found." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "serializer.jar not found." "$LINENO" 5
 fi
 
 
         fi
 else
-    echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
     SYSTEM_SAXON=NO
     NEED_SAXON=TRUE
 fi
@@ -15222,20 +13487,20 @@ fi
 if test "$_os" = "Darwin" && test "$with_system_curl" != "no"; then
    with_system_curl=yes
 fi
-echo "$as_me:$LINENO: checking which curl to use" >&5
-echo $ECHO_N "checking which curl to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which curl to use" >&5
+$as_echo_n "checking which curl to use... " >&6; }
 if test -n "$with_system_curl" -o -n "$with_system_libs" && \
 	test "$with_system_curl" != "no"; then
-   echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "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
-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
+{ $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
 else
   case $CURLCONFIG in
   [\\/]* | ?:[\\/]*)
@@ -15247,52 +13512,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_CURLCONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 CURLCONFIG=$ac_cv_path_CURLCONFIG
-
 if test -n "$CURLCONFIG"; then
-  echo "$as_me:$LINENO: result: $CURLCONFIG" >&5
-echo "${ECHO_T}$CURLCONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURLCONFIG" >&5
+$as_echo "$CURLCONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
    if test -z "$CURLCONFIG"; then
-      { { 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; }; }
+      as_fn_error "install curl to run this script" "$LINENO" 5
    fi
 
    # check curl version
-   echo "$as_me:$LINENO: checking whether curl is >= 7.9.8" >&5
-echo $ECHO_N "checking whether curl is >= 7.9.8... $ECHO_C" >&6
+   { $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; }
    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
-      { { echo "$as_me:$LINENO: error: no, you need at least curl 7.9,8" >&5
-echo "$as_me: error: no, you need at least curl 7.9,8" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "no, you need at least curl 7.9,8" "$LINENO" 5
    else
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
    fi
    CURL_LIBS=`$CURLCONFIG --libs`
    CURL_CFLAGS=`$CURLCONFIG --cflags`
 else
-   echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
    SYSTEM_CURL=NO
    BUILD_TYPE="$BUILD_TYPE CURL"
 fi
@@ -15300,467 +13562,49 @@ fi
 
 
 
-echo "$as_me:$LINENO: checking which boost to use" >&5
-echo $ECHO_N "checking which boost to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which boost to use" >&5
+$as_echo_n "checking which boost to use... " >&6; }
 if test -n "$with_system_boost" -o -n "$with_system_headers" && \
 	test "$with_system_boost" != "no"; then
-   echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
    SYSTEM_BOOST=YES
-   ac_ext=cc
+   ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then
-  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_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 :
 
-  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
-  { { 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; }; }
+  as_fn_error "boost/shared_ptr.hpp not found. install boost" "$LINENO" 5
 fi
 
 
-   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_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 :
 
-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
-  ac_cpp_err=yes
+  as_fn_error "boost/spirit/include/classic_core.hpp not found. install boost >= 1.38" "$LINENO" 5
 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/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
+   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 :
 
-fi
-if test $ac_cv_header_boost_function_hpp = yes; then
-  :
 else
-  { { 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; }; }
+  as_fn_error "boost/function.hpp not found. install boost" "$LINENO" 5
 fi
 
 
 
    save_CXXFLAGS=$CXXFLAGS
    CXXFLAGS="$CXXFLAGS -fno-exceptions"
-   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
+   { $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
 /* end confdefs.h.  */
 #include <boost/function.hpp>
 
@@ -15772,44 +13616,18 @@ main ()
   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_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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_cxx_boost_no_exceptons_broken=no
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_cxx_boost_no_exceptons_broken=yes
+  ac_cv_cxx_boost_no_exceptons_broken=yes
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
    if test "$ac_cv_cxx_boost_no_exceptons_broken" = "yes"; then
-	{ { 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; }; }
+	as_fn_error "no, see https://bugzilla.redhat.com/show_bug.cgi?id=477131" "$LINENO" 5
    else
-  	echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
    fi
    CXXFLAGS=$save_CXXFLAGS
    ac_ext=c
@@ -15819,169 +13637,31 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 else
-   echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
    BUILD_TYPE="$BUILD_TYPE BOOST"
    SYSTEM_BOOST=NO
 fi
 
 
-echo "$as_me:$LINENO: checking which vigra to use" >&5
-echo $ECHO_N "checking which vigra to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which vigra to use" >&5
+$as_echo_n "checking which vigra to use... " >&6; }
 if test -n "$with_system_vigra" -o -n "$with_system_headers" && \
 	test "$with_system_vigra" != "no"; then
-   echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
    SYSTEM_VIGRA=YES
-   ac_ext=cc
+   ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   if test "${ac_cv_header_vigra_copyimage_hxx+set}" = set; then
-  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
+   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 :
 
-# 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
-  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; }; }
+  as_fn_error "vigra/copyimage.hxx not found. install vigra" "$LINENO" 5
 fi
 
 
@@ -15992,457 +13672,150 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 else
-   echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
    BUILD_TYPE="$BUILD_TYPE VIGRA"
    SYSTEM_VIGRA=NO
 fi
 
 
-echo "$as_me:$LINENO: checking which odbc headers to use" >&5
-echo $ECHO_N "checking which odbc headers to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which odbc headers to use" >&5
+$as_echo_n "checking which odbc headers to use... " >&6; }
 if test -n "$with_system_odbc_headers" -o -n "$with_system_headers" && \
 	test "$with_system_odbc_headers" != "no"; then
-   echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
    SYSTEM_ODBC_HEADERS=YES
 
-   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
+   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 :
 
-# 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
+  as_fn_error "odbc not found. install odbc" "$LINENO" 5
 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
-  { { 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
-   echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
    SYSTEM_ODBC_HEADERS=NO
    BUILD_TYPE="$BUILD_TYPE UNIXODBC"
 fi
 
 
-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
+{ $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; }
 if test "$enable_mozilla" = "no"; then
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
    WITH_MOZILLA=NO
    ENABLE_NSS_MODULE=NO
 else
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
    WITH_MOZILLA=YES
 fi
 
 
-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
+{ $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; }
 if test "$enable_mozilla" = "no"; then
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 elif test "$with_system_mozilla" = "yes"; then
-   echo "$as_me:$LINENO: result: no, not possible with system-mozilla" >&5
-echo "${ECHO_T}no, not possible with system-mozilla" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, not possible with system-mozilla" >&5
+$as_echo "no, not possible with system-mozilla" >&6; }
 else
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
 
-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
+{ $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; }
 if test "$enable_mozilla" = "no"; then
-   echo "$as_me:$LINENO: result: no, since Mozilla (NSS) disabled but needed" >&5
-echo "${ECHO_T}no, since Mozilla (NSS) disabled but needed" >&6
+   { $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; }
 else
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
 
-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
+{ $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; }
 if test -z "$enable_ldap" || test "$enable_ldap" = "yes"; then
    if test "$enable_mozilla" = "yes" || test "$with_openldap" = "yes"; then
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       WITH_LDAP=YES
    else
-      echo "$as_me:$LINENO: result: no. Either Mozilla or OpenLDAP needed" >&5
-echo "${ECHO_T}no. Either Mozilla or OpenLDAP needed" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no. Either Mozilla or OpenLDAP needed" >&5
+$as_echo "no. Either Mozilla or OpenLDAP needed" >&6; }
       WITH_LDAP=NO
    fi
 else
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
    WITH_LDAP=NO
 fi
 
 if test "$WITH_LDAP" = "YES"; then
-            echo "$as_me:$LINENO: checking which LDAP SDK to use" >&5
-echo $ECHO_N "checking which LDAP SDK to use... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking which LDAP SDK to use" >&5
+$as_echo_n "checking which LDAP SDK to use... " >&6; }
    if test -n "$with_openldap" && test "$with_openldap" != "no"; then
-  	   echo "$as_me:$LINENO: result: OpenLDAP" >&5
-echo "${ECHO_T}OpenLDAP" >&6
+  	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: OpenLDAP" >&5
+$as_echo "OpenLDAP" >&6; }
 	   WITH_OPENLDAP=YES
-
-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
+	   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 :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_LDAP_H 1
 _ACEOF
 
 else
-  { { 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; }; }
+  as_fn_error "ldap.h not found. install openldap libs" "$LINENO" 5
 fi
 
 done
 
-
-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
+	   { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lldap  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-ldap_simple_bind_s ();
+return ldap_simple_bind_s ();
   ;
   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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_ldap_ldap_simple_bind_s=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_ldap_ldap_simple_bind_s=no
+  ac_cv_lib_ldap_ldap_simple_bind_s=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_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
+{ $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 :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBLDAP 1
 _ACEOF
@@ -16450,79 +13823,48 @@ _ACEOF
   LIBS="-lldap $LIBS"
 
 else
-  { { 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; }; }
+  as_fn_error "openldap lib not found or functional" "$LINENO" 5
 fi
 
 	   # rumours say that OpenLDAP doesn't have that function. I looked and
 	   # it has it. Test for it to be sure
-
-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
+         { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lldap  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-ldap_set_option ();
+return ldap_set_option ();
   ;
   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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_ldap_ldap_set_option=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_ldap_ldap_set_option=no
+  ac_cv_lib_ldap_ldap_set_option=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_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
+{ $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 :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBLDAP 1
 _ACEOF
@@ -16530,14 +13872,12 @@ _ACEOF
   LIBS="-lldap $LIBS"
 
 else
-  { { 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; }; }
+  as_fn_error "openldap lib not found or functional" "$LINENO" 5
 fi
 
    else
-	   echo "$as_me:$LINENO: result: Netscape/Mozilla" >&5
-echo "${ECHO_T}Netscape/Mozilla" >&6
+	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: Netscape/Mozilla" >&5
+$as_echo "Netscape/Mozilla" >&6; }
 	   # TODO. Actually do a sanity check and check for
 	   # LDAP_OPT_SIZELIMIT and LDAP_X_OPT_CONNECT_TIMEOUT
 	   WITH_OPENLDAP=NO
@@ -16546,16 +13886,16 @@ fi
 
 
 
-echo "$as_me:$LINENO: checking which mozilla to use" >&5
-echo $ECHO_N "checking which mozilla to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which mozilla to use" >&5
+$as_echo_n "checking which mozilla to use... " >&6; }
 if test -n "$with_system_mozilla" && test "$with_system_mozilla" != "no"; then
-    echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
     SYSTEM_MOZILLA=YES
     ENABLE_NSS_MODULE=NO
     enable_nss_module=no
-    echo "$as_me:$LINENO: checking which Mozilla flavour to use" >&5
-echo $ECHO_N "checking which Mozilla flavour to use... $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking which Mozilla flavour to use" >&5
+$as_echo_n "checking which Mozilla flavour to use... " >&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
@@ -16570,8 +13910,8 @@ echo $ECHO_N "checking which Mozilla flavour to use... $ECHO_C" >&6
       MOZ_FLAVOUR=libxul
     fi
     tmp=`echo $MOZ_FLAVOUR | $PERL -e 'print ucfirst(<STDIN>);'`
-    echo "$as_me:$LINENO: result: $tmp" >&5
-echo "${ECHO_T}$tmp" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tmp" >&5
+$as_echo "$tmp" >&6; }
 
 
   succeeded=no
@@ -16579,10 +13919,10 @@ echo "${ECHO_T}$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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -16594,29 +13934,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -16627,25 +13968,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for nss" >&5
-echo $ECHO_N "checking for nss... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nss" >&5
+$as_echo_n "checking for nss... " >&6; }
 
         if $PKG_CONFIG --exists "nss" ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking MOZ_NSS_CFLAGS" >&5
-echo $ECHO_N "checking MOZ_NSS_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSS_CFLAGS" >&5
+$as_echo_n "checking MOZ_NSS_CFLAGS... " >&6; }
             MOZ_NSS_CFLAGS=`$PKG_CONFIG --cflags "nss"`
-            echo "$as_me:$LINENO: result: $MOZ_NSS_CFLAGS" >&5
-echo "${ECHO_T}$MOZ_NSS_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSS_CFLAGS" >&5
+$as_echo "$MOZ_NSS_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking MOZ_NSS_LIBS" >&5
-echo $ECHO_N "checking MOZ_NSS_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSS_LIBS" >&5
+$as_echo_n "checking MOZ_NSS_LIBS... " >&6; }
             MOZ_NSS_LIBS=`$PKG_CONFIG --libs "nss"`
-            echo "$as_me:$LINENO: result: $MOZ_NSS_LIBS" >&5
-echo "${ECHO_T}$MOZ_NSS_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSS_LIBS" >&5
+$as_echo "$MOZ_NSS_LIBS" >&6; }
         else
             MOZ_NSS_CFLAGS=""
             MOZ_NSS_LIBS=""
@@ -16676,10 +14017,10 @@ echo "${ECHO_T}$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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -16691,29 +14032,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -16724,25 +14066,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nss " >&5
-echo $ECHO_N "checking for $MOZ_FLAVOUR-nss ... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $MOZ_FLAVOUR-nss " >&5
+$as_echo_n "checking for $MOZ_FLAVOUR-nss ... " >&6; }
 
         if $PKG_CONFIG --exists "$MOZ_FLAVOUR-nss " ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking MOZ_NSS_CFLAGS" >&5
-echo $ECHO_N "checking MOZ_NSS_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSS_CFLAGS" >&5
+$as_echo_n "checking MOZ_NSS_CFLAGS... " >&6; }
             MOZ_NSS_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nss "`
-            echo "$as_me:$LINENO: result: $MOZ_NSS_CFLAGS" >&5
-echo "${ECHO_T}$MOZ_NSS_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSS_CFLAGS" >&5
+$as_echo "$MOZ_NSS_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking MOZ_NSS_LIBS" >&5
-echo $ECHO_N "checking MOZ_NSS_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSS_LIBS" >&5
+$as_echo_n "checking MOZ_NSS_LIBS... " >&6; }
             MOZ_NSS_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nss "`
-            echo "$as_me:$LINENO: result: $MOZ_NSS_LIBS" >&5
-echo "${ECHO_T}$MOZ_NSS_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSS_LIBS" >&5
+$as_echo "$MOZ_NSS_LIBS" >&6; }
         else
             MOZ_NSS_CFLAGS=""
             MOZ_NSS_LIBS=""
@@ -16763,9 +14105,7 @@ echo "${ECHO_T}$MOZ_NSS_LIBS" >&6
   if test $succeeded = yes; then
      :
   else
-     { { 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; }; }
+     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
   fi
 
     else
@@ -16780,10 +14120,10 @@ echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nss ) not met; consider
   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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -16795,29 +14135,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -16828,25 +14169,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for nspr " >&5
-echo $ECHO_N "checking for nspr ... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nspr " >&5
+$as_echo_n "checking for nspr ... " >&6; }
 
         if $PKG_CONFIG --exists "nspr " ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking MOZ_NSPR_CFLAGS" >&5
-echo $ECHO_N "checking MOZ_NSPR_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSPR_CFLAGS" >&5
+$as_echo_n "checking MOZ_NSPR_CFLAGS... " >&6; }
             MOZ_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr "`
-            echo "$as_me:$LINENO: result: $MOZ_NSPR_CFLAGS" >&5
-echo "${ECHO_T}$MOZ_NSPR_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSPR_CFLAGS" >&5
+$as_echo "$MOZ_NSPR_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking MOZ_NSPR_LIBS" >&5
-echo $ECHO_N "checking MOZ_NSPR_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSPR_LIBS" >&5
+$as_echo_n "checking MOZ_NSPR_LIBS... " >&6; }
             MOZ_NSPR_LIBS=`$PKG_CONFIG --libs "nspr "`
-            echo "$as_me:$LINENO: result: $MOZ_NSPR_LIBS" >&5
-echo "${ECHO_T}$MOZ_NSPR_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSPR_LIBS" >&5
+$as_echo "$MOZ_NSPR_LIBS" >&6; }
         else
             MOZ_NSPR_CFLAGS=""
             MOZ_NSPR_LIBS=""
@@ -16867,9 +14208,7 @@ echo "${ECHO_T}$MOZ_NSPR_LIBS" >&6
   if test $succeeded = yes; then
      :
   else
-     { { 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; }; }
+     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
   fi
 
       NSPR_LIB="-L`$PKG_CONFIG --variable=libdir nspr`"
@@ -16881,10 +14220,10 @@ echo "$as_me: error: Library requirements (nspr ) not met; consider adjusting th
   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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -16896,29 +14235,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -16929,25 +14269,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nspr " >&5
-echo $ECHO_N "checking for $MOZ_FLAVOUR-nspr ... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $MOZ_FLAVOUR-nspr " >&5
+$as_echo_n "checking for $MOZ_FLAVOUR-nspr ... " >&6; }
 
         if $PKG_CONFIG --exists "$MOZ_FLAVOUR-nspr " ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking MOZ_NSPR_CFLAGS" >&5
-echo $ECHO_N "checking MOZ_NSPR_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSPR_CFLAGS" >&5
+$as_echo_n "checking MOZ_NSPR_CFLAGS... " >&6; }
             MOZ_NSPR_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nspr "`
-            echo "$as_me:$LINENO: result: $MOZ_NSPR_CFLAGS" >&5
-echo "${ECHO_T}$MOZ_NSPR_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSPR_CFLAGS" >&5
+$as_echo "$MOZ_NSPR_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking MOZ_NSPR_LIBS" >&5
-echo $ECHO_N "checking MOZ_NSPR_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSPR_LIBS" >&5
+$as_echo_n "checking MOZ_NSPR_LIBS... " >&6; }
             MOZ_NSPR_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nspr "`
-            echo "$as_me:$LINENO: result: $MOZ_NSPR_LIBS" >&5
-echo "${ECHO_T}$MOZ_NSPR_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSPR_LIBS" >&5
+$as_echo "$MOZ_NSPR_LIBS" >&6; }
         else
             MOZ_NSPR_CFLAGS=""
             MOZ_NSPR_LIBS=""
@@ -16968,9 +14308,7 @@ echo "${ECHO_T}$MOZ_NSPR_LIBS" >&6
   if test $succeeded = yes; then
      :
   else
-     { { 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; }; }
+     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
   fi
 
     fi
@@ -16982,10 +14320,10 @@ echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nspr ) not met; consider
   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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -16997,29 +14335,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -17030,25 +14369,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-xpcom" >&5
-echo $ECHO_N "checking for $MOZ_FLAVOUR-xpcom... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $MOZ_FLAVOUR-xpcom" >&5
+$as_echo_n "checking for $MOZ_FLAVOUR-xpcom... " >&6; }
 
         if $PKG_CONFIG --exists "$MOZ_FLAVOUR-xpcom" ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5
-echo $ECHO_N "checking MOZILLAXPCOM_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZILLAXPCOM_CFLAGS" >&5
+$as_echo_n "checking MOZILLAXPCOM_CFLAGS... " >&6; }
             MOZILLAXPCOM_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-xpcom"`
-            echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5
-echo "${ECHO_T}$MOZILLAXPCOM_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZILLAXPCOM_CFLAGS" >&5
+$as_echo "$MOZILLAXPCOM_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5
-echo $ECHO_N "checking MOZILLAXPCOM_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZILLAXPCOM_LIBS" >&5
+$as_echo_n "checking MOZILLAXPCOM_LIBS... " >&6; }
             MOZILLAXPCOM_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-xpcom"`
-            echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5
-echo "${ECHO_T}$MOZILLAXPCOM_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZILLAXPCOM_LIBS" >&5
+$as_echo "$MOZILLAXPCOM_LIBS" >&6; }
         else
             MOZILLAXPCOM_CFLAGS=""
             MOZILLAXPCOM_LIBS=""
@@ -17083,10 +14422,10 @@ echo "${ECHO_T}$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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -17098,29 +14437,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -17131,25 +14471,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for libxul " >&5
-echo $ECHO_N "checking for libxul ... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxul " >&5
+$as_echo_n "checking for libxul ... " >&6; }
 
         if $PKG_CONFIG --exists "libxul " ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5
-echo $ECHO_N "checking MOZILLAXPCOM_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZILLAXPCOM_CFLAGS" >&5
+$as_echo_n "checking MOZILLAXPCOM_CFLAGS... " >&6; }
             MOZILLAXPCOM_CFLAGS=`$PKG_CONFIG --cflags "libxul "`
-            echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5
-echo "${ECHO_T}$MOZILLAXPCOM_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZILLAXPCOM_CFLAGS" >&5
+$as_echo "$MOZILLAXPCOM_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5
-echo $ECHO_N "checking MOZILLAXPCOM_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZILLAXPCOM_LIBS" >&5
+$as_echo_n "checking MOZILLAXPCOM_LIBS... " >&6; }
             MOZILLAXPCOM_LIBS=`$PKG_CONFIG --libs "libxul "`
-            echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5
-echo "${ECHO_T}$MOZILLAXPCOM_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZILLAXPCOM_LIBS" >&5
+$as_echo "$MOZILLAXPCOM_LIBS" >&6; }
         else
             MOZILLAXPCOM_CFLAGS=""
             MOZILLAXPCOM_LIBS=""
@@ -17170,9 +14510,7 @@ echo "${ECHO_T}$MOZILLAXPCOM_LIBS" >&6
   if test $succeeded = yes; then
      :
   else
-     { { 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; }; }
+     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
   fi
 
       MOZ_INC=`$PKG_CONFIG --variable=includedir libxul`
@@ -17190,72 +14528,43 @@ echo "$as_me: error: Library requirements (libxul ) not met; consider adjusting
     save_LIBS="$LIBS"
     CPPFLAGS="$CPPFLAGS $MOZ_NSS_CFLAGS"
     LDFLAGS="$LDFLAGS $MOZ_NSS_LIBS"
-
-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
+    { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnss3  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-PK11_GetCertFromPrivateKey ();
+return PK11_GetCertFromPrivateKey ();
   ;
   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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_nss3_PK11_GetCertFromPrivateKey=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_nss3_PK11_GetCertFromPrivateKey=no
+  ac_cv_lib_nss3_PK11_GetCertFromPrivateKey=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_nss3_PK11_GetCertFromPrivateKey" >&5
-echo "${ECHO_T}$ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&6
-if test $ac_cv_lib_nss3_PK11_GetCertFromPrivateKey = yes; then
+{ $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 :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBNSS3 1
 _ACEOF
@@ -17263,13 +14572,9 @@ _ACEOF
   LIBS="-lnss3 $LIBS"
 
 else
-  { { 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.
+  as_fn_error "PK11_GetCertFromPrivateKey missing but needed.
 See https://bugzilla.mozilla.org/show_bug.cgi?id=262274.
-Fixed since nss 3.9.3 (contained by e.g. mozilla >= 1.7.5)" >&2;}
-   { (exit 1); exit 1; }; }
+Fixed since nss 3.9.3 (contained by e.g. mozilla >= 1.7.5)" "$LINENO" 5
 fi
 
     LDFLAGS="$save_LDFLAGS"
@@ -17278,20 +14583,16 @@ fi
 
     MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS
     if test "$WITH_LDAP" != "NO" && test "$WITH_OPENLDAP" != "YES"; then
-      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
+      { $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; }
       if test -d "$MOZ_INC/ldap"; then
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
          MOZ_LDAP_CFLAGS="-I$MOZ_INC"
       else
-        { { 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.
+        as_fn_error "no.
 Could not find LDAP header include files in $MOZ_INC/ldap.
-Please recompile $tmp with --enable-ldap or use --with-openldap." >&2;}
-   { (exit 1); exit 1; }; }
+Please recompile $tmp with --enable-ldap or use --with-openldap." "$LINENO" 5
       fi
     fi
 
@@ -17302,48 +14603,48 @@ Please recompile $tmp with --enable-ldap or use --with-openldap." >&2;}
     fi
 
 elif test "$enable_mozilla" = "no"; then
-    echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
     WITH_MOZILLA=NO
     ENABLE_NSS_MODULE=NO
     enable_nss_module=no
 else
-    echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
     SYSTEM_MOZILLA=NO
     BUILD_TYPE="$BUILD_TYPE MOZ"
 if test -z "$with_mozilla_version"; then
    MOZILLA_VERSION=
 else
-   echo "$as_me:$LINENO: checking which mozilla version to build" >&5
-echo $ECHO_N "checking which mozilla version to build... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking which mozilla version to build" >&5
+$as_echo_n "checking which mozilla version to build... " >&6; }
    MOZILLA_VERSION=$with_mozilla_version
    enable_build_mozilla=1
-   echo "$as_me:$LINENO: result: $MOZILLA_VERSION" >&5
-echo "${ECHO_T}$MOZILLA_VERSION" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZILLA_VERSION" >&5
+$as_echo "$MOZILLA_VERSION" >&6; }
 fi
 
 
 
-echo "$as_me:$LINENO: checking for toolkit mozilla should use" >&5
-echo $ECHO_N "checking for toolkit mozilla should use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for toolkit mozilla should use" >&5
+$as_echo_n "checking for toolkit mozilla should use... " >&6; }
 if test -z "$with_mozilla_toolkit"; then
    if test "$_os" != "WINNT" ; then
       if test "$_os" = "Darwin" ; then
          MOZILLA_TOOLKIT=mac
-         echo "$as_me:$LINENO: result: mac" >&5
-echo "${ECHO_T}mac" >&6
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: mac" >&5
+$as_echo "mac" >&6; }
       else
          MOZILLA_TOOLKIT=gtk2
-         echo "$as_me:$LINENO: result: gtk2" >&5
-echo "${ECHO_T}gtk2" >&6
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: gtk2" >&5
+$as_echo "gtk2" >&6; }
       fi
    fi
 else
    MOZILLA_TOOLKIT=$with_mozilla_toolkit
    enable_build_mozilla=1
-   echo "$as_me:$LINENO: result: $MOZILLA_TOOLKIT" >&5
-echo "${ECHO_T}$MOZILLA_TOOLKIT" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZILLA_TOOLKIT" >&5
+$as_echo "$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
@@ -17360,63 +14661,55 @@ else
       enable_build_mozilla=
 fi
 
-echo "$as_me:$LINENO: checking whether to build Mozilla/SeaMonkey" >&5
-echo $ECHO_N "checking whether to build Mozilla/SeaMonkey... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Mozilla/SeaMonkey" >&5
+$as_echo_n "checking whether to build Mozilla/SeaMonkey... " >&6; }
 if test -n "$enable_build_mozilla"; then
    BUILD_MOZAB="TRUE"
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
    BUILD_MOZAB=""
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-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
+{ $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; }
 if test "$enable_nss_module" != "no"; then
    ENABLE_NSS_MODULE="YES"
    BUILD_TYPE="$BUILD_TYPE NSS"
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
    if test "$_os" = "WINNT"; then
-      echo "$as_me:$LINENO: checking for Mozilla build tooling" >&5
-echo $ECHO_N "checking for Mozilla build tooling... $ECHO_C" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mozilla build tooling" >&5
+$as_echo_n "checking for Mozilla build tooling... " >&6; }
       if test -z "$MOZILLABUILD" ; then
-{ { echo "$as_me:$LINENO: error: Mozilla build tooling not found.
+as_fn_error "Mozilla build tooling not found.
 Use the --with-mozilla-build option after installling the tools obtained
-from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32" >&5
-echo "$as_me: error: Mozilla build tooling not found.
-Use the --with-mozilla-build option after installling the tools obtained
-from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32" >&2;}
-   { (exit 1); exit 1; }; }
+from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32" "$LINENO" 5
       else
          if test \( "$WITH_MINGWIN" = "yes" \) ; then
             if test ! -d "$MOZILLABUILD" ; then
-{ { echo "$as_me:$LINENO: error: Mozilla build tooling incomplete!" >&5
-echo "$as_me: error: Mozilla build tooling incomplete!" >&2;}
-   { (exit 1); exit 1; }; }
+as_fn_error "Mozilla build tooling incomplete!" "$LINENO" 5
             else
-               echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
             fi
          else
             if test ! -d "$MOZILLABUILD/moztools" \
                -o ! -d "$MOZILLABUILD/msys" ; then
-{ { echo "$as_me:$LINENO: error: Mozilla build tooling incomplete!" >&5
-echo "$as_me: error: Mozilla build tooling incomplete!" >&2;}
-   { (exit 1); exit 1; }; }
+as_fn_error "Mozilla build tooling incomplete!" "$LINENO" 5
             else
-               echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
             fi
          fi
       fi
    fi
 else
    ENABLE_NSS_MODULE="NO"
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 if test "$BUILD_MOZAB" = "TRUE"; then
@@ -17424,13 +14717,11 @@ 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
-        { { 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; }; }
+        as_fn_error "Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only." "$LINENO" 5
       fi
     else
-      { 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;}
+      { $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 "Building SeaMonkey with mingwin is not tested, and likely to break." >> warn
     fi
   fi
@@ -17440,56 +14731,48 @@ echo "$as_me: WARNING: Building SeaMonkey with mingwin is not tested, and likely
    fi
    MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source"
    for e in gz bz2; do
-      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
+      { $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; }
       if test ! -e "moz/download/$MOZILLA_SOURCE_VERSION.tar.$e" && test "$HAVE_MOZILLA_TARBALL" != "y"; then
-         echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
          HAVE_MOZILLA_TARBALL=n
       else
-         echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
          HAVE_MOZILLA_TARBALL=y
       fi
    done
    if test "$HAVE_MOZILLA_TARBALL" != "y"; then
-         { { echo "$as_me:$LINENO: error: Mozilla/SeaMonkey source archive not found.
+         as_fn_error "Mozilla/SeaMonkey source archive not found.
 Please copy $MOZILLA_SOURCE_VERSION.tar.bz2 or $MOZILLA_SOURCE_VERSION.tar.gz to moz/download/.
 The archives can be found here:
-ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/" >&5
-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; }; }
+ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/" "$LINENO" 5
    fi
    if test "$_os" = "WINNT"; then
-      echo "$as_me:$LINENO: checking for moztools binaries" >&5
-echo $ECHO_N "checking for moztools binaries... $ECHO_C" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for moztools binaries" >&5
+$as_echo_n "checking for moztools binaries... " >&6; }
       if test ! -e "moz/download/vc8-moztools.zip" ; then
-        { { 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; }; }
+        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
       else
-         echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
       fi
    elif test "$_os" = "Darwin"; then
       if test "$MOZILLA_TOOLKIT" = "gtk2"; then
-         { echo "$as_me:$LINENO: checking whether mozilla can be built..." >&5
-echo "$as_me: checking whether mozilla can be built..." >&6;}
+         { $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;}
 
   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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -17501,29 +14784,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -17534,25 +14818,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        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
+        { $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; }
 
         if $PKG_CONFIG --exists "gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8" ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking MOZGTK2_CFLAGS" >&5
-echo $ECHO_N "checking MOZGTK2_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZGTK2_CFLAGS" >&5
+$as_echo_n "checking MOZGTK2_CFLAGS... " >&6; }
             MOZGTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8"`
-            echo "$as_me:$LINENO: result: $MOZGTK2_CFLAGS" >&5
-echo "${ECHO_T}$MOZGTK2_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZGTK2_CFLAGS" >&5
+$as_echo "$MOZGTK2_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking MOZGTK2_LIBS" >&5
-echo $ECHO_N "checking MOZGTK2_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZGTK2_LIBS" >&5
+$as_echo_n "checking MOZGTK2_LIBS... " >&6; }
             MOZGTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8"`
-            echo "$as_me:$LINENO: result: $MOZGTK2_LIBS" >&5
-echo "${ECHO_T}$MOZGTK2_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZGTK2_LIBS" >&5
+$as_echo "$MOZGTK2_LIBS" >&6; }
         else
             MOZGTK2_CFLAGS=""
             MOZGTK2_LIBS=""
@@ -17571,12 +14855,10 @@ echo "${ECHO_T}$MOZGTK2_LIBS" >&6
   fi
 
   if test $succeeded = yes; then
-     { echo "$as_me:$LINENO: OK - can build mozilla" >&5
-echo "$as_me: OK - can build mozilla" >&6;}
+     { $as_echo "$as_me:${as_lineno-$LINENO}: OK - can build mozilla" >&5
+$as_echo "$as_me: OK - can build mozilla" >&6;}
   else
-     { { 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; }; }
+     as_fn_error "Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages" "$LINENO" 5
   fi
 
       else
@@ -17586,10 +14868,10 @@ echo "$as_me: error: Prerequisites to build mozilla not met. Either use the prec
   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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -17601,29 +14883,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -17634,25 +14917,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        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
+        { $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; }
 
         if $PKG_CONFIG --exists "libIDL-2.0 >= 0.6.3" ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
-echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_CFLAGS" >&5
+$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; }
             MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.6.3"`
-            echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
-echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_CFLAGS" >&5
+$as_echo "$MOZLIBREQ_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
-echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_LIBS" >&5
+$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; }
             MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libIDL-2.0 >= 0.6.3"`
-            echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
-echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_LIBS" >&5
+$as_echo "$MOZLIBREQ_LIBS" >&6; }
         else
             MOZLIBREQ_CFLAGS=""
             MOZLIBREQ_LIBS=""
@@ -17677,9 +14960,7 @@ echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6
   fi
 
          if test -z "$MOZIDL"; then
-            { { 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; }; }
+            as_fn_error "libIDL 0.6.3 or newer is needed to build mozilla with mac toolkit." "$LINENO" 5
          fi
       fi
    else
@@ -17691,10 +14972,10 @@ echo "$as_me: error: libIDL 0.6.3 or newer is needed to build mozilla with mac t
   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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -17706,29 +14987,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -17739,25 +15021,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for gtk+-2.0" >&5
-echo $ECHO_N "checking for gtk+-2.0... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0" >&5
+$as_echo_n "checking for gtk+-2.0... " >&6; }
 
         if $PKG_CONFIG --exists "gtk+-2.0" ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
-echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_CFLAGS" >&5
+$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; }
             MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0"`
-            echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
-echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_CFLAGS" >&5
+$as_echo "$MOZLIBREQ_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
-echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_LIBS" >&5
+$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; }
             MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "gtk+-2.0"`
-            echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
-echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_LIBS" >&5
+$as_echo "$MOZLIBREQ_LIBS" >&6; }
         else
             MOZLIBREQ_CFLAGS=""
             MOZLIBREQ_LIBS=""
@@ -17782,9 +15064,7 @@ echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6
   fi
 
          if test -z "$MOZGTK"; then
-            { { 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; }; }
+            as_fn_error "GTK2 is needed to build mozilla." "$LINENO" 5
          fi
 
   succeeded=no
@@ -17792,10 +15072,10 @@ echo "$as_me: error: GTK2 is needed to build mozilla." >&2;}
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -17807,29 +15087,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -17840,25 +15121,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        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
+        { $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; }
 
         if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
-echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_CFLAGS" >&5
+$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; }
             MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"`
-            echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
-echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_CFLAGS" >&5
+$as_echo "$MOZLIBREQ_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
-echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_LIBS" >&5
+$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; }
             MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libIDL-2.0 >= 0.8.0"`
-            echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
-echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_LIBS" >&5
+$as_echo "$MOZLIBREQ_LIBS" >&6; }
         else
             MOZLIBREQ_CFLAGS=""
             MOZLIBREQ_LIBS=""
@@ -17883,9 +15164,7 @@ echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6
   fi
 
          if test -z "$MOZIDL"; then
-            { { 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; }; }
+            as_fn_error "libIDL >= 0.8.0 is needed when using GTK2 to build mozilla." "$LINENO" 5
          fi
       else
 
@@ -17894,10 +15173,10 @@ echo "$as_me: error: libIDL >= 0.8.0 is needed when using GTK2 to build mozilla.
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -17909,29 +15188,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -17942,25 +15222,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for gtk+ >= 1.2.3" >&5
-echo $ECHO_N "checking for gtk+ >= 1.2.3... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+ >= 1.2.3" >&5
+$as_echo_n "checking for gtk+ >= 1.2.3... " >&6; }
 
         if $PKG_CONFIG --exists "gtk+ >= 1.2.3" ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
-echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_CFLAGS" >&5
+$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; }
             MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "gtk+ >= 1.2.3"`
-            echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
-echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_CFLAGS" >&5
+$as_echo "$MOZLIBREQ_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
-echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_LIBS" >&5
+$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; }
             MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "gtk+ >= 1.2.3"`
-            echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
-echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_LIBS" >&5
+$as_echo "$MOZLIBREQ_LIBS" >&6; }
         else
             MOZLIBREQ_CFLAGS=""
             MOZLIBREQ_LIBS=""
@@ -17985,9 +15265,7 @@ echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6
   fi
 
          if test -z "$MOZGTK"; then
-            { { 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; }; }
+            as_fn_error "gtk 1.2 is needed when not using GTK2 to build mozilla." "$LINENO" 5
          fi
 
   succeeded=no
@@ -17995,10 +15273,10 @@ echo "$as_me: error: gtk 1.2 is needed when not using GTK2 to build mozilla." >&
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -18010,29 +15288,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -18043,25 +15322,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        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
+        { $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; }
 
         if $PKG_CONFIG --exists "libidl >= 0.6.3 libidl <= 0.6.8" ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
-echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_CFLAGS" >&5
+$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; }
             MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libidl >= 0.6.3 libidl <= 0.6.8"`
-            echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
-echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_CFLAGS" >&5
+$as_echo "$MOZLIBREQ_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
-echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_LIBS" >&5
+$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; }
             MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libidl >= 0.6.3 libidl <= 0.6.8"`
-            echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
-echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_LIBS" >&5
+$as_echo "$MOZLIBREQ_LIBS" >&6; }
         else
             MOZLIBREQ_CFLAGS=""
             MOZLIBREQ_LIBS=""
@@ -18086,9 +15365,7 @@ echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6
   fi
 
          if test -z "$MOZIDL"; then
-            { { 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; }; }
+            as_fn_error "libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." "$LINENO" 5
          fi
       fi
    fi
@@ -18108,225 +15385,61 @@ fi
 
 
 
-echo "$as_me:$LINENO: checking which sane header to use" >&5
-echo $ECHO_N "checking which sane header to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which sane header to use" >&5
+$as_echo_n "checking which sane header to use... " >&6; }
 if test -n "$with_system_sane_header" -o -n "$with_system_headers" && \
 	test "$with_system_sane_header" != "no"; then
-   echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
    SYSTEM_SANE_HEADER=YES
-   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_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 :
 
-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
+  as_fn_error "sane not found. install sane" "$LINENO" 5
 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
-  { { 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
-   echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
    SYSTEM_SANE_HEADER=NO
    BUILD_TYPE="$BUILD_TYPE SANE"
 fi
 
 
-echo "$as_me:$LINENO: checking which icu to use" >&5
-echo $ECHO_N "checking which icu to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which icu to use" >&5
+$as_echo_n "checking which icu to use... " >&6; }
 if test -n "$with_system_icu" -o -n "$with_system_libs" && \
 	test "$with_system_icu" != "no"; then
-   echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
    SYSTEM_ICU=YES
-   ac_ext=cc
+   ac_ext=cpp
 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 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
+   { $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
 /* end confdefs.h.  */
 unicode/rbbi.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
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked." >&5
+$as_echo "checked." >&6; }
 else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  echo "$as_me:$LINENO: result: checked." >&5
-echo "${ECHO_T}checked." >&6
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  { { echo "$as_me:$LINENO: error: icu headers not found." >&5
-echo "$as_me: error: icu headers not found." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "icu headers not found." "$LINENO" 5
 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
-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
+{ $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
 else
   case $SYSTEM_GENBRK in
   [\\/]* | ?:[\\/]*)
@@ -18339,39 +15452,38 @@ for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_SYSTEM_GENBRK="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 SYSTEM_GENBRK=$ac_cv_path_SYSTEM_GENBRK
-
 if test -n "$SYSTEM_GENBRK"; then
-  echo "$as_me:$LINENO: result: $SYSTEM_GENBRK" >&5
-echo "${ECHO_T}$SYSTEM_GENBRK" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSTEM_GENBRK" >&5
+$as_echo "$SYSTEM_GENBRK" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
    if test -z "$SYSTEM_GENBRK"; then
-      { { 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; }; }
+      as_fn_error "\\"genbrk\\" not found in \$PATH, install the icu development tool \\"genbrk\"\" "$LINENO" 5
    fi
    # Extract the first word of "genccode", so it can be a program name with args.
 set dummy genccode; 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_SYSTEM_GENCCODE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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
 else
   case $SYSTEM_GENCCODE in
   [\\/]* | ?:[\\/]*)
@@ -18384,39 +15496,38 @@ for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_SYSTEM_GENCCODE="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 SYSTEM_GENCCODE=$ac_cv_path_SYSTEM_GENCCODE
-
 if test -n "$SYSTEM_GENCCODE"; then
-  echo "$as_me:$LINENO: result: $SYSTEM_GENCCODE" >&5
-echo "${ECHO_T}$SYSTEM_GENCCODE" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSTEM_GENCCODE" >&5
+$as_echo "$SYSTEM_GENCCODE" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
    if test -z "$SYSTEM_GENCCODE"; then
-      { { 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; }; }
+      as_fn_error "\\"genccode\\" not found in \$PATH, install the icu development tool \\"genccode\"\" "$LINENO" 5
    fi
    # Extract the first word of "gencmn", so it can be a program name with args.
 set dummy gencmn; 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_SYSTEM_GENCMN+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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
 else
   case $SYSTEM_GENCMN in
   [\\/]* | ?:[\\/]*)
@@ -18429,47 +15540,41 @@ for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_SYSTEM_GENCMN="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 SYSTEM_GENCMN=$ac_cv_path_SYSTEM_GENCMN
-
 if test -n "$SYSTEM_GENCMN"; then
-  echo "$as_me:$LINENO: result: $SYSTEM_GENCMN" >&5
-echo "${ECHO_T}$SYSTEM_GENCMN" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSTEM_GENCMN" >&5
+$as_echo "$SYSTEM_GENCMN" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
    if test -z "$SYSTEM_GENCMN"; then
-      { { 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; }; }
+      as_fn_error "\\"gencmn\\" not found in \$PATH, install the icu development tool \\"gencmn\"\" "$LINENO" 5
    fi
-   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
+   { $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
 /* end confdefs.h.  */
 
 #include <unicode/uversion.h>
@@ -18482,31 +15587,16 @@ int main(int argc, char **argv) {
 }
 
 _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
+if ac_fn_cxx_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
+$as_echo "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, only >= 4.0 supported currently" >&5
-echo "$as_me: error: not suitable, only >= 4.0 supported currently" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "not suitable, only >= 4.0 supported currently" "$LINENO" 5
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
+
       ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -18514,8 +15604,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 else
-    echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
     SYSTEM_ICU=NO
     BUILD_TYPE="$BUILD_TYPE ICU"
 fi
@@ -18525,18 +15615,18 @@ fi
 
 
 
-echo "$as_me:$LINENO: checking whether to enable graphite support" >&5
-echo $ECHO_N "checking whether to enable graphite support... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable graphite support" >&5
+$as_echo_n "checking whether to enable graphite support... " >&6; }
 if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" == "z" -o "$enable_graphite" != "no" ; then
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     ENABLE_GRAPHITE="TRUE"
-    echo "$as_me:$LINENO: checking which graphite to use" >&5
-echo $ECHO_N "checking which graphite to use... $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking which graphite to use" >&5
+$as_echo_n "checking which graphite to use... " >&6; }
     if test -n "$with_system_graphite" -o -n "$with_system_libs" && \
         test "$with_system_graphite" != "no"; then
-        echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
         SYSTEM_GRAPHITE=YES
 
   succeeded=no
@@ -18544,10 +15634,10 @@ echo "${ECHO_T}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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -18559,29 +15649,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -18592,25 +15683,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for silgraphite " >&5
-echo $ECHO_N "checking for silgraphite ... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for silgraphite " >&5
+$as_echo_n "checking for silgraphite ... " >&6; }
 
         if $PKG_CONFIG --exists "silgraphite " ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking GRAPHITE_CFLAGS" >&5
-echo $ECHO_N "checking GRAPHITE_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GRAPHITE_CFLAGS" >&5
+$as_echo_n "checking GRAPHITE_CFLAGS... " >&6; }
             GRAPHITE_CFLAGS=`$PKG_CONFIG --cflags "silgraphite "`
-            echo "$as_me:$LINENO: result: $GRAPHITE_CFLAGS" >&5
-echo "${ECHO_T}$GRAPHITE_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GRAPHITE_CFLAGS" >&5
+$as_echo "$GRAPHITE_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking GRAPHITE_LIBS" >&5
-echo $ECHO_N "checking GRAPHITE_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GRAPHITE_LIBS" >&5
+$as_echo_n "checking GRAPHITE_LIBS... " >&6; }
             GRAPHITE_LIBS=`$PKG_CONFIG --libs "silgraphite "`
-            echo "$as_me:$LINENO: result: $GRAPHITE_LIBS" >&5
-echo "${ECHO_T}$GRAPHITE_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GRAPHITE_LIBS" >&5
+$as_echo "$GRAPHITE_LIBS" >&6; }
         else
             GRAPHITE_CFLAGS=""
             GRAPHITE_LIBS=""
@@ -18631,30 +15722,18 @@ echo "${ECHO_T}$GRAPHITE_LIBS" >&6
   if test $succeeded = yes; then
      :
   else
-     { { 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; }; }
+     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
   fi
 
-	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 graphite you need to use --without-stlport" >&5
-echo "$as_me: error: to use system graphite you need to use --without-stlport" >&2;}
-   { (exit 1); exit 1; }; }
-	else
-		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
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
         SYSTEM_GRAPHITE=NO
         BUILD_TYPE="$BUILD_TYPE GRAPHITE"
     fi
 else
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -18664,15 +15743,13 @@ fi
 
 if test  "$_os" = "Darwin"; then
    if test "x$with_x" = "xyes"; then
-      { { 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; }; }
+      as_fn_error "X11 build is no longer supported on MacOSX, please use the native aqua build" "$LINENO" 5
    else
-      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
+      { $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; }
       if test -d "/System/Library/Frameworks/AppKit.framework/"; then
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
          x_includes="no_x_includes"
          x_libraries="no_x_libraries"
                   enable_gtk=no
@@ -18680,9 +15757,7 @@ echo "${ECHO_T}yes" >&6
          ENABLE_CUPS=""
 
       else
-         { { echo "$as_me:$LINENO: error: No AppKit.framewrok found" >&5
-echo "$as_me: error: No AppKit.framewrok found" >&2;}
-   { (exit 1); exit 1; }; }
+         as_fn_error "No AppKit.framewrok found" "$LINENO" 5
       fi
    fi
 fi
@@ -18694,44 +15769,47 @@ elif test "$_os" = "OS2" ; then
    echo "Do Nothing for _os = OS2. Don't check for X11."
       :
 elif test "$_os" != "WINNT" ; then
-   echo "$as_me:$LINENO: checking for X" >&5
-echo $ECHO_N "checking for X... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
+$as_echo_n "checking for X... " >&6; }
 
 
-# Check whether --with-x or --without-x was given.
-if test "${with_x+set}" = set; then
-  withval="$with_x"
+# Check whether --with-x was given.
+if test "${with_x+set}" = set; then :
+  withval=$with_x;
+fi
 
-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
-  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
+  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
 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 -fr conftest.dir
+rm -f -r 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'
-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
+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
     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
+    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
     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    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
+    for ac_extension in a so sl dylib la dll; do
+      if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
+	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
 	ac_im_usrlibdir=$ac_im_libdir; break
       fi
     done
@@ -18739,37 +15817,41 @@ _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) ;;
+	/usr/include) ac_x_includes= ;;
 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
     esac
     case $ac_im_usrlibdir in
-	/usr/lib | /lib) ;;
+	/usr/lib | /usr/lib64 | /lib | /lib64) ;;
 	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
     esac
   fi
   cd ..
-  rm -fr conftest.dir
+  rm -f -r 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
@@ -18789,42 +15871,18 @@ ac_x_header_dirs='
 /usr/openwin/share/include'
 
 if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for Intrinsic.h.
+  # Guess where to find include files, by looking for Xlib.h.
   # First, try using that file with no special directory specified.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.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
+if ac_fn_c_try_cpp "$LINENO"; 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/Intrinsic.h"; then
+  if test -r "$ac_dir/X11/Xlib.h"; then
     ac_x_includes=$ac_dir
     break
   fi
@@ -18838,102 +15896,76 @@ 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="-lXt $LIBS"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  LIBS="-lX11 $LIBS"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
 int
 main ()
 {
-XtMalloc (0)
+XrmInitialize ()
   ;
   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
+if ac_fn_c_try_link "$LINENO"; then :
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
 ac_x_libraries=
 else
-  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`
+  LIBS=$ac_save_LIBS
+for ac_dir in `$as_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; do
-    if test -r $ac_dir/libXt.$ac_extension; then
+  for ac_extension in a so sl dylib la dll; do
+    if test -r "$ac_dir/libX11.$ac_extension"; then
       ac_x_libraries=$ac_dir
       break 2
     fi
   done
 done
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi # $ac_x_libraries = no
 
-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
+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
 fi
-
-  fi
+;; #(
+    *) have_x=yes;;
+  esac
   eval "$ac_cv_have_x"
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:$LINENO: result: $have_x" >&5
-echo "${ECHO_T}$have_x" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5
+$as_echo "$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"
-  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+  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; }
 fi
 
    if test "$no_x" = yes; then
   # Not all programs may use this symbol, but it does not hurt to define it.
 
-cat >>confdefs.h <<\_ACEOF
-#define X_DISPLAY_MISSING 1
-_ACEOF
+$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
 
   X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
 else
@@ -18946,16 +15978,12 @@ else
     X_LIBS="$X_LIBS -L$x_libraries"
     # For Solaris; some versions of Sun CC require a space after -R and
     # others require no space.  Words are not sufficient . . . .
-    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
+    { $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
 /* end confdefs.h.  */
 
 int
@@ -18966,48 +15994,13 @@ 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_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
+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"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_R_nospace=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-      if test $ac_R_nospace = yes; then
-	echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-	X_LIBS="$X_LIBS -R$x_libraries"
-      else
-	LIBS="$ac_xsave_LIBS -R $x_libraries"
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  LIBS="$ac_xsave_LIBS -R $x_libraries"
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -19018,48 +16011,21 @@ 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_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
+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"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_R_space=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
+$as_echo "neither works" >&6; }
 fi
-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
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+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
   fi
 
   # Check for system-dependent libraries X programs must link with.
@@ -19073,196 +16039,112 @@ echo "${ECHO_T}neither works" >&6
     # 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 >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-XOpenDisplay ();
+return XOpenDisplay ();
   ;
   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
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_link "$LINENO"; then :
 
-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
+  { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-dnet_ntoa ();
+return dnet_ntoa ();
   ;
   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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dnet_dnet_ntoa=no
+  ac_cv_lib_dnet_dnet_ntoa=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_dnet_dnet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
-if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+{ $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 :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      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
+      { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-dnet_ntoa ();
+return dnet_ntoa ();
   ;
   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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dnet_stub_dnet_ntoa=no
+  ac_cv_lib_dnet_stub_dnet_ntoa=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_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
+{ $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 :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
 fi
 
     fi
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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,
@@ -19273,232 +16155,90 @@ rm -f 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.
-    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
+    ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
 
-/* 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
-      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
+      { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-gethostbyname ();
+return 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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_nsl_gethostbyname=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_nsl_gethostbyname=no
+  ac_cv_lib_nsl_gethostbyname=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_nsl_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
-if test $ac_cv_lib_nsl_gethostbyname = yes; then
+{ $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 :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
-	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
+	{ $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-gethostbyname ();
+return 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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bsd_gethostbyname=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_bsd_gethostbyname=no
+  ac_cv_lib_bsd_gethostbyname=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_bsd_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
-if test $ac_cv_lib_bsd_gethostbyname = yes; then
+{ $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 :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
 fi
 
@@ -19512,489 +16252,147 @@ 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.
-    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
+    ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
+if test "x$ac_cv_func_connect" = x""yes; then :
 
-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
-      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
+      { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-connect ();
+return 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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_connect=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket_connect=no
+  ac_cv_lib_socket_connect=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_socket_connect" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
-if test $ac_cv_lib_socket_connect = yes; then
+{ $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 :
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
 fi
 
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    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.  */
+    ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
+if test "x$ac_cv_func_remove" = x""yes; then :
 
-#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
-      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
+      { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-remove ();
+return 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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_posix_remove=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_posix_remove=no
+  ac_cv_lib_posix_remove=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_posix_remove" >&5
-echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
-if test $ac_cv_lib_posix_remove = yes; then
+{ $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 :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
 fi
 
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    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_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
+if test "x$ac_cv_func_shmat" = x""yes; then :
 
-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
-      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
+      { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-shmat ();
+return 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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_ipc_shmat=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_ipc_shmat=no
+  ac_cv_lib_ipc_shmat=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_ipc_shmat" >&5
-echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
-if test $ac_cv_lib_ipc_shmat = yes; then
+{ $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 :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
 fi
 
@@ -20010,71 +16408,43 @@ 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
-  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
+  { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-IceConnectionNumber ();
+return IceConnectionNumber ();
   ;
   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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_ICE_IceConnectionNumber=no
+  ac_cv_lib_ICE_IceConnectionNumber=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_ICE_IceConnectionNumber" >&5
-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
-if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+{ $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 :
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
 fi
 
@@ -20091,154 +16461,92 @@ fi
      x_libraries="default_x_libraries"
    fi
       if test -z "$x_libraries"; then
-      { { echo "$as_me:$LINENO: error: No X libraries found" >&5
-echo "$as_me: error: No X libraries found" >&2;}
-   { (exit 1); exit 1; }; } # Exit
+      as_fn_error "No X libraries found" "$LINENO" 5 # Exit
    fi
    if test -z "$x_includes"; then
-      { { echo "$as_me:$LINENO: error: No X includes found" >&5
-echo "$as_me: error: No X includes found" >&2;}
-   { (exit 1); exit 1; }; } # Exit
+      as_fn_error "No X includes found" "$LINENO" 5 # Exit
    fi
    CFLAGS=$X_CFLAGS
    LDFLAGS="$X_LDFLAGS $X_LIBS"
-   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
+   { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-XOpenDisplay ();
+return XOpenDisplay ();
   ;
   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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_X11_XOpenDisplay=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_X11_XOpenDisplay=no
+  ac_cv_lib_X11_XOpenDisplay=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_X11_XOpenDisplay" >&5
-echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
-if test $ac_cv_lib_X11_XOpenDisplay = yes; then
+{ $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 :
   x_libs="-lX11 $X_EXTRA_LIBS"
 else
-  { { 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; }; }
+  as_fn_error "X Development libraries not found" "$LINENO" 5
 fi
 
-      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
+      { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXau  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-XauDisposeAuth ();
+return XauDisposeAuth ();
   ;
   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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_Xau_XauDisposeAuth=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_Xau_XauDisposeAuth=no
+  ac_cv_lib_Xau_XauDisposeAuth=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_Xau_XauDisposeAuth" >&5
-echo "${ECHO_T}$ac_cv_lib_Xau_XauDisposeAuth" >&6
-if test $ac_cv_lib_Xau_XauDisposeAuth = yes; then
+{ $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 :
   XAU_LIBS="-lXau"
 fi
 
@@ -20270,205 +16578,76 @@ fi
 
 
 if test "$_os" != "WINNT" -a "$_os" != "OS2" -a "$_os" != "Darwin"; then
-            echo "$as_me:$LINENO: checking whether to use Xaw" >&5
-echo $ECHO_N "checking whether to use Xaw... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use Xaw" >&5
+$as_echo_n "checking whether to use Xaw... " >&6; }
    if test "$enable_Xaw" = "no"; then
        DISABLE_XAW=TRUE
-       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
+       { $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 :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_X11_COMPOSITE_H 1
 _ACEOF
 
 else
-  { { 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; }; }
+  as_fn_error "Xt include headers not found" "$LINENO" 5
 fi
 
 done
 
    else
-       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
+       { $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 :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_X11_XAW_LABEL_H 1
 _ACEOF
 
 else
-  { { 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; }; }
+  as_fn_error "Xaw include headers not found" "$LINENO" 5
 fi
 
 done
 
-
-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
+       { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXaw  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
 main ()
 {
-main ();
+return 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_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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_Xaw_main=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_Xaw_main=no
+  ac_cv_lib_Xaw_main=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_Xaw_main" >&5
-echo "${ECHO_T}$ac_cv_lib_Xaw_main" >&6
-if test $ac_cv_lib_Xaw_main = yes; then
+{ $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 :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBXAW 1
 _ACEOF
@@ -20476,9 +16655,7 @@ _ACEOF
   LIBS="-lXaw $LIBS"
 
 else
-  { { 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; }; }
+  as_fn_error "Xaw library not found or functional" "$LINENO" 5
 fi
 
    fi
@@ -20488,166 +16665,23 @@ fi
 
 
 if test "$ENABLE_FONTCONFIG" = "TRUE" ; 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_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 :
 
-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
-  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: 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
-  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; }; }
+  as_fn_error "fontconfig/fontconfig.h could not be found. libfontconfig1-dev or fontconfig???-devel missing?" "$LINENO" 5
 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; }; }
+    { $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; }
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <fontconfig/fontconfig.h>
@@ -20658,271 +16692,89 @@ int main(int argc, char **argv) {
 }
 
 _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: yes" >&5
-echo "${ECHO_T}yes" >&6
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&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: no, fontconfig >= 2.2.0 needed" >&5
-echo "$as_me: error: no, fontconfig >= 2.2.0 needed" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "no, fontconfig >= 2.2.0 needed" "$LINENO" 5
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
+
 fi
 
-echo "$as_me:$LINENO: checking whether to link to Xrender" >&5
-echo $ECHO_N "checking whether to link to Xrender... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to link to Xrender" >&5
+$as_echo_n "checking whether to link to Xrender... " >&6; }
 if test -n "$enable_xrender_link" -a "$enable_xrender_link" != "no"; then
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
    XRENDER_LINK=YES
    with_system_xrender_headers=yes
 else
-   echo "$as_me:$LINENO: result: no, dynamically open it" >&5
-echo "${ECHO_T}no, dynamically open it" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, dynamically open it" >&5
+$as_echo "no, dynamically open it" >&6; }
    XRENDER_LINK=NO
 fi
-echo "$as_me:$LINENO: checking which Xrender headers to use" >&5
-echo $ECHO_N "checking which Xrender headers to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which Xrender headers to use" >&5
+$as_echo_n "checking which Xrender headers to use... " >&6; }
 if test -n "$with_system_xrender_headers" -o -n "$with_system_headers" && \
 	test "$with_system_xrender_headers" != "no"; then
-   echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
    SYSTEM_XRENDER_HEADERS=YES
-   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
+   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 :
 
-fi
-if test $ac_cv_header_X11_extensions_Xrender_h = yes; then
-  :
 else
-  { { 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; }; }
+  as_fn_error "Xrender not found. install X" "$LINENO" 5
 fi
 
 
 else
-   echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
    SYSTEM_XRENDER_HEADERS=NO
    BUILD_TYPE="$BUILD_TYPE X11_EXTENSIONS"
 fi
 if test "$XRENDER_LINK" = "YES"; then
-
-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
+   { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXrender  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-XRenderQueryVersion ();
+return XRenderQueryVersion ();
   ;
   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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_Xrender_XRenderQueryVersion=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_Xrender_XRenderQueryVersion=no
+  ac_cv_lib_Xrender_XRenderQueryVersion=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_Xrender_XRenderQueryVersion" >&5
-echo "${ECHO_T}$ac_cv_lib_Xrender_XRenderQueryVersion" >&6
-if test $ac_cv_lib_Xrender_XRenderQueryVersion = yes; then
+{ $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 :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBXRENDER 1
 _ACEOF
@@ -20930,22 +16782,20 @@ _ACEOF
   LIBS="-lXrender $LIBS"
 
 else
-  { { 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; }; }
+  as_fn_error "libXrender not found or functional" "$LINENO" 5
 fi
 
 fi
 
 
 
-echo "$as_me:$LINENO: checking whether to enable RandR support" >&5
-echo $ECHO_N "checking whether to enable RandR support... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable RandR support" >&5
+$as_echo_n "checking whether to enable RandR support... " >&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"
-	  echo "$as_me:$LINENO: result: resorting to dlopen libXrandr at runtime" >&5
-echo "${ECHO_T}resorting to dlopen libXrandr at runtime" >&6
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: resorting to dlopen libXrandr at runtime" >&5
+$as_echo "resorting to dlopen libXrandr at runtime" >&6; }
    else
 	  XRANDR_DLOPEN="FALSE"
 
@@ -20954,10 +16804,10 @@ echo "${ECHO_T}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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -20969,29 +16819,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -21002,25 +16853,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for xrandr >= 1.2" >&5
-echo $ECHO_N "checking for xrandr >= 1.2... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xrandr >= 1.2" >&5
+$as_echo_n "checking for xrandr >= 1.2... " >&6; }
 
         if $PKG_CONFIG --exists "xrandr >= 1.2" ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking XRANDR_CFLAGS" >&5
-echo $ECHO_N "checking XRANDR_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking XRANDR_CFLAGS" >&5
+$as_echo_n "checking XRANDR_CFLAGS... " >&6; }
             XRANDR_CFLAGS=`$PKG_CONFIG --cflags "xrandr >= 1.2"`
-            echo "$as_me:$LINENO: result: $XRANDR_CFLAGS" >&5
-echo "${ECHO_T}$XRANDR_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XRANDR_CFLAGS" >&5
+$as_echo "$XRANDR_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking XRANDR_LIBS" >&5
-echo $ECHO_N "checking XRANDR_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking XRANDR_LIBS" >&5
+$as_echo_n "checking XRANDR_LIBS... " >&6; }
             XRANDR_LIBS=`$PKG_CONFIG --libs "xrandr >= 1.2"`
-            echo "$as_me:$LINENO: result: $XRANDR_LIBS" >&5
-echo "${ECHO_T}$XRANDR_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XRANDR_LIBS" >&5
+$as_echo "$XRANDR_LIBS" >&6; }
         else
             XRANDR_CFLAGS=""
             XRANDR_LIBS=""
@@ -21045,219 +16896,52 @@ echo "${ECHO_T}$XRANDR_LIBS" >&6
   fi
 
       if test "$ENABLE_RANDR" != "TRUE"; 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_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 :
 
-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
-  { { 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; }; }
+  as_fn_error "X11/extensions/Xrandr.h could not be found. X11 dev missing?" "$LINENO" 5
 fi
 
 
          XRANDR_CFLAGS=" "
-
-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
+         { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXrandr  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-XRRQueryExtension ();
+return XRRQueryExtension ();
   ;
   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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_Xrandr_XRRQueryExtension=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_Xrandr_XRRQueryExtension=no
+  ac_cv_lib_Xrandr_XRRQueryExtension=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_Xrandr_XRRQueryExtension" >&5
-echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRQueryExtension" >&6
-if test $ac_cv_lib_Xrandr_XRRQueryExtension = yes; then
+{ $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 :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBXRANDR 1
 _ACEOF
@@ -21265,53 +16949,51 @@ _ACEOF
   LIBS="-lXrandr $LIBS"
 
 else
-   { { 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; }; }
+   as_fn_error "libXrandr not found or functional" "$LINENO" 5
 fi
 
          XRANDR_LIBS="-lXrandr "
          ENABLE_RANDR="TRUE"
-	     echo "$as_me:$LINENO: result: enabling RandR support" >&5
-echo "${ECHO_T}enabling RandR support" >&6
+	     { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling RandR support" >&5
+$as_echo "enabling RandR support" >&6; }
       fi
    fi
 else
    ENABLE_RANDR=""
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 
 
 
-echo "$as_me:$LINENO: checking whether to use neon" >&5
-echo $ECHO_N "checking whether to use neon... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use neon" >&5
+$as_echo_n "checking whether to use neon... " >&6; }
 if test "$enable_neon" = "no"; then
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     DISABLE_NEON=TRUE
 
 else
-    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
+    { $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; }
 if test -n "$with_system_neon" -o -n "$with_system_libs" && \
 	test "$with_system_neon" != "no"; then
-        echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -21323,29 +17005,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -21356,25 +17039,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for neon >= 0.24.0" >&5
-echo $ECHO_N "checking for neon >= 0.24.0... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for neon >= 0.24.0" >&5
+$as_echo_n "checking for neon >= 0.24.0... " >&6; }
 
         if $PKG_CONFIG --exists "neon >= 0.24.0" ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking NEON_CFLAGS" >&5
-echo $ECHO_N "checking NEON_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking NEON_CFLAGS" >&5
+$as_echo_n "checking NEON_CFLAGS... " >&6; }
             NEON_CFLAGS=`$PKG_CONFIG --cflags "neon >= 0.24.0"`
-            echo "$as_me:$LINENO: result: $NEON_CFLAGS" >&5
-echo "${ECHO_T}$NEON_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NEON_CFLAGS" >&5
+$as_echo "$NEON_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking NEON_LIBS" >&5
-echo $ECHO_N "checking NEON_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking NEON_LIBS" >&5
+$as_echo_n "checking NEON_LIBS... " >&6; }
             NEON_LIBS=`$PKG_CONFIG --libs "neon >= 0.24.0"`
-            echo "$as_me:$LINENO: result: $NEON_LIBS" >&5
-echo "${ECHO_T}$NEON_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NEON_LIBS" >&5
+$as_echo "$NEON_LIBS" >&6; }
         else
             NEON_CFLAGS=""
             NEON_LIBS=""
@@ -21395,17 +17078,15 @@ echo "${ECHO_T}$NEON_LIBS" >&6
   if test $succeeded = yes; then
      :
   else
-     { { 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; }; }
+     as_fn_error "you need neon >= 0.24.x for system-neon" "$LINENO" 5
   fi
 
         NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
         NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
         SYSTEM_NEON=YES
 else
-    echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
     SYSTEM_NEON=NO
     NEON_LIBS=-lneon
     NEON_CFLAGS=
@@ -21420,12 +17101,12 @@ fi
 if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then
    with_system_openssl=yes
 fi
-echo "$as_me:$LINENO: checking which libssl to use" >&5
-echo $ECHO_N "checking which libssl to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libssl to use" >&5
+$as_echo_n "checking which libssl to use... " >&6; }
 if test -n "$with_system_openssl" -o -n "$with_system_libs" && \
         test "$with_system_openssl" != "no"; then
-    echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "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
@@ -21438,10 +17119,10 @@ echo "${ECHO_T}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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -21453,29 +17134,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -21486,25 +17168,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for openssl " >&5
-echo $ECHO_N "checking for openssl ... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl " >&5
+$as_echo_n "checking for openssl ... " >&6; }
 
         if $PKG_CONFIG --exists "openssl " ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking OPENSSL_CFLAGS" >&5
-echo $ECHO_N "checking OPENSSL_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking OPENSSL_CFLAGS" >&5
+$as_echo_n "checking OPENSSL_CFLAGS... " >&6; }
             OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl "`
-            echo "$as_me:$LINENO: result: $OPENSSL_CFLAGS" >&5
-echo "${ECHO_T}$OPENSSL_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENSSL_CFLAGS" >&5
+$as_echo "$OPENSSL_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking OPENSSL_LIBS" >&5
-echo $ECHO_N "checking OPENSSL_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking OPENSSL_LIBS" >&5
+$as_echo_n "checking OPENSSL_LIBS... " >&6; }
             OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl "`
-            echo "$as_me:$LINENO: result: $OPENSSL_LIBS" >&5
-echo "${ECHO_T}$OPENSSL_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENSSL_LIBS" >&5
+$as_echo "$OPENSSL_LIBS" >&6; }
         else
             OPENSSL_CFLAGS=""
             OPENSSL_LIBS=""
@@ -21525,16 +17207,14 @@ echo "${ECHO_T}$OPENSSL_LIBS" >&6
   if test $succeeded = yes; then
      :
   else
-     { { 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; }; }
+     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
   fi
 
     fi
     SYSTEM_OPENSSL=YES
 else
-    echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
     SYSTEM_OPENSSL=NO
     BUILD_TYPE="$BUILD_TYPE OPENSSL"
 fi
@@ -21542,33 +17222,33 @@ fi
 
 
 
-echo "$as_me:$LINENO: checking whether to enable agg" >&5
-echo $ECHO_N "checking whether to enable agg... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable agg" >&5
+$as_echo_n "checking whether to enable agg... " >&6; }
 if test "$with_agg" = "no"; then
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 else
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   ENABLE_AGG=YES
 
 
-        echo "$as_me:$LINENO: checking which AGG to use" >&5
-echo $ECHO_N "checking which AGG to use... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking which AGG to use" >&5
+$as_echo_n "checking which AGG to use... " >&6; }
   if test -n "$with_system_agg" -o -n "$with_system_libs" && \
      test "$with_system_agg" != "no"; then
-         echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -21580,29 +17260,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -21613,25 +17294,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for libagg >= 2.3" >&5
-echo $ECHO_N "checking for libagg >= 2.3... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libagg >= 2.3" >&5
+$as_echo_n "checking for libagg >= 2.3... " >&6; }
 
         if $PKG_CONFIG --exists "libagg >= 2.3" ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking AGG_CFLAGS" >&5
-echo $ECHO_N "checking AGG_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking AGG_CFLAGS" >&5
+$as_echo_n "checking AGG_CFLAGS... " >&6; }
             AGG_CFLAGS=`$PKG_CONFIG --cflags "libagg >= 2.3"`
-            echo "$as_me:$LINENO: result: $AGG_CFLAGS" >&5
-echo "${ECHO_T}$AGG_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AGG_CFLAGS" >&5
+$as_echo "$AGG_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking AGG_LIBS" >&5
-echo $ECHO_N "checking AGG_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking AGG_LIBS" >&5
+$as_echo_n "checking AGG_LIBS... " >&6; }
             AGG_LIBS=`$PKG_CONFIG --libs "libagg >= 2.3"`
-            echo "$as_me:$LINENO: result: $AGG_LIBS" >&5
-echo "${ECHO_T}$AGG_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AGG_LIBS" >&5
+$as_echo "$AGG_LIBS" >&6; }
         else
             AGG_CFLAGS=""
             AGG_LIBS=""
@@ -21652,13 +17333,11 @@ echo "${ECHO_T}$AGG_LIBS" >&6
   if test $succeeded = yes; then
      :
   else
-     { { 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; }; }
+     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
   fi
 
-         echo "$as_me:$LINENO: checking agg version" >&5
-echo $ECHO_N "checking agg version... $ECHO_C" >&6
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking agg version" >&5
+$as_echo_n "checking agg version... " >&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
@@ -21670,23 +17349,21 @@ echo $ECHO_N "checking agg version... $ECHO_C" >&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
-               echo "$as_me:$LINENO: result: 2.4" >&5
-echo "${ECHO_T}2.4" >&6
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.4" >&5
+$as_echo "2.4" >&6; }
                AGG_VERSION=2400
             else
-               echo "$as_me:$LINENO: result: 2.3" >&5
-echo "${ECHO_T}2.3" >&6
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.3" >&5
+$as_echo "2.3" >&6; }
                AGG_VERSION=2300
             fi
             SYSTEM_AGG=YES
 	 else
-	    { { 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; }; }
+	    as_fn_error "only agg 2.3 and 2.4 are supported" "$LINENO" 5
 	 fi
   else
-         echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
          SYSTEM_AGG=NO
          AGG_VERSION=2300
          BUILD_TYPE="$BUILD_TYPE AGG"
@@ -21695,12 +17372,12 @@ echo "${ECHO_T}internal" >&6
 
 fi
 
-echo "$as_me:$LINENO: checking which redland library to use" >&5
-echo $ECHO_N "checking which redland library to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which redland library to use" >&5
+$as_echo_n "checking which redland library to use... " >&6; }
 if test -n "$with_system_redland" && \
 	test "$with_system_redland" != "no"; then
-	echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
 	SYSTEM_REDLAND=YES
 
   succeeded=no
@@ -21708,10 +17385,10 @@ echo "${ECHO_T}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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -21723,29 +17400,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -21756,25 +17434,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for redland" >&5
-echo $ECHO_N "checking for redland... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for redland" >&5
+$as_echo_n "checking for redland... " >&6; }
 
         if $PKG_CONFIG --exists "redland" ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking REDLAND_CFLAGS" >&5
-echo $ECHO_N "checking REDLAND_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking REDLAND_CFLAGS" >&5
+$as_echo_n "checking REDLAND_CFLAGS... " >&6; }
             REDLAND_CFLAGS=`$PKG_CONFIG --cflags "redland"`
-            echo "$as_me:$LINENO: result: $REDLAND_CFLAGS" >&5
-echo "${ECHO_T}$REDLAND_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $REDLAND_CFLAGS" >&5
+$as_echo "$REDLAND_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking REDLAND_LIBS" >&5
-echo $ECHO_N "checking REDLAND_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking REDLAND_LIBS" >&5
+$as_echo_n "checking REDLAND_LIBS... " >&6; }
             REDLAND_LIBS=`$PKG_CONFIG --libs "redland"`
-            echo "$as_me:$LINENO: result: $REDLAND_LIBS" >&5
-echo "${ECHO_T}$REDLAND_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $REDLAND_LIBS" >&5
+$as_echo "$REDLAND_LIBS" >&6; }
         else
             REDLAND_CFLAGS=""
             REDLAND_LIBS=""
@@ -21795,28 +17473,26 @@ echo "${ECHO_T}$REDLAND_LIBS" >&6
   if test $succeeded = yes; then
      :
   else
-     { { 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; }; }
+     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
   fi
 
 else
-	echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
 	BUILD_TYPE="$BUILD_TYPE REDLAND"
 	SYSTEM_REDLAND=NO
 fi
 
 
 
-echo "$as_me:$LINENO: checking which libhunspell to use" >&5
-echo $ECHO_N "checking which libhunspell to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libhunspell to use" >&5
+$as_echo_n "checking which libhunspell to use... " >&6; }
 if test -n "$with_system_hunspell" -o -n "$with_system_libs" && \
 	test "$with_system_hunspell" != "no"; then
-    echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
     SYSTEM_HUNSPELL=YES
-    ac_ext=cc
+    ac_ext=cpp
 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'
@@ -21828,10 +17504,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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -21843,29 +17519,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -21876,25 +17553,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for hunspell" >&5
-echo $ECHO_N "checking for hunspell... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hunspell" >&5
+$as_echo_n "checking for hunspell... " >&6; }
 
         if $PKG_CONFIG --exists "hunspell" ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking HUNSPELL_CFLAGS" >&5
-echo $ECHO_N "checking HUNSPELL_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking HUNSPELL_CFLAGS" >&5
+$as_echo_n "checking HUNSPELL_CFLAGS... " >&6; }
             HUNSPELL_CFLAGS=`$PKG_CONFIG --cflags "hunspell"`
-            echo "$as_me:$LINENO: result: $HUNSPELL_CFLAGS" >&5
-echo "${ECHO_T}$HUNSPELL_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HUNSPELL_CFLAGS" >&5
+$as_echo "$HUNSPELL_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking HUNSPELL_LIBS" >&5
-echo $ECHO_N "checking HUNSPELL_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking HUNSPELL_LIBS" >&5
+$as_echo_n "checking HUNSPELL_LIBS... " >&6; }
             HUNSPELL_LIBS=`$PKG_CONFIG --libs "hunspell"`
-            echo "$as_me:$LINENO: result: $HUNSPELL_LIBS" >&5
-echo "${ECHO_T}$HUNSPELL_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HUNSPELL_LIBS" >&5
+$as_echo "$HUNSPELL_LIBS" >&6; }
         else
             HUNSPELL_CFLAGS=""
             HUNSPELL_LIBS=""
@@ -21919,290 +17596,16 @@ echo "${ECHO_T}$HUNSPELL_LIBS" >&6
   fi
 
     if test "$HUNSPELL_PC" != "TRUE"; 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_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
+      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_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
+      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 :
    HUNSPELL_CFLAGS=-I/usr/include/hunspell
 else
-  { { echo "$as_me:$LINENO: error: hunspell headers not found." >&5
-echo "$as_me: error: hunspell headers not found." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "hunspell headers not found." "$LINENO" 5
 fi
 
 
@@ -22210,66 +17613,37 @@ fi
 fi
 
 
-
-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
+      { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lhunspell  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
 main ()
 {
-main ();
+return 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
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_hunspell_main=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_hunspell_main=no
+  ac_cv_lib_hunspell_main=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_hunspell_main" >&5
-echo "${ECHO_T}$ac_cv_lib_hunspell_main" >&6
-if test $ac_cv_lib_hunspell_main = yes; then
+{ $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 :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBHUNSPELL 1
 _ACEOF
@@ -22277,9 +17651,7 @@ _ACEOF
   LIBS="-lhunspell $LIBS"
 
 else
-   { { echo "$as_me:$LINENO: error: hunspell library not found." >&5
-echo "$as_me: error: hunspell library not found." >&2;}
-   { (exit 1); exit 1; }; }
+   as_fn_error "hunspell library not found." "$LINENO" 5
 fi
 
       HUNSPELL_LIBS=-lhunspell
@@ -22291,8 +17663,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 else
-    echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
     SYSTEM_HUNSPELL=NO
     BUILD_TYPE="$BUILD_TYPE HUNSPELL"
 fi
@@ -22300,710 +17672,213 @@ fi
 
 
 
-echo "$as_me:$LINENO: checking which altlinuxhyph to use" >&5
-echo $ECHO_N "checking which altlinuxhyph to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which altlinuxhyph to use" >&5
+$as_echo_n "checking which altlinuxhyph to use... " >&6; }
 if test -n "$with_system_altlinuxhyph" -o -n "$with_system_libs" && \
 	test "$with_system_altlinuxhyph" != "no"; then
-    echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
     SYSTEM_HYPH=YES
-    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_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 :
 
-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
-  ac_cpp_err=yes
+   as_fn_error "altlinuxhyph headers not found." "$LINENO" 5
 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: 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
-   { { echo "$as_me:$LINENO: error: altlinuxhyph headers not found." >&5
-echo "$as_me: error: altlinuxhyph headers not found." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-    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_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 :
 
-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; }; }
+   as_fn_error "no. You are sure you have altlinuyhyph headers?" "$LINENO" 5
 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
+    { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lhyphen  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-hnj_hyphen_hyphenate2 ();
+return hnj_hyphen_hyphenate2 ();
   ;
   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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=no
+  ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_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
+{ $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 :
   HYPHEN_LIB=-lhyphen
 else
-   { { 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; }; }
+   as_fn_error "altlinuxhyph library not found or too old." "$LINENO" 5
 fi
 
     if test -z "$HYPHEN_LIB"; then
-       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
+       { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lhyph  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-hnj_hyphen_hyphenate2 ();
+return hnj_hyphen_hyphenate2 ();
   ;
   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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_hyph_hnj_hyphen_hyphenate2=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_hyph_hnj_hyphen_hyphenate2=no
+  ac_cv_lib_hyph_hnj_hyphen_hyphenate2=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_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
+{ $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 :
   HYPHEN_LIB=-lhyph
 else
-   { { 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; }; }
+   as_fn_error "altlinuxhyph library not found or too old." "$LINENO" 5
 fi
 
     fi
     if test -z "$HYPHEN_LIB"; then
-       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
+       { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lhnj  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-hnj_hyphen_hyphenate2 ();
+return hnj_hyphen_hyphenate2 ();
   ;
   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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_hnj_hnj_hyphen_hyphenate2=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_hnj_hnj_hyphen_hyphenate2=no
+  ac_cv_lib_hnj_hnj_hyphen_hyphenate2=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_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
+{ $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 :
   HYPHEN_LIB=-lhnj
 else
-   { { 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; }; }
+   as_fn_error "altlinuxhyph library not found or too old." "$LINENO" 5
 fi
 
     fi
 else
-    echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
     SYSTEM_HYPH=NO
+    BUILD_TYPE="$BUILD_TYPE HYPHEN"
 fi
 
 
 
-echo "$as_me:$LINENO: checking which mythes to use" >&5
-echo $ECHO_N "checking which mythes to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which mythes to use" >&5
+$as_echo_n "checking which mythes to use... " >&6; }
 if test -n "$with_system_mythes" && test "$with_system_mythes" != "no"; then
-    echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
     SYSTEM_MYTHES=YES
-    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
-  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_header_mongrel "$LINENO" "mythes.hxx" "ac_cv_header_mythes_hxx" "$ac_includes_default"
+if test "x$ac_cv_header_mythes_hxx" = 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: 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; }; }
+   as_fn_error "mythes.hxx headers not found." "$LINENO" 5
 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
+    { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmythes  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
 main ()
 {
-main ();
+return 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_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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_mythes_main=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_mythes_main=no
+  ac_cv_lib_mythes_main=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_mythes_main" >&5
-echo "${ECHO_T}$ac_cv_lib_mythes_main" >&6
-if test $ac_cv_lib_mythes_main = yes; then
+{ $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 :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBMYTHES 1
 _ACEOF
@@ -23011,237 +17886,68 @@ _ACEOF
   LIBS="-lmythes $LIBS"
 
 else
-   { { echo "$as_me:$LINENO: error: mythes library not found." >&5
-echo "$as_me: error: mythes library not found." >&2;}
-   { (exit 1); exit 1; }; }
+   as_fn_error "mythes library not found." "$LINENO" 5
 fi
 
 else
-    echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
     SYSTEM_MYTHES=NO
 fi
 
 
-echo "$as_me:$LINENO: checking which lpsolve to use" >&5
-echo $ECHO_N "checking which lpsolve to use... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which lpsolve to use" >&5
+$as_echo_n "checking which lpsolve to use... " >&6; }
 if test -n "$with_system_lpsolve" -o -n "$with_system_libs" && \
 	test "$with_system_lpsolve" != "no"; then
-    echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
     SYSTEM_LPSOLVE=YES
-    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
-  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
+    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 :
 
-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; }; }
+   as_fn_error "lpsolve headers not found." "$LINENO" 5
 fi
 
 
-
-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
+    { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-llpsolve55  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-make_lp ();
+return make_lp ();
   ;
   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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_lpsolve55_make_lp=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_lpsolve55_make_lp=no
+  ac_cv_lib_lpsolve55_make_lp=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_lpsolve55_make_lp" >&5
-echo "${ECHO_T}$ac_cv_lib_lpsolve55_make_lp" >&6
-if test $ac_cv_lib_lpsolve55_make_lp = yes; then
+{ $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 :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBLPSOLVE55 1
 _ACEOF
@@ -23249,105 +17955,73 @@ _ACEOF
   LIBS="-llpsolve55 $LIBS"
 
 else
-   { { 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; }; }
+   as_fn_error "lpsolve library not found or too old." "$LINENO" 5
 fi
 
 else
-    echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
     SYSTEM_LPSOLVE=NO
     BUILD_TYPE="$BUILD_TYPE LPSOLVE"
 fi
 
 
 if test "$_os" = "Linux"; then
-   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
+   { $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; }
    exec 6>/dev/null # no output
-   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
+   { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-gnu_get_libc_version ();
+return gnu_get_libc_version ();
   ;
   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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_c_gnu_get_libc_version=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_c_gnu_get_libc_version=no
+  ac_cv_lib_c_gnu_get_libc_version=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_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
+{ $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 :
   HAVE_LIBC=yes; export HAVE_LIBC
 fi
 
    exec 6>&1 # output on again
    if test "$HAVE_LIBC"; then
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
    else
-      { { echo "$as_me:$LINENO: error: no, upgrade libc" >&5
-echo "$as_me: error: no, upgrade libc" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "no, upgrade libc" "$LINENO" 5
    fi
 fi
 
 if test \( "$_os" = "WINNT" \) ; then
-	echo "$as_me:$LINENO: checking for PSDK files" >&5
-echo $ECHO_N "checking for PSDK files... $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PSDK files" >&5
+$as_echo_n "checking for PSDK files... " >&6; }
 	if test -z "$with_psdk_home"; then
 		# This first line will detect a February 2003 Microsoft Platform SDK
 		PSDK_HOME=`./oowintool --psdk-home`
@@ -23368,19 +18042,12 @@ echo $ECHO_N "checking for PSDK files... $ECHO_C" >&6
         PSDK_HOME=`echo $PSDK_HOME | $SED 's/\/$//'`
     # Problem with current PSDK (iz 49865)
     if test -f "$PSDK_HOME/Lib/libcp.lib"; then
-        { { echo "$as_me:$LINENO: error:
+        as_fn_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." >&2;}
-   { (exit 1); exit 1; }; }
+problem can be found in issue 49856." "$LINENO" 5
     fi
 # WIndows SDK has different headers
 	if test \( -f "$PSDK_HOME/Include/adoint.h" \) \
@@ -23396,41 +18063,36 @@ problem can be found in issue 49856." >&2;}
 		HAVE_PSDK_LIB="no"
 	fi
     if test "$HAVE_PSDK_H" = "no" -o "$HAVE_PSDK_LIB" = "no"; then
-        { { 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; }; }
+        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
     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
-        { { 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; }; }
+        as_fn_error "Some (all) files of the Windows Installer SDK are missing, please install." "$LINENO" 5
     fi
-    echo "$as_me:$LINENO: result: SDK files found ...)" >&5
-echo "${ECHO_T}SDK files found ...)" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: SDK files found ...)" >&5
+$as_echo "SDK files found ...)" >&6; }
     if echo $PSDK_HOME | grep "v6.1" >/dev/null 2>/dev/null; then
-        echo "$as_me:$LINENO: result: Found Windows SDK 6.1 ($PSDK_HOME)" >&5
-echo "${ECHO_T}Found Windows SDK 6.1 ($PSDK_HOME)" >&6
+        { $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; }
         WINDOWS_VISTA_PSDK=TRUE
     elif echo $PSDK_HOME | grep "v6.0" >/dev/null 2>/dev/null; then
-        echo "$as_me:$LINENO: result: Found Windows SDK 6.0 ($PSDK_HOME)" >&5
-echo "${ECHO_T}Found Windows SDK 6.0 ($PSDK_HOME)" >&6
+        { $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; }
         WINDOWS_VISTA_PSDK=TRUE
     else
-        echo "$as_me:$LINENO: result: Found Legacy Windows Platform SDK ($PSDK_HOME)" >&5
-echo "${ECHO_T}Found Legacy Windows Platform SDK ($PSDK_HOME)" >&6
+        { $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; }
     fi
 fi
 
 
 
 if test \( "$_os" = "WINNT" \) ; then
-    echo "$as_me:$LINENO: checking for DirectX SDK files" >&5
-echo $ECHO_N "checking for DirectX SDK files... $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DirectX SDK files" >&5
+$as_echo_n "checking for DirectX SDK files... " >&6; }
     if test -z "$with_directx_home"; then
                 if test -n "$DXSDK_DIR"; then
             DIRECTXSDK_HOME=`cygpath -d "$DXSDK_DIR"`
@@ -23462,17 +18124,15 @@ echo $ECHO_N "checking for DirectX SDK files... $ECHO_C" >&6
     fi
     if test -n "$ENABLE_DIRECTX"; then
 	    if test "$HAVE_DIRECTXSDK_H" = "yes" -a "$HAVE_DIRECTXSDK_LIB" = "yes"; then
-		    echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+		    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
 	    else
-		    { { 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; }; }
+		    as_fn_error "DirectX SDK files not found, please use --with-directx-home or -disable-directx." "$LINENO" 5
 	    fi
     else
 		DIRECTXSDK_HOME=""
-		echo "$as_me:$LINENO: result: disabled" >&5
-echo "${ECHO_T}disabled" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
     fi
 fi
 
@@ -23480,14 +18140,14 @@ fi
 
 NSIS_PATH=""
 if test "$_os" = "WINNT" ; then
-    echo "$as_me:$LINENO: checking for NSIS" >&5
-echo $ECHO_N "checking for NSIS... $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSIS" >&5
+$as_echo_n "checking for NSIS... " >&6; }
     # Extract the first word of "nsis.exe", so it can be a program name with args.
 set dummy nsis.exe; 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_NSIS_PATH+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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
 else
   case $NSIS_PATH in
   [\\/]* | ?:[\\/]*)
@@ -23499,28 +18159,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_NSIS_PATH="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 NSIS_PATH=$ac_cv_path_NSIS_PATH
-
 if test -n "$NSIS_PATH"; then
-  echo "$as_me:$LINENO: result: $NSIS_PATH" >&5
-echo "${ECHO_T}$NSIS_PATH" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NSIS_PATH" >&5
+$as_echo "$NSIS_PATH" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
     if test -n "$NSIS_PATH"; then
         NSIS_PATH=`dirname "$NSIS_PATH"`
     fi
@@ -23535,24 +18196,24 @@ fi
         NSIS_PATH="$nsistest"
     fi
     if test -z "$NSIS_PATH"; then
-        { 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;}
+        { $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 "NSIS not found, no self contained installer will be build." >> warn
     else
         NSIS_PATH=`cygpath -d "$NSIS_PATH"`
         NSIS_PATH=`cygpath -u "$NSIS_PATH"`
-        echo "$as_me:$LINENO: result: found ($NSIS_PATH)" >&5
-echo "${ECHO_T}found ($NSIS_PATH)" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found ($NSIS_PATH)" >&5
+$as_echo "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
-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
+{ $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
 else
   case $BISON in
   [\\/]* | ?:[\\/]*)
@@ -23564,59 +18225,56 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_BISON="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 BISON=$ac_cv_path_BISON
-
 if test -n "$BISON"; then
-  echo "$as_me:$LINENO: result: $BISON" >&5
-echo "${ECHO_T}$BISON" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BISON" >&5
+$as_echo "$BISON" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 if test -z "$BISON"; then
-   { { 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; }; }
+   as_fn_error "no bison found in \$PATH, install bison" "$LINENO" 5
 else
-   echo "$as_me:$LINENO: checking the bison version" >&5
-echo $ECHO_N "checking the bison version... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking the bison version" >&5
+$as_echo_n "checking the bison version... " >&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
-          { echo "$as_me:$LINENO: WARNING: suspect ($BISON $_bison_version)" >&5
-echo "$as_me: WARNING: suspect ($BISON $_bison_version)" >&2;}
+          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: suspect ($BISON $_bison_version)" >&5
+$as_echo "$as_me: WARNING: suspect ($BISON $_bison_version)" >&2;}
           echo "Suspect ($BISON $_bison_version) suggest upgrade" >> warn
        else
-          echo "$as_me:$LINENO: result: checked ($BISON $_bison_version)" >&5
-echo "${ECHO_T}checked ($BISON $_bison_version)" >&6
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked ($BISON $_bison_version)" >&5
+$as_echo "checked ($BISON $_bison_version)" >&6; }
        fi
     else
-       { { 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; }; }
+       as_fn_error "failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))" "$LINENO" 5
     fi
 fi
 # Extract the first word of "flex", so it can be a program name with args.
 set dummy flex; 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_FLEX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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
 else
   case $FLEX in
   [\\/]* | ?:[\\/]*)
@@ -23628,39 +18286,38 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_FLEX="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 FLEX=$ac_cv_path_FLEX
-
 if test -n "$FLEX"; then
-  echo "$as_me:$LINENO: result: $FLEX" >&5
-echo "${ECHO_T}$FLEX" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLEX" >&5
+$as_echo "$FLEX" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 if test -z "$FLEX"; then
-   { { 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; }; }
+   as_fn_error "no flex found in \$PATH, install flex" "$LINENO" 5
 fi
 # Extract the first word of "patch", so it can be a program name with args.
 set dummy patch; 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_PATCH+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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
 else
   case $PATCH in
   [\\/]* | ?:[\\/]*)
@@ -23672,32 +18329,31 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PATCH="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 PATCH=$ac_cv_path_PATCH
-
 if test -n "$PATCH"; then
-  echo "$as_me:$LINENO: result: $PATCH" >&5
-echo "${ECHO_T}$PATCH" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATCH" >&5
+$as_echo "$PATCH" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 if test -z "$PATCH"; then
-   { { 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; }; }
+   as_fn_error "\\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" "$LINENO" 5
 fi
 
 if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then
@@ -23707,21 +18363,17 @@ if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then
       if test -x "$with_gnu_patch"; then
 	GNUPATCH=$with_gnu_patch
       else
-        { { 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; }; }
+        as_fn_error "--with-gnu-patch did not point to an executable" "$LINENO" 5
       fi
    fi
 
-   echo "$as_me:$LINENO: checking whether $GNUPATCH is GNU patch" >&5
-echo $ECHO_N "checking whether $GNUPATCH is GNU patch... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $GNUPATCH is GNU patch" >&5
+$as_echo_n "checking whether $GNUPATCH is GNU patch... " >&6; }
    if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
-	echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
    else
-  	{ { 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; }; }
+  	as_fn_error "no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" "$LINENO" 5
    fi
 
 
@@ -23730,10 +18382,10 @@ echo "$as_me: error: no, GNU patch needed. install or specify with --with-gnu-pa
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_GNUCP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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
 else
   case $GNUCP in
   [\\/]* | ?:[\\/]*)
@@ -23745,64 +18397,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GNUCP="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 GNUCP=$ac_cv_path_GNUCP
-
 if test -n "$GNUCP"; then
-  echo "$as_me:$LINENO: result: $GNUCP" >&5
-echo "${ECHO_T}$GNUCP" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUCP" >&5
+$as_echo "$GNUCP" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   test -n "$GNUCP" && break
 done
 
     if test -z $GNUCP; then
-      { { 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; }; }
+      as_fn_error "Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" "$LINENO" 5
     fi
   else
     if test -x "$with_gnu_cp"; then
       GNUCP=$with_gnu_cp
     else
-      { { 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; }; }
+      as_fn_error "--with-gnu-cp did not point to an executable" "$LINENO" 5
     fi
   fi
 
-  echo "$as_me:$LINENO: checking whether $GNUCP is GNU cp" >&5
-echo $ECHO_N "checking whether $GNUCP is GNU cp... $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $GNUCP is GNU cp" >&5
+$as_echo_n "checking whether $GNUCP is GNU cp... " >&6; }
   if $GNUCP --version 2>/dev/null | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
-	echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
    if $GNUCP --version 2>/dev/null | grep "GNU fileutils" >/dev/null 2>/dev/null; then
-	echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
    else
       if test "$_os" = "Darwin"; then
          GNUCP=''
-         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
+         { $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; }
       else
-         { { 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; }; }
+         as_fn_error "no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" "$LINENO" 5
       fi
    fi
   fi
@@ -23815,10 +18462,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
-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
+{ $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
 else
   case $CYGWIN_PATH in
   [\\/]* | ?:[\\/]*)
@@ -23830,28 +18477,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_CYGWIN_PATH="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 CYGWIN_PATH=$ac_cv_path_CYGWIN_PATH
-
 if test -n "$CYGWIN_PATH"; then
-  echo "$as_me:$LINENO: result: $CYGWIN_PATH" >&5
-echo "${ECHO_T}$CYGWIN_PATH" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CYGWIN_PATH" >&5
+$as_echo "$CYGWIN_PATH" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
     CYGWIN_PATH=`dirname "$CYGWIN_PATH"`
 fi
 if test -z "$CYGWIN_PATH"; then
@@ -23860,18 +18508,18 @@ fi
 
 
 if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
-  echo "$as_me:$LINENO: checking ml.exe assembler path" >&5
-echo $ECHO_N "checking ml.exe assembler path... $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking ml.exe assembler path" >&5
+$as_echo_n "checking ml.exe assembler path... " >&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
-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
+{ $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
 else
   case $ML_EXE in
   [\\/]* | ?:[\\/]*)
@@ -23883,37 +18531,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ML_EXE="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 ML_EXE=$ac_cv_path_ML_EXE
-
 if test -n "$ML_EXE"; then
-  echo "$as_me:$LINENO: result: $ML_EXE" >&5
-echo "${ECHO_T}$ML_EXE" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ML_EXE" >&5
+$as_echo "$ML_EXE" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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
-        echo "$as_me:$LINENO: result: found ($with_asm_home)" >&5
-echo "${ECHO_T}found ($with_asm_home)" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found ($with_asm_home)" >&5
+$as_echo "found ($with_asm_home)" >&6; }
       else
-        { { 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; }; }
+        as_fn_error "Configure did not find ml.exe assembler." "$LINENO" 5
       fi
     else
        with_asm_home="ASM_IN_PATH"
@@ -23924,8 +18571,8 @@ else
 fi
 ASM_HOME="$with_asm_home"
 if test -n "$ASM_HOME"; then
-  echo "$as_me:$LINENO: result: $ASM_HOME" >&5
-echo "${ECHO_T}$ASM_HOME" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ASM_HOME" >&5
+$as_echo "$ASM_HOME" >&6; }
 fi
 
 
@@ -23942,10 +18589,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
-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
+{ $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
 else
   case $ZIP in
   [\\/]* | ?:[\\/]*)
@@ -23957,34 +18604,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ZIP="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 ZIP=$ac_cv_path_ZIP
-
 if test -n "$ZIP"; then
-  echo "$as_me:$LINENO: result: $ZIP" >&5
-echo "${ECHO_T}$ZIP" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZIP" >&5
+$as_echo "$ZIP" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
     # Extract the first word of "unzip", so it can be a program name with args.
 set dummy unzip; 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_UNZIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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
 else
   case $UNZIP in
   [\\/]* | ?:[\\/]*)
@@ -23996,84 +18644,69 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_UNZIP="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 UNZIP=$ac_cv_path_UNZIP
-
 if test -n "$UNZIP"; then
-  echo "$as_me:$LINENO: result: $UNZIP" >&5
-echo "${ECHO_T}$UNZIP" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNZIP" >&5
+$as_echo "$UNZIP" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
     ZIP_HOME=`dirname "$ZIP"`
 fi
 if test -z "$ZIP" -o -z "$UNZIP"; then
-    { { 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; }; }
+    as_fn_error "Zip/Unzip are required to build, please install or use --with-zip-home" "$LINENO" 5
 fi
 
 if test "$_os" = "WINNT"; then
     if test -n "`$ZIP -h | grep -i WinNT`" ; then
-{ { echo "$as_me:$LINENO: error: $ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." >&5
-echo "$as_me: error: $ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." >&2;}
-   { (exit 1); exit 1; }; }
+as_fn_error "$ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." "$LINENO" 5
     fi
 fi
 
 
 if test "$_os" = "WINNT"; then
-   echo "$as_me:$LINENO: checking for unicows.dll" >&5
-echo $ECHO_N "checking for unicows.dll... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unicows.dll" >&5
+$as_echo_n "checking for unicows.dll... " >&6; }
    if test -x ./external/unicows/unicows.dll; then
-      echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
    else
-      { { echo "$as_me:$LINENO: error: The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/.
+      as_fn_error "The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/.
 Get it from the Microsoft site and put it into external/unicows.
 (Note: Microsoft seems to enjoy changing the exact location of this file. You
 may have to search Microsoft's website.) Last time it was seen at:
-<http://download.microsoft.com/download/b/7/5/b75eace3-00e2-4aa0-9a6f-0b6882c71642/unicows.exe>." >&5
-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; }; }
+<http://download.microsoft.com/download/b/7/5/b75eace3-00e2-4aa0-9a6f-0b6882c71642/unicows.exe>." "$LINENO" 5
    fi
 fi
 
 if test "$_os" = "WINNT"; then
-   echo "$as_me:$LINENO: checking for dbghelp.dll" >&5
-echo $ECHO_N "checking for dbghelp.dll... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbghelp.dll" >&5
+$as_echo_n "checking for dbghelp.dll... " >&6; }
    if test -x ./external/dbghelp/dbghelp.dll; then
-      echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
    else
-      { { echo "$as_me:$LINENO: error: dbghelp.dll is missing in external/dbghelp/.
-Get it from the Microsoft site and put it into external/dbghelp.
-(Note: Microsoft seems to enjoy changing the exact location of this file. You
-may have to search Microsoft's website.) Last time it was seen at:
-<http://www.microsoft.com/downloads/release.asp?releaseid=30682>." >&5
-echo "$as_me: error: dbghelp.dll is missing in external/dbghelp/.
+      as_fn_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; }; }
+<http://www.microsoft.com/downloads/release.asp?releaseid=30682>." "$LINENO" 5
    fi
 fi
 
@@ -24081,28 +18714,21 @@ if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
        if ./oowintool --msvc-copy-dlls ./external/msvcp ; then
           :
        else
-          { { 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; }; }
+          as_fn_error "oowintool failed to copy CRT" "$LINENO" 5
        fi
 fi
 
 if test "$_os" = "WINNT"; then
-   echo "$as_me:$LINENO: checking for gdiplus.dll" >&5
-echo $ECHO_N "checking for gdiplus.dll... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdiplus.dll" >&5
+$as_echo_n "checking for gdiplus.dll... " >&6; }
    if test -x ./external/gdiplus/gdiplus.dll; then
-      echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
    else
-      { { echo "$as_me:$LINENO: error: gdiplus.dll is missing in external/gdiplus/.
-Get it from the Microsoft site and put it into external/gdiplus.
-You may have to search Microsoft's website. Last time it was seen at:
-<http://www.microsoft.com/downloads/details.aspx?familyid=6A63AB9C-DF12-4D41-933C-BE590FEAA05A&displaylang=en>." >&5
-echo "$as_me: error: gdiplus.dll is missing in external/gdiplus/.
+      as_fn_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; }; }
+<http://www.microsoft.com/downloads/details.aspx?familyid=6A63AB9C-DF12-4D41-933C-BE590FEAA05A&displaylang=en>." "$LINENO" 5
    fi
 fi
 
@@ -24112,11 +18738,11 @@ fi
 
 if test "$_os" = "WINNT"; then
    if test  "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then
-   echo "$as_me:$LINENO: checking for instmsia.exe/instmsiw.exe" >&5
-echo $ECHO_N "checking for instmsia.exe/instmsiw.exe... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for instmsia.exe/instmsiw.exe" >&5
+$as_echo_n "checking for instmsia.exe/instmsiw.exe... " >&6; }
    if test -x ./external/msi/instmsia.exe -a -x ./external/msi/instmsiw.exe; then
-      echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
    else
       MSIAPATH=`/bin/find "$COMPATH/.." -iname instmsia.exe | head -n 1`
       MSIWPATH=`/bin/find "$COMPATH/.." -iname instmsiw.exe | head -n 1`
@@ -24125,27 +18751,21 @@ echo "${ECHO_T}found" >&6
          cp "$MSIWPATH" ./external/msi/ && chmod +x ./external/msi/instmsiw.exe && MSIWCOPY="OK"
       fi
       if test -z "$MSIACOPY" -o -z "$MSIWCOPY"; then
-         { { echo "$as_me:$LINENO: error: instmsia.exe and/or instmsiw.exe are/is missing in the default location.
+         as_fn_error "instmsia.exe and/or instmsiw.exe are/is missing in the default location.
 These programs are part of the Visual Studio installation and should be found in a
 directory similar to:
 \"c:\\Program Files\\Microsoft Visual Studio .NET 2003\\Common7\\Tools\\Deployment\\MsiRedist\\\"
-As the automatic detection fails please copy the files to external/msi/." >&5
-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; }; }
+As the automatic detection fails please copy the files to external/msi/." "$LINENO" 5
       else
-         echo "$as_me:$LINENO: result: found and copied" >&5
-echo "${ECHO_T}found and copied" >&6
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: found and copied" >&5
+$as_echo "found and copied" >&6; }
       fi
    fi
 fi
 fi
 
-echo "$as_me:$LINENO: checking which VCLplugs shall be built" >&5
-echo $ECHO_N "checking which VCLplugs shall be built... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which VCLplugs shall be built" >&5
+$as_echo_n "checking which VCLplugs shall be built... " >&6; }
 ENABLE_GTK=""
 if test "x$enable_gtk" = "xyes"; then
     ENABLE_GTK="TRUE"
@@ -24168,31 +18788,31 @@ fi
 
 
 if test -z "$R"; then
-	echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
 else
-	echo "$as_me:$LINENO: result: $R" >&5
-echo "${ECHO_T}$R" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $R" >&5
+$as_echo "$R" >&6; }
 fi
 
 
 ENABLE_GCONF=""
-echo "$as_me:$LINENO: checking whether to enable GConf support" >&5
-echo $ECHO_N "checking whether to enable GConf support... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable GConf support" >&5
+$as_echo_n "checking whether to enable GConf support... " >&6; }
 if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$_os" != "OS2" -a "$enable_gconf" = "yes"; then
     ENABLE_GCONF="TRUE"
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -24204,29 +18824,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -24237,25 +18858,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for gconf-2.0 " >&5
-echo $ECHO_N "checking for gconf-2.0 ... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gconf-2.0 " >&5
+$as_echo_n "checking for gconf-2.0 ... " >&6; }
 
         if $PKG_CONFIG --exists "gconf-2.0 " ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5
-echo $ECHO_N "checking GCONF_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GCONF_CFLAGS" >&5
+$as_echo_n "checking GCONF_CFLAGS... " >&6; }
             GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 "`
-            echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5
-echo "${ECHO_T}$GCONF_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONF_CFLAGS" >&5
+$as_echo "$GCONF_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking GCONF_LIBS" >&5
-echo $ECHO_N "checking GCONF_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GCONF_LIBS" >&5
+$as_echo_n "checking GCONF_LIBS... " >&6; }
             GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 "`
-            echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5
-echo "${ECHO_T}$GCONF_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONF_LIBS" >&5
+$as_echo "$GCONF_LIBS" >&6; }
         else
             GCONF_CFLAGS=""
             GCONF_LIBS=""
@@ -24276,35 +18897,33 @@ echo "${ECHO_T}$GCONF_LIBS" >&6
   if test $succeeded = yes; then
      :
   else
-     { { 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; }; }
+     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
   fi
 
 else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 
 ENABLE_GNOMEVFS=""
-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
+{ $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; }
 if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gnome_vfs" = "yes"; then
     ENABLE_GNOMEVFS="TRUE"
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -24316,29 +18935,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -24349,25 +18969,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        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
+        { $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; }
 
         if $PKG_CONFIG --exists "gnome-vfs-2.0 >= 2.6.0 " ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking GNOMEVFS_CFLAGS" >&5
-echo $ECHO_N "checking GNOMEVFS_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNOMEVFS_CFLAGS" >&5
+$as_echo_n "checking GNOMEVFS_CFLAGS... " >&6; }
             GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= 2.6.0 "`
-            echo "$as_me:$LINENO: result: $GNOMEVFS_CFLAGS" >&5
-echo "${ECHO_T}$GNOMEVFS_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNOMEVFS_CFLAGS" >&5
+$as_echo "$GNOMEVFS_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking GNOMEVFS_LIBS" >&5
-echo $ECHO_N "checking GNOMEVFS_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNOMEVFS_LIBS" >&5
+$as_echo_n "checking GNOMEVFS_LIBS... " >&6; }
             GNOMEVFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= 2.6.0 "`
-            echo "$as_me:$LINENO: result: $GNOMEVFS_LIBS" >&5
-echo "${ECHO_T}$GNOMEVFS_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNOMEVFS_LIBS" >&5
+$as_echo "$GNOMEVFS_LIBS" >&6; }
         else
             GNOMEVFS_CFLAGS=""
             GNOMEVFS_LIBS=""
@@ -24388,9 +19008,7 @@ echo "${ECHO_T}$GNOMEVFS_LIBS" >&6
   if test $succeeded = yes; then
      :
   else
-     { { 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; }; }
+     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
   fi
 
     if test "$ENABLE_GCONF" != "TRUE"; then
@@ -24400,10 +19018,10 @@ echo "$as_me: error: Library requirements (gnome-vfs-2.0 >= 2.6.0 ) not met; con
   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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -24415,29 +19033,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -24448,25 +19067,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for gconf-2.0 " >&5
-echo $ECHO_N "checking for gconf-2.0 ... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gconf-2.0 " >&5
+$as_echo_n "checking for gconf-2.0 ... " >&6; }
 
         if $PKG_CONFIG --exists "gconf-2.0 " ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5
-echo $ECHO_N "checking GCONF_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GCONF_CFLAGS" >&5
+$as_echo_n "checking GCONF_CFLAGS... " >&6; }
             GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 "`
-            echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5
-echo "${ECHO_T}$GCONF_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONF_CFLAGS" >&5
+$as_echo "$GCONF_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking GCONF_LIBS" >&5
-echo $ECHO_N "checking GCONF_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GCONF_LIBS" >&5
+$as_echo_n "checking GCONF_LIBS... " >&6; }
             GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 "`
-            echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5
-echo "${ECHO_T}$GCONF_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONF_LIBS" >&5
+$as_echo "$GCONF_LIBS" >&6; }
         else
             GCONF_CFLAGS=""
             GCONF_LIBS=""
@@ -24487,15 +19106,13 @@ echo "${ECHO_T}$GCONF_LIBS" >&6
   if test $succeeded = yes; then
      :
   else
-     { { 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; }; }
+     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
   fi
 
     fi
 else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -24513,10 +19130,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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -24528,29 +19145,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -24561,25 +19179,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        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
+        { $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; }
 
         if $PKG_CONFIG --exists "gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 " ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5
-echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK_CFLAGS" >&5
+$as_echo_n "checking GTK_CFLAGS... " >&6; }
             GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 "`
-            echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5
-echo "${ECHO_T}$GTK_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_CFLAGS" >&5
+$as_echo "$GTK_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking GTK_LIBS" >&5
-echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK_LIBS" >&5
+$as_echo_n "checking GTK_LIBS... " >&6; }
             GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 "`
-            echo "$as_me:$LINENO: result: $GTK_LIBS" >&5
-echo "${ECHO_T}$GTK_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_LIBS" >&5
+$as_echo "$GTK_LIBS" >&6; }
         else
             GTK_CFLAGS=""
             GTK_LIBS=""
@@ -24600,9 +19218,7 @@ echo "${ECHO_T}$GTK_LIBS" >&6
   if test $succeeded = yes; then
      :
   else
-     { { 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; }; }
+     as_fn_error "requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages" "$LINENO" 5
   fi
 
       BUILD_TYPE="$BUILD_TYPE GTK"
@@ -24612,22 +19228,22 @@ echo "$as_me: error: requirements to build the gtk-plugin not met. Use --disable
          BUILD_TYPE="$BUILD_TYPE SYSTRAY_GTK"
       fi
 
-      echo "$as_me:$LINENO: checking whether to enable DBUS support" >&5
-echo $ECHO_N "checking whether to enable DBUS support... $ECHO_C" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable DBUS support" >&5
+$as_echo_n "checking whether to enable DBUS support... " >&6; }
       if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_dbus" = "yes"; then
           ENABLE_DBUS="TRUE"
-          echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -24639,29 +19255,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -24672,25 +19289,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        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
+        { $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; }
 
         if $PKG_CONFIG --exists "dbus-glib-1 >= 0.70 " ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking DBUS_CFLAGS" >&5
-echo $ECHO_N "checking DBUS_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_CFLAGS" >&5
+$as_echo_n "checking DBUS_CFLAGS... " >&6; }
             DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= 0.70 "`
-            echo "$as_me:$LINENO: result: $DBUS_CFLAGS" >&5
-echo "${ECHO_T}$DBUS_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_CFLAGS" >&5
+$as_echo "$DBUS_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking DBUS_LIBS" >&5
-echo $ECHO_N "checking DBUS_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_LIBS" >&5
+$as_echo_n "checking DBUS_LIBS... " >&6; }
             DBUS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= 0.70 "`
-            echo "$as_me:$LINENO: result: $DBUS_LIBS" >&5
-echo "${ECHO_T}$DBUS_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_LIBS" >&5
+$as_echo "$DBUS_LIBS" >&6; }
         else
             DBUS_CFLAGS=""
             DBUS_LIBS=""
@@ -24711,37 +19328,33 @@ echo "${ECHO_T}$DBUS_LIBS" >&6
   if test $succeeded = yes; then
      :
   else
-     { { 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; }; }
+     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
   fi
 
       else
-          echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
       fi
 
-      echo "$as_me:$LINENO: checking whether to enable GIO support" >&5
-echo $ECHO_N "checking whether to enable GIO support... $ECHO_C" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable GIO support" >&5
+$as_echo_n "checking whether to enable GIO support... " >&6; }
       if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gio" = "yes"; then
           if test "$ENABLE_GNOMEVFS" = "TRUE" ; then
-             { { 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; }; }
+             as_fn_error "please use --enable-gio only together with --disable-gnome-vfs." "$LINENO" 5
           fi
           ENABLE_GIO="TRUE"
-          echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -24753,29 +19366,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -24786,25 +19400,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for gio-2.0 " >&5
-echo $ECHO_N "checking for gio-2.0 ... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-2.0 " >&5
+$as_echo_n "checking for gio-2.0 ... " >&6; }
 
         if $PKG_CONFIG --exists "gio-2.0 " ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking GIO_CFLAGS" >&5
-echo $ECHO_N "checking GIO_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GIO_CFLAGS" >&5
+$as_echo_n "checking GIO_CFLAGS... " >&6; }
             GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 "`
-            echo "$as_me:$LINENO: result: $GIO_CFLAGS" >&5
-echo "${ECHO_T}$GIO_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIO_CFLAGS" >&5
+$as_echo "$GIO_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking GIO_LIBS" >&5
-echo $ECHO_N "checking GIO_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GIO_LIBS" >&5
+$as_echo_n "checking GIO_LIBS... " >&6; }
             GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0 "`
-            echo "$as_me:$LINENO: result: $GIO_LIBS" >&5
-echo "${ECHO_T}$GIO_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIO_LIBS" >&5
+$as_echo "$GIO_LIBS" >&6; }
         else
             GIO_CFLAGS=""
             GIO_LIBS=""
@@ -24825,14 +19439,12 @@ echo "${ECHO_T}$GIO_LIBS" >&6
   if test $succeeded = yes; then
      :
   else
-     { { 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; }; }
+     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
   fi
 
       else
-          echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
       fi
 
    fi
@@ -24851,18 +19463,18 @@ SYSTEM_CAIRO=""
 
 if test  "$test_cairo" = "yes"; then
 
-    echo "$as_me:$LINENO: checking whether to use cairo" >&5
-echo $ECHO_N "checking whether to use cairo... $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use cairo" >&5
+$as_echo_n "checking whether to use cairo... " >&6; }
     if test "x$enable_cairo" != "xno" ; then
         ENABLE_CAIRO="TRUE"
-	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
+	{ $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; }
         if test -n "$with_system_cairo" -o -n "$with_system_libs" && \
            test "$with_system_cairo" != "no"; then
-           echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+           { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
            SYSTEM_CAIRO=YES
 
 
@@ -24871,10 +19483,10 @@ echo "${ECHO_T}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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -24886,29 +19498,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -24919,25 +19532,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for cairo >= 1.0.2 " >&5
-echo $ECHO_N "checking for cairo >= 1.0.2 ... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cairo >= 1.0.2 " >&5
+$as_echo_n "checking for cairo >= 1.0.2 ... " >&6; }
 
         if $PKG_CONFIG --exists "cairo >= 1.0.2 " ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking CAIRO_CFLAGS" >&5
-echo $ECHO_N "checking CAIRO_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking CAIRO_CFLAGS" >&5
+$as_echo_n "checking CAIRO_CFLAGS... " >&6; }
             CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 1.0.2 "`
-            echo "$as_me:$LINENO: result: $CAIRO_CFLAGS" >&5
-echo "${ECHO_T}$CAIRO_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CAIRO_CFLAGS" >&5
+$as_echo "$CAIRO_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking CAIRO_LIBS" >&5
-echo $ECHO_N "checking CAIRO_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking CAIRO_LIBS" >&5
+$as_echo_n "checking CAIRO_LIBS... " >&6; }
             CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= 1.0.2 "`
-            echo "$as_me:$LINENO: result: $CAIRO_LIBS" >&5
-echo "${ECHO_T}$CAIRO_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CAIRO_LIBS" >&5
+$as_echo "$CAIRO_LIBS" >&6; }
         else
             CAIRO_CFLAGS=""
             CAIRO_LIBS=""
@@ -24958,31 +19571,22 @@ echo "${ECHO_T}$CAIRO_LIBS" >&6
   if test $succeeded = yes; then
      :
   else
-     { { 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; }; }
+     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
   fi
 
 	   if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$ENABLE_FONTCONFIG" != "TRUE" ; then
-	      { { echo "$as_me:$LINENO: error: Cairo library requires fontconfig." >&5
-echo "$as_me: error: Cairo library requires fontconfig." >&2;}
-   { (exit 1); exit 1; }; }
+	      as_fn_error "Cairo library requires fontconfig." "$LINENO" 5
 	   fi
            if test "$with_system_xrender_headers" = "yes"; then
-              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
+              { $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
 /* end confdefs.h.  */
 
 #include <X11/extensions/Xrender.h>
@@ -24996,43 +19600,28 @@ int main(int argc, char **argv) {
 }
 
 _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: yes" >&5
-echo "${ECHO_T}yes" >&6
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&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: no, X headers too old." >&5
-echo "$as_me: error: no, X headers too old." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "no, X headers too old." "$LINENO" 5
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
+
            fi
         else
            BUILD_TYPE="$BUILD_TYPE CAIRO"
 	   	   if test "$build_cpu" != "x86_64"; then
 	      BUILD_PIXMAN=YES
 	   fi
-           echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+           { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
         fi
     else
-	   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
 fi
 
@@ -25043,219 +19632,52 @@ fi
 
 
 
-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
+{ $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; }
 ENABLE_OPENGL=
 
 if test "x$enable_opengl" != "xno" ; 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
-  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}: 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 :
 
-# 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
+  as_fn_error "OpenGL headers not found" "$LINENO" 5
 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
 
-
-
-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
+   { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lGL  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
 main ()
 {
-main ();
+return 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_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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_GL_main=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_GL_main=no
+  ac_cv_lib_GL_main=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_GL_main" >&5
-echo "${ECHO_T}$ac_cv_lib_GL_main" >&6
-if test $ac_cv_lib_GL_main = yes; then
+{ $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 :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBGL 1
 _ACEOF
@@ -25263,71 +19685,40 @@ _ACEOF
   LIBS="-lGL $LIBS"
 
 else
-  { { 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; }; }
+  as_fn_error "libGL not installed or functional" "$LINENO" 5
 fi
 
-
-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
+   { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lGLU  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
 main ()
 {
-main ();
+return 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_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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_GLU_main=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_GLU_main=no
+  ac_cv_lib_GLU_main=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_GLU_main" >&5
-echo "${ECHO_T}$ac_cv_lib_GLU_main" >&6
-if test $ac_cv_lib_GLU_main = yes; then
+{ $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 :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBGLU 1
 _ACEOF
@@ -25335,58 +19726,69 @@ _ACEOF
   LIBS="-lGLU $LIBS"
 
 else
-  { { 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; }; }
+  as_fn_error "libGLU not installed or functional" "$LINENO" 5
 fi
 
    ENABLE_OPENGL=TRUE
 else
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 
-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
+{ $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; }
+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; }
+   ENABLE_PRESENTER_EXTRA_UI=YES
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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; }
 if test -n "$enable_minimizer" -a "$enable_minimizer" != "no"; then
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
    ENABLE_MINIMIZER=YES
 else
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
    ENABLE_MINIMIZER=NO
 fi
 
 
-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
+{ $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; }
 if test -n "$enable_presenter_console" -a "$enable_presenter_screen" != "no"; then
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
    ENABLE_PRESENTER_SCREEN=YES
 else
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
    ENABLE_PRESENTER_SCREEN=NO
 fi
 
 
-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
+{ $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; }
 if test -n "$enable_pdfimport" -a "$enable_pdfimport" != "no"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   ENABLE_PDFIMPORT=YES
 
-        echo "$as_me:$LINENO: checking which pdf backend to use" >&5
-echo $ECHO_N "checking which pdf backend to use... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking which pdf backend to use" >&5
+$as_echo_n "checking which pdf backend to use... " >&6; }
   if test -n "$with_system_poppler" -o -n "$with_system_libs" && \
        test "$with_system_poppler" != "no"; then
-      echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
       SYSTEM_POPPLER=YES
 
   succeeded=no
@@ -25394,10 +19796,10 @@ echo "${ECHO_T}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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -25409,29 +19811,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -25442,25 +19845,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for poppler >= 0.8.0 " >&5
-echo $ECHO_N "checking for poppler >= 0.8.0 ... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for poppler >= 0.8.0 " >&5
+$as_echo_n "checking for poppler >= 0.8.0 ... " >&6; }
 
         if $PKG_CONFIG --exists "poppler >= 0.8.0 " ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking POPPLER_CFLAGS" >&5
-echo $ECHO_N "checking POPPLER_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking POPPLER_CFLAGS" >&5
+$as_echo_n "checking POPPLER_CFLAGS... " >&6; }
             POPPLER_CFLAGS=`$PKG_CONFIG --cflags "poppler >= 0.8.0 "`
-            echo "$as_me:$LINENO: result: $POPPLER_CFLAGS" >&5
-echo "${ECHO_T}$POPPLER_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $POPPLER_CFLAGS" >&5
+$as_echo "$POPPLER_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking POPPLER_LIBS" >&5
-echo $ECHO_N "checking POPPLER_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking POPPLER_LIBS" >&5
+$as_echo_n "checking POPPLER_LIBS... " >&6; }
             POPPLER_LIBS=`$PKG_CONFIG --libs "poppler >= 0.8.0 "`
-            echo "$as_me:$LINENO: result: $POPPLER_LIBS" >&5
-echo "${ECHO_T}$POPPLER_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $POPPLER_LIBS" >&5
+$as_echo "$POPPLER_LIBS" >&6; }
         else
             POPPLER_CFLAGS=""
             POPPLER_LIBS=""
@@ -25481,30 +19884,26 @@ echo "${ECHO_T}$POPPLER_LIBS" >&6
   if test $succeeded = yes; then
      :
   else
-     { { 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; }; }
+     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
   fi
 
   else
-      echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
       SYSTEM_POPPLER=NO
       BUILD_TYPE="$BUILD_TYPE XPDF"
-      echo "$as_me:$LINENO: checking for xpdf module" >&5
-echo $ECHO_N "checking for xpdf module... $ECHO_C" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xpdf module" >&5
+$as_echo_n "checking for xpdf module... " >&6; }
       if test -d ./xpdf; then
-       echo "$as_me:$LINENO: result: OK" >&5
-echo "${ECHO_T}OK" >&6
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
+$as_echo "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; }; }
+        as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
       fi
   fi
 else
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
    ENABLE_PDFIMPORT=NO
 fi
 
@@ -25513,82 +19912,76 @@ fi
 
 
 if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then
-  echo "$as_me:$LINENO: checking for sdext module" >&5
-echo $ECHO_N "checking for sdext module... $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sdext module" >&5
+$as_echo_n "checking for sdext module... " >&6; }
   if test -d ./sdext; then
-   echo "$as_me:$LINENO: result: OK" >&5
-echo "${ECHO_T}OK" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
+$as_echo "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; }; }
+   as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
   fi
   BUILD_TYPE="$BUILD_TYPE SDEXT"
 fi
 
-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
+{ $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; }
 if test -n "$enable_wiki_publisher" -a "$enable_wiki_publisher" != "no" && test  "$WITH_JAVA" != "no"; then
-  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
+  { $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; }
   if test -d ./swext; then
-   echo "$as_me:$LINENO: result: OK" >&5
-echo "${ECHO_T}OK" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
+$as_echo "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; }; }
+   as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
   fi
   ENABLE_MEDIAWIKI=YES
   BUILD_TYPE="$BUILD_TYPE SWEXT"
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   ENABLE_MEDIAWIKI=NO
 fi
 
 
 if test "$ENABLE_MEDIAWIKI" == "YES"; then
-  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
+  { $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; }
   if test -n "$with_system_servlet_api"; then
-    echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
     SYSTEM_SERVLETAPI=YES
       if test -z "$SERVLETAPI_JAR"; then
 	SERVLETAPI_JAR=/usr/share/java/servlet-api.jar
       fi
-      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
+      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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$SERVLETAPI_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-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
-  :
+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 :
+
 else
-  { { 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; }; }
+  as_fn_error "servlet-api.jar not found." "$LINENO" 5
 fi
 
   else
-    echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
     SYSTEM_SERVLETAPI=NO
     BUILD_TYPE="$BUILD_TYPE TOMCAT"
   fi
@@ -25596,103 +19989,93 @@ fi
 
 
 
-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
+{ $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; }
 if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test "$WITH_JAVA" != "no"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   ENABLE_REPORTBUILDER=YES
-  echo "$as_me:$LINENO: checking for reportbuilder module" >&5
-echo $ECHO_N "checking for reportbuilder module... $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for reportbuilder module" >&5
+$as_echo_n "checking for reportbuilder module... " >&6; }
   if test -d ./reportbuilder; then
-    echo "$as_me:$LINENO: result: OK" >&5
-echo "${ECHO_T}OK" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
+$as_echo "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; }; }
+    as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
   fi
-  echo "$as_me:$LINENO: checking which jfreereport libs to use" >&5
-echo $ECHO_N "checking which jfreereport libs to use... $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which jfreereport libs to use" >&5
+$as_echo_n "checking which jfreereport libs to use... " >&6; }
   if test "$with_system_jfreereport" == "yes"; then
    	SYSTEM_JFREEREPORT=YES
-  	   echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+  	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
       if test -z $SAC_JAR; then
              SAC_JAR=/usr/share/java/sac.jar
       fi
-      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
+      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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$SAC_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-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
-  :
+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 :
+
 else
-  { { echo "$as_me:$LINENO: error: sac.jar not found." >&5
-echo "$as_me: error: sac.jar not found." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "sac.jar not found." "$LINENO" 5
 fi
 
 
       if test -z $LIBXML_JAR; then
-        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
+        { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 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
-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
+{ $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 :
    LIBXML_JAR=/usr/share/java/libxml-1.0.0.jar
 else
 
-            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
+            { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 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
-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
+{ $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 :
    LIBXML_JAR=/usr/share/java/libxml.jar
 else
-  { { 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; }; }
+  as_fn_error "libxml.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -25701,79 +20084,71 @@ fi
 fi
 
       else
-        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
+        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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$LIBXML_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-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
-  :
+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 :
+
 else
-  { { echo "$as_me:$LINENO: error: libxml.jar not found." >&5
-echo "$as_me: error: libxml.jar not found." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "libxml.jar not found." "$LINENO" 5
 fi
 
       fi
 
       if test -z $FLUTE_JAR; then
-        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
+        { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 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
-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
+{ $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 :
    FLUTE_JAR=/usr/share/java/flute-1.3.0.jar
 else
 
-            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
+            { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 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
-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
+{ $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 :
    FLUTE_JAR=/usr/share/java/flute.jar
 else
-   { { 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; }; }
+   as_fn_error "flute-1.3.0.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -25782,79 +20157,71 @@ fi
 fi
 
       else
-        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
+        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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$FLUTE_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-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
-  :
+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 :
+
 else
-  { { 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; }; }
+  as_fn_error "flute-1.3.0.jar not found." "$LINENO" 5
 fi
 
       fi
 
       if test -z $JFREEREPORT_JAR; then
-        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
+        { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 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
-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
+{ $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 :
    JFREEREPORT_JAR=/usr/share/java/flow-engine-0.9.2.jar
 else
 
-            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
+            { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 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
-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
+{ $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 :
    JFREEREPORT_JAR=/usr/share/java/flow-engine.jar
 else
-  { { 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; }; }
+  as_fn_error "jfreereport.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -25863,79 +20230,71 @@ fi
 fi
 
       else
-        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
+        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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$JFREEREPORT_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-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
-  :
+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 :
+
 else
-  { { echo "$as_me:$LINENO: error: jfreereport.jar not found." >&5
-echo "$as_me: error: jfreereport.jar not found." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "jfreereport.jar not found." "$LINENO" 5
 fi
 
       fi
 
       if test -z $LIBLAYOUT_JAR; then
-        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
+        { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 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
-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
+{ $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 :
    LIBLAYOUT_JAR=/usr/share/java/liblayout-0.2.9.jar
 else
 
-            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
+            { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 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
-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
+{ $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 :
    LIBLAYOUT_JAR=/usr/share/java/liblayout.jar
 else
-  { { 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; }; }
+  as_fn_error "liblayout.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -25944,79 +20303,71 @@ fi
 fi
 
       else
-        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
+        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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$LIBLAYOUT_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-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
-  :
+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 :
+
 else
-  { { echo "$as_me:$LINENO: error: liblayout.jar not found." >&5
-echo "$as_me: error: liblayout.jar not found." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "liblayout.jar not found." "$LINENO" 5
 fi
 
       fi
 
       if test -z $LIBLOADER_JAR; then
-        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
+        { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 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
-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
+{ $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 :
    LIBLOADER_JAR=/usr/share/java/libloader-1.0.0.jar
 else
 
-            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
+            { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 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
-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
+{ $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 :
    LIBLOADER_JAR=/usr/share/java/libloader.jar
 else
-  { { 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; }; }
+  as_fn_error "libloader.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -26025,79 +20376,71 @@ fi
 fi
 
       else
-        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
+        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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$LIBLOADER_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-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
-  :
+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 :
+
 else
-  { { echo "$as_me:$LINENO: error: libloader.jar not found." >&5
-echo "$as_me: error: libloader.jar not found." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "libloader.jar not found." "$LINENO" 5
 fi
 
       fi
 
       if test -z $LIBFORMULA_JAR; then
-        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
+        { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 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
-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
+{ $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 :
    LIBFORMULA_JAR=/usr/share/java/libformula-0.2.0.jar
 else
 
-            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
+            { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 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
-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
+{ $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 :
    LIBFORMULA_JAR=/usr/share/java/libformula.jar
 else
-  { { 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; }; }
+  as_fn_error "libformula.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -26106,79 +20449,71 @@ fi
 fi
 
       else
-        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
+        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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$LIBFORMULA_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-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
-  :
+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 :
+
 else
-  { { echo "$as_me:$LINENO: error: libformula.jar not found." >&5
-echo "$as_me: error: libformula.jar not found." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "libformula.jar not found." "$LINENO" 5
 fi
 
       fi
 
       if test -z $LIBREPOSITORY_JAR; then
-        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
+        { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 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
-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
+{ $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 :
    LIBREPOSITORY_JAR=/usr/share/java/librepository-1.0.0.jar
 else
 
-            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
+            { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 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
-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
+{ $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 :
    LIBREPOSITORY_JAR=/usr/share/java/librepository.jar
 else
-  { { 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; }; }
+  as_fn_error "librepository.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -26187,79 +20522,71 @@ fi
 fi
 
       else
-        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
+        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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$LIBREPOSITORY_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-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
-  :
+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 :
+
 else
-  { { echo "$as_me:$LINENO: error: librepository.jar not found." >&5
-echo "$as_me: error: librepository.jar not found." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "librepository.jar not found." "$LINENO" 5
 fi
 
       fi
 
       if test -z $LIBFONTS_JAR; then
-        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
+        { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 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
-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
+{ $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 :
    LIBFONTS_JAR=/usr/share/java/libfonts-1.0.0.jar
 else
 
-            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
+            { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 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
-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
+{ $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 :
    LIBFONTS_JAR=/usr/share/java/libfonts.jar
 else
-  { { 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; }; }
+  as_fn_error "libfonts.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -26268,79 +20595,71 @@ fi
 fi
 
       else
-        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
+        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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$LIBFONTS_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-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
-  :
+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 :
+
 else
-  { { echo "$as_me:$LINENO: error: libfonts.jar not found." >&5
-echo "$as_me: error: libfonts.jar not found." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "libfonts.jar not found." "$LINENO" 5
 fi
 
       fi
 
       if test -z $LIBSERIALIZER_JAR; then
-        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
+        { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 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
-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
+{ $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 :
    LIBSERIALIZER_JAR=/usr/share/java/libserializer-1.0.0.jar
 else
 
-            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
+            { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 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
-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
+{ $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 :
    LIBSERIALIZER_JAR=/usr/share/java/libserializer.jar
 else
-  { { 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; }; }
+  as_fn_error "libserializer.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -26349,80 +20668,72 @@ fi
 fi
 
       else
-        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
+        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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$LIBSERIALIZER_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-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
-  :
+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 :
+
 else
-  { { echo "$as_me:$LINENO: error: libserializer.jar not found." >&5
-echo "$as_me: error: libserializer.jar not found." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "libserializer.jar not found." "$LINENO" 5
 fi
 
       fi
 
 
       if test -z $LIBBASE_JAR; then
-        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
+        { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 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
-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
+{ $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 :
    LIBBASE_JAR=/usr/share/java/libbase-1.0.0.jar
 else
 
-            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
+            { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 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
-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
+{ $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 :
    LIBBASE_JAR=/usr/share/java/libbase.jar
 else
-  { { 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; }; }
+  as_fn_error "libbase.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -26431,54 +20742,50 @@ fi
 fi
 
       else
-        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
+        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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$LIBBASE_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-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
-  :
+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 :
+
 else
-  { { echo "$as_me:$LINENO: error: libbase.jar not found." >&5
-echo "$as_me: error: libbase.jar not found." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "libbase.jar not found." "$LINENO" 5
 fi
 
       fi
 
   else
-     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
+     { $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; }
      if test -d ./jfreereport; then
-      echo "$as_me:$LINENO: result: OK" >&5
-echo "${ECHO_T}OK" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
+$as_echo "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; }; }
+      as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
      fi
      SYSTEM_JFREEREPORT=NO
      BUILD_TYPE="$BUILD_TYPE JFREEREPORT"
   fi
   BUILD_TYPE="$BUILD_TYPE REPORTBUILDER"
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   ENABLE_REPORTBUILDER=NO
   SYSTEM_JFREEREPORT=NO
 fi
@@ -26499,58 +20806,52 @@ 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
-  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
+  { $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; }
   if test "$with_system_apache_commons" = "yes"; then
     SYSTEM_APACHE_COMMONS=YES
-    echo "$as_me:$LINENO: result: external" >&5
-echo "${ECHO_T}external" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
     if test "$ENABLE_MEDIAWIKI" = "YES"; then
       if test -z $COMMONS_CODEC_JAR; then
-        echo "$as_me:$LINENO: checking for /usr/share/java/commons-codec-1.3.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/commons-codec-1.3.jar... $ECHO_C" >&6
-if test "${ac_cv_file__usr_share_java_commons_codec_1_3_jar+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/commons-codec-1.3.jar"; then
   ac_cv_file__usr_share_java_commons_codec_1_3_jar=yes
 else
   ac_cv_file__usr_share_java_commons_codec_1_3_jar=no
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_codec_1_3_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_codec_1_3_jar" >&6
-if test $ac_cv_file__usr_share_java_commons_codec_1_3_jar = yes; then
+{ $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 :
    COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar
 else
 
-            echo "$as_me:$LINENO: checking for /usr/share/java/commons-codec.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/commons-codec.jar... $ECHO_C" >&6
-if test "${ac_cv_file__usr_share_java_commons_codec_jar+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+            { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/commons-codec.jar"; then
   ac_cv_file__usr_share_java_commons_codec_jar=yes
 else
   ac_cv_file__usr_share_java_commons_codec_jar=no
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_codec_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_codec_jar" >&6
-if test $ac_cv_file__usr_share_java_commons_codec_jar = yes; then
+{ $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 :
    COMMONS_CODEC_JAR=/usr/share/java/commons-codecs.jar
 else
-  { { echo "$as_me:$LINENO: error: commons-codec.jar replacement not found." >&5
-echo "$as_me: error: commons-codec.jar replacement not found." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "commons-codec.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -26559,79 +20860,71 @@ fi
 fi
 
       else
-        as_ac_File=`echo "ac_cv_file_$COMMONS_CODEC_JAR" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $COMMONS_CODEC_JAR" >&5
-echo $ECHO_N "checking for $COMMONS_CODEC_JAR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$COMMONS_CODEC_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-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
-  :
+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 :
+
 else
-  { { 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; }; }
+  as_fn_error "commons-codec.jar not found." "$LINENO" 5
 fi
 
       fi
 
       if test -z $COMMONS_LANG_JAR; then
-        echo "$as_me:$LINENO: checking for /usr/share/java/commons-lang-2.3.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/commons-lang-2.3.jar... $ECHO_C" >&6
-if test "${ac_cv_file__usr_share_java_commons_lang_2_3_jar+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/commons-lang-2.3.jar"; then
   ac_cv_file__usr_share_java_commons_lang_2_3_jar=yes
 else
   ac_cv_file__usr_share_java_commons_lang_2_3_jar=no
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_lang_2_3_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_lang_2_3_jar" >&6
-if test $ac_cv_file__usr_share_java_commons_lang_2_3_jar = yes; then
+{ $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 :
    COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar
 else
 
-            echo "$as_me:$LINENO: checking for /usr/share/java/commons-lang.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/commons-lang.jar... $ECHO_C" >&6
-if test "${ac_cv_file__usr_share_java_commons_lang_jar+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+            { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/commons-lang.jar"; then
   ac_cv_file__usr_share_java_commons_lang_jar=yes
 else
   ac_cv_file__usr_share_java_commons_lang_jar=no
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_lang_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_lang_jar" >&6
-if test $ac_cv_file__usr_share_java_commons_lang_jar = yes; then
+{ $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 :
    COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar
 else
-  { { echo "$as_me:$LINENO: error: commons-lang.jar replacement not found." >&5
-echo "$as_me: error: commons-lang.jar replacement not found." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "commons-lang.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -26640,79 +20933,71 @@ fi
 fi
 
       else
-        as_ac_File=`echo "ac_cv_file_$COMMONS_LANG_JAR" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $COMMONS_LANG_JAR" >&5
-echo $ECHO_N "checking for $COMMONS_LANG_JAR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$COMMONS_LANG_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-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
-  :
+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 :
+
 else
-  { { 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; }; }
+  as_fn_error "commons-lang.jar not found." "$LINENO" 5
 fi
 
       fi
 
       if test -z $COMMONS_HTTPCLIENT_JAR; then
-        echo "$as_me:$LINENO: checking for /usr/share/java/commons-httpclient-3.1.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/commons-httpclient-3.1.jar... $ECHO_C" >&6
-if test "${ac_cv_file__usr_share_java_commons_httpclient_3_1_jar+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/commons-httpclient-3.1.jar"; then
   ac_cv_file__usr_share_java_commons_httpclient_3_1_jar=yes
 else
   ac_cv_file__usr_share_java_commons_httpclient_3_1_jar=no
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_httpclient_3_1_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_httpclient_3_1_jar" >&6
-if test $ac_cv_file__usr_share_java_commons_httpclient_3_1_jar = yes; then
+{ $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 :
    COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar
 else
 
-            echo "$as_me:$LINENO: checking for /usr/share/java/commons-httpclient.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/commons-httpclient.jar... $ECHO_C" >&6
-if test "${ac_cv_file__usr_share_java_commons_httpclient_jar+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+            { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/commons-httpclient.jar"; then
   ac_cv_file__usr_share_java_commons_httpclient_jar=yes
 else
   ac_cv_file__usr_share_java_commons_httpclient_jar=no
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_httpclient_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_httpclient_jar" >&6
-if test $ac_cv_file__usr_share_java_commons_httpclient_jar = yes; then
+{ $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 :
    COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient.jar
 else
-  { { echo "$as_me:$LINENO: error: commons-httpclient.jar replacement not found." >&5
-echo "$as_me: error: commons-httpclient.jar replacement not found." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "commons-httpclient.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -26721,80 +21006,72 @@ fi
 fi
 
       else
-        as_ac_File=`echo "ac_cv_file_$COMMONS_HTTPCLIENT_JAR" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $COMMONS_HTTPCLIENT_JAR" >&5
-echo $ECHO_N "checking for $COMMONS_HTTPCLIENT_JAR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$COMMONS_HTTPCLIENT_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-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
-  :
+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 :
+
 else
-  { { 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; }; }
+  as_fn_error "commons-httpclient.jar not found." "$LINENO" 5
 fi
 
       fi
     fi
     if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
       if test -z $COMMONS_LOGGING_JAR; then
-        echo "$as_me:$LINENO: checking for /usr/share/java/commons-logging-1.1.1.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/commons-logging-1.1.1.jar... $ECHO_C" >&6
-if test "${ac_cv_file__usr_share_java_commons_logging_1_1_1_jar+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/commons-logging-1.1.1.jar"; then
   ac_cv_file__usr_share_java_commons_logging_1_1_1_jar=yes
 else
   ac_cv_file__usr_share_java_commons_logging_1_1_1_jar=no
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" >&6
-if test $ac_cv_file__usr_share_java_commons_logging_1_1_1_jar = yes; then
+{ $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 :
    COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar
 else
 
-            echo "$as_me:$LINENO: checking for /usr/share/java/commons-logging.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/commons-logging.jar... $ECHO_C" >&6
-if test "${ac_cv_file__usr_share_java_commons_logging_jar+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+            { $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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/commons-logging.jar"; then
   ac_cv_file__usr_share_java_commons_logging_jar=yes
 else
   ac_cv_file__usr_share_java_commons_logging_jar=no
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_logging_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_logging_jar" >&6
-if test $ac_cv_file__usr_share_java_commons_logging_jar = yes; then
+{ $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 :
    COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar
 else
-  { { echo "$as_me:$LINENO: error: commons-logging.jar replacement not found." >&5
-echo "$as_me: error: commons-logging.jar replacement not found." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "commons-logging.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -26803,37 +21080,35 @@ fi
 fi
 
       else
-        as_ac_File=`echo "ac_cv_file_$COMMONS_LOGGING_JAR" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $COMMONS_LOGGING_JAR" >&5
-echo $ECHO_N "checking for $COMMONS_LOGGING_JAR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        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
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$COMMONS_LOGGING_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-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
-  :
+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 :
+
 else
-  { { 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; }; }
+  as_fn_error "commons-logging.jar not found." "$LINENO" 5
 fi
 
       fi
     fi
   else
-    echo "$as_me:$LINENO: result: internal" >&5
-echo "${ECHO_T}internal" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
     SYSTEM_APACHE_COMMONS=NO
     BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
   fi
@@ -26885,8 +21160,8 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
     kde_test_include="ksharedptr.h"
     kde_test_library="libkdeui.so"
 
-        echo "$as_me:$LINENO: checking for Qt headers" >&5
-echo $ECHO_N "checking for Qt headers... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt headers" >&5
+$as_echo_n "checking for Qt headers... " >&6; }
     qt_incdir="no"
     for kde_check in $qt_incdirs ; do
         if test -r "$kde_check/$qt_test_include" ; then
@@ -26894,18 +21169,15 @@ echo $ECHO_N "checking for Qt headers... $ECHO_C" >&6
             break
         fi
     done
-    echo "$as_me:$LINENO: result: $qt_incdir" >&5
-echo "${ECHO_T}$qt_incdir" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt_incdir" >&5
+$as_echo "$qt_incdir" >&6; }
     if test "x$qt_incdir" = "xno" ; then
-        { { 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; }; }
+        as_fn_error "Qt headers not found.  Please specify the root of
+your Qt installation by exporting QTDIR before running \"configure\"." "$LINENO" 5
     fi
 
-        echo "$as_me:$LINENO: checking for Qt libraries" >&5
-echo $ECHO_N "checking for Qt libraries... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt libraries" >&5
+$as_echo_n "checking for Qt libraries... " >&6; }
     qt_libdir="no"
     for qt_check in $qt_libdirs ; do
         if test -r "$qt_check/$qt_test_library" ; then
@@ -26913,22 +21185,19 @@ echo $ECHO_N "checking for Qt libraries... $ECHO_C" >&6
             break
         fi
     done
-    echo "$as_me:$LINENO: result: $qt_libdir" >&5
-echo "${ECHO_T}$qt_libdir" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt_libdir" >&5
+$as_echo "$qt_libdir" >&6; }
     if test "x$qt_libdir" = "xno" ; then
-        { { 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; }; }
+        as_fn_error "Qt libraries not found.  Please specify the root of
+your Qt installation by exporting QTDIR before running \"configure\"." "$LINENO" 5
     fi
 
         # Extract the first word of "moc", so it can be a program name with args.
 set dummy moc; 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_MOC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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
 else
   case $MOC in
   [\\/]* | ?:[\\/]*)
@@ -26941,39 +21210,37 @@ for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_MOC="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="no"
   ;;
 esac
 fi
 MOC=$ac_cv_path_MOC
-
 if test -n "$MOC"; then
-  echo "$as_me:$LINENO: result: $MOC" >&5
-echo "${ECHO_T}$MOC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOC" >&5
+$as_echo "$MOC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
     if test "$MOC" = "no" ; then
-        { { 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; }; }
+        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
     fi
 
-        echo "$as_me:$LINENO: checking for KDE headers" >&5
-echo $ECHO_N "checking for KDE headers... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KDE headers" >&5
+$as_echo_n "checking for KDE headers... " >&6; }
     kde_incdir="no"
     for kde_check in $kde_incdirs ; do
         if test -r "$kde_check/$kde_test_include" ; then
@@ -26981,18 +21248,15 @@ echo $ECHO_N "checking for KDE headers... $ECHO_C" >&6
             break
         fi
     done
-    echo "$as_me:$LINENO: result: $kde_incdir" >&5
-echo "${ECHO_T}$kde_incdir" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kde_incdir" >&5
+$as_echo "$kde_incdir" >&6; }
     if test "x$kde_incdir" = "xno" ; then
-        { { 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; }; }
+        as_fn_error "KDE headers not found.  Please specify the root of
+your KDE installation by exporting KDEDIR before running \"configure\"." "$LINENO" 5
     fi
 
-        echo "$as_me:$LINENO: checking for KDE libraries" >&5
-echo $ECHO_N "checking for KDE libraries... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KDE libraries" >&5
+$as_echo_n "checking for KDE libraries... " >&6; }
     kde_libdir="no"
     for kde_check in $kde_libdirs ; do
         if test -r "$kde_check/$kde_test_library" ; then
@@ -27000,14 +21264,11 @@ echo $ECHO_N "checking for KDE libraries... $ECHO_C" >&6
             break
         fi
     done
-    echo "$as_me:$LINENO: result: $kde_libdir" >&5
-echo "${ECHO_T}$kde_libdir" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kde_libdir" >&5
+$as_echo "$kde_libdir" >&6; }
     if test "x$kde_libdir" = "xno" ; then
-        { { 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; }; }
+        as_fn_error "KDE libraries not found.  Please specify the root of
+your KDE installation by exporting KDEDIR before running \"configure\"." "$LINENO" 5
     fi
 
         KDE_CFLAGS="-I$qt_incdir -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
@@ -27047,8 +21308,8 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
    kde_test_include="ksharedptr.h"
    kde_test_library="libkdeui.so"
 
-   echo "$as_me:$LINENO: checking for Qt4 headers" >&5
-echo $ECHO_N "checking for Qt4 headers... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt4 headers" >&5
+$as_echo_n "checking for Qt4 headers... " >&6; }
    qt_header_dir="no"
    for inc_dir in $qt_incdirs ; do
       if test -r "$inc_dir/$qt_test_include" ; then
@@ -27057,16 +21318,14 @@ echo $ECHO_N "checking for Qt4 headers... $ECHO_C" >&6
       fi
    done
 
-   echo "$as_me:$LINENO: result: $qt_header_dir" >&5
-echo "${ECHO_T}$qt_header_dir" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt_header_dir" >&5
+$as_echo "$qt_header_dir" >&6; }
    if test "x$qt_header_dir" = "xno" ; then
-      { { 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; }; }
+      as_fn_error "Qt4 headers not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." "$LINENO" 5
    fi
 
-   echo "$as_me:$LINENO: checking for Qt4 libraries" >&5
-echo $ECHO_N "checking for Qt4 libraries... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt4 libraries" >&5
+$as_echo_n "checking for Qt4 libraries... " >&6; }
    qt_lib_dir="no"
    for lib_dir in $qt_libdirs ; do
       if test -r "$lib_dir/$qt_test_library" ; then
@@ -27075,21 +21334,19 @@ echo $ECHO_N "checking for Qt4 libraries... $ECHO_C" >&6
       fi
    done
 
-   echo "$as_me:$LINENO: result: $qt_lib_dir" >&5
-echo "${ECHO_T}$qt_lib_dir" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt_lib_dir" >&5
+$as_echo "$qt_lib_dir" >&6; }
 
    if test "x$qt_lib_dir" = "xno" ; then
-      { { 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; }; }
+      as_fn_error "Qt4 libraries not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." "$LINENO" 5
    fi
 
       # Extract the first word of "moc", so it can be a program name with args.
 set dummy moc; 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_MOC4+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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
 else
   case $MOC4 in
   [\\/]* | ?:[\\/]*)
@@ -27102,39 +21359,37 @@ for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_MOC4="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_MOC4" && ac_cv_path_MOC4="no"
   ;;
 esac
 fi
 MOC4=$ac_cv_path_MOC4
-
 if test -n "$MOC4"; then
-  echo "$as_me:$LINENO: result: $MOC4" >&5
-echo "${ECHO_T}$MOC4" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOC4" >&5
+$as_echo "$MOC4" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
    if test "$MOC4" = "no" ; then
-      { { 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; }; }
+      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
    fi
 
-      echo "$as_me:$LINENO: checking for KDE4 headers" >&5
-echo $ECHO_N "checking for KDE4 headers... $ECHO_C" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KDE4 headers" >&5
+$as_echo_n "checking for KDE4 headers... " >&6; }
    kde_incdir="no"
    for kde_check in $kde_incdirs ; do
       if test -r "$kde_check/$kde_test_include" ; then
@@ -27142,16 +21397,14 @@ echo $ECHO_N "checking for KDE4 headers... $ECHO_C" >&6
          break
       fi
    done
-   echo "$as_me:$LINENO: result: $kde_incdir" >&5
-echo "${ECHO_T}$kde_incdir" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kde_incdir" >&5
+$as_echo "$kde_incdir" >&6; }
    if test "x$kde_incdir" = "xno" ; then
-      { { 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; }; }
+      as_fn_error "KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." "$LINENO" 5
    fi
 
-      echo "$as_me:$LINENO: checking for KDE4 libraries" >&5
-echo $ECHO_N "checking for KDE4 libraries... $ECHO_C" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KDE4 libraries" >&5
+$as_echo_n "checking for KDE4 libraries... " >&6; }
    kde_libdir="no"
    for kde_check in $kde_libdirs ; do
       if test -r "$kde_check/$kde_test_library" ; then
@@ -27160,12 +21413,10 @@ echo $ECHO_N "checking for KDE4 libraries... $ECHO_C" >&6
       fi
    done
 
-   echo "$as_me:$LINENO: result: $kde_libdir" >&5
-echo "${ECHO_T}$kde_libdir" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kde_libdir" >&5
+$as_echo "$kde_libdir" >&6; }
    if test "x$kde_libdir" = "xno" ; then
-      { { 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; }; }
+      as_fn_error "KDE4 libraries not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." "$LINENO" 5
    fi
 
    KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
@@ -27175,34 +21426,34 @@ fi
 
 
 
-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
+{ $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; }
 ENABLE_LOCKDOWN=""
 if test -n "$enable_lockdown" && test "$enable_lockdown" != "no"; then
   ENABLE_LOCKDOWN=YES
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
-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
+{ $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; }
 if test "$enable_evolution2" = "yes" -o "$enable_evolution2" = "TRUE"; then
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "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
-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
+{ $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
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -27214,29 +21465,30 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$PKG_CONFIG" = "no" ; then
@@ -27247,25 +21499,25 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for gobject-2.0" >&5
-echo $ECHO_N "checking for gobject-2.0... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-2.0" >&5
+$as_echo_n "checking for gobject-2.0... " >&6; }
 
         if $PKG_CONFIG --exists "gobject-2.0" ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking GOBJECT_CFLAGS" >&5
-echo $ECHO_N "checking GOBJECT_CFLAGS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GOBJECT_CFLAGS" >&5
+$as_echo_n "checking GOBJECT_CFLAGS... " >&6; }
             GOBJECT_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0"`
-            echo "$as_me:$LINENO: result: $GOBJECT_CFLAGS" >&5
-echo "${ECHO_T}$GOBJECT_CFLAGS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GOBJECT_CFLAGS" >&5
+$as_echo "$GOBJECT_CFLAGS" >&6; }
 
-            echo "$as_me:$LINENO: checking GOBJECT_LIBS" >&5
-echo $ECHO_N "checking GOBJECT_LIBS... $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GOBJECT_LIBS" >&5
+$as_echo_n "checking GOBJECT_LIBS... " >&6; }
             GOBJECT_LIBS=`$PKG_CONFIG --libs "gobject-2.0"`
-            echo "$as_me:$LINENO: result: $GOBJECT_LIBS" >&5
-echo "${ECHO_T}$GOBJECT_LIBS" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GOBJECT_LIBS" >&5
+$as_echo "$GOBJECT_LIBS" >&6; }
         else
             GOBJECT_CFLAGS=""
             GOBJECT_LIBS=""
@@ -27286,27 +21538,25 @@ echo "${ECHO_T}$GOBJECT_LIBS" >&6
   if test $succeeded = yes; then
      :
   else
-     { { 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; }; }
+     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
   fi
 
    ENABLE_EVOAB2="TRUE"
 else
    ENABLE_EVOAB2=""
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 
 
-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
+{ $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; }
 if test "$enable_kdeab" = "yes" && test "$enable_kde" = "yes"; then
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-   ac_ext=cc
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+   ac_ext=cpp
 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'
@@ -27314,20 +21564,15 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
    save_CXXFLAGS=$CXXFLAGS
    CXXFLAGS="$CXXFLAGS $KDE_CFLAGS"
-   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
+   { $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
 /* end confdefs.h.  */
 
 #include <kdeversion.h>
@@ -27338,31 +21583,16 @@ int main(int argc, char **argv) {
 }
 
 _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: yes" >&5
-echo "${ECHO_T}yes" >&6
+if ac_fn_cxx_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&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: 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; }; }
+  as_fn_error "KDE version too old or too recent, please use another version of KDE or disable KDE address book support" "$LINENO" 5
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
+
    CXXFLAGS=$save_CXXFLAGS
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -27372,66 +21602,66 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
    ENABLE_KAB=TRUE
 else
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
    ENABLE_KAB=
 fi
 
 
-echo "$as_me:$LINENO: checking whether to include MathMLDTD" >&5
-echo $ECHO_N "checking whether to include MathMLDTD... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include MathMLDTD" >&5
+$as_echo_n "checking whether to include MathMLDTD... " >&6; }
 if test -n "$enable_mathmldtd"; then
   if test "$enable_mathmldtd" = "no"; then
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD"
   else
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     BUILD_TYPE="$BUILD_TYPE MATHMLDTD"
   fi
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD"
 fi
 
-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
+{ $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; }
 if test "$with_fonts" != "no" ; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   WITH_FONTS=YES
   BUILD_TYPE="$BUILD_TYPE BITSTREAM_VERA_FONTS"
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   WITH_FONTS=NO
   SCPDEFS="$SCPDEFS -DWITHOUT_FONTS"
 fi
 
 
-echo "$as_me:$LINENO: checking whether to include PPDs" >&5
-echo $ECHO_N "checking whether to include PPDs... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include PPDs" >&5
+$as_echo_n "checking whether to include PPDs... " >&6; }
 if test "$with_ppds" != "no"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   WITHOUT_PPDS=YES
   SCPDEFS="$SCPDEFS -DWITHOUT_PPDS"
 fi
 
 
-echo "$as_me:$LINENO: checking whether to include AFMs" >&5
-echo $ECHO_N "checking whether to include AFMs... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include AFMs" >&5
+$as_echo_n "checking whether to include AFMs... " >&6; }
 if test "$with_afms" != "no"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   WITHOUT_AFMS=YES
   SCPDEFS="$SCPDEFS -DWITHOUT_AFMS"
 fi
@@ -27439,13 +21669,13 @@ fi
 
 
 
-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
+{ $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; }
 if test "$_os" = "Darwin"; then
    USE_XINERAMA=YES
    XINERAMA_LINK=dynamic
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "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
@@ -27475,151 +21705,13 @@ elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
       XINERAMA_LINK=none
    fi
    if test "$USE_XINERAMA" = "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
+      { $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 :
 
-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
-  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; }; }
+  as_fn_error "Xinerama header not found." "$LINENO" 5
 fi
 
 
@@ -27630,72 +21722,43 @@ fi
       if test "$_os" = "Linux"; then
           XINERAMA_EXTRA_LIBS="$XINERAMA_EXTRA_LIBS -ldl"
       fi
-
-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
+      { $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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXinerama $XINERAMA_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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
-/* 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 ()
 {
-XineramaIsActive ();
+return XineramaIsActive ();
   ;
   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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_Xinerama_XineramaIsActive=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_Xinerama_XineramaIsActive=no
+  ac_cv_lib_Xinerama_XineramaIsActive=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core 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_Xinerama_XineramaIsActive" >&5
-echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaIsActive" >&6
-if test $ac_cv_lib_Xinerama_XineramaIsActive = yes; then
+{ $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 :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBXINERAMA 1
 _ACEOF
@@ -27703,18 +21766,16 @@ _ACEOF
   LIBS="-lXinerama $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: Xinerama not functional?" >&5
-echo "$as_me: error: Xinerama not functional?" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "Xinerama not functional?" "$LINENO" 5
 fi
 
    else
-      echo "$as_me:$LINENO: result: no, libXinerama not found or wrong architecture." >&5
-echo "${ECHO_T}no, libXinerama not found or wrong architecture." >&6
+      { $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; }
    fi
 else
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -27728,10 +21789,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
-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
+{ $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
 else
   case $ANT in
   [\\/]* | ?:[\\/]*)
@@ -27743,28 +21804,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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ANT="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 ANT=$ac_cv_path_ANT
-
 if test -n "$ANT"; then
-  echo "$as_me:$LINENO: result: $ANT" >&5
-echo "${ECHO_T}$ANT" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ANT" >&5
+$as_echo "$ANT" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   test -n "$ANT" && break
 done
 
@@ -27776,10 +21838,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
-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
+{ $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
 else
   case $ANT in
   [\\/]* | ?:[\\/]*)
@@ -27792,28 +21854,29 @@ for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ANT="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 ANT=$ac_cv_path_ANT
-
 if test -n "$ANT"; then
-  echo "$as_me:$LINENO: result: $ANT" >&5
-echo "${ECHO_T}$ANT" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ANT" >&5
+$as_echo "$ANT" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   test -n "$ANT" && break
 done
 
@@ -27822,9 +21885,7 @@ done
 fi
 
 if test -z "$ANT"; then
-  { { 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; }; }
+  as_fn_error "Ant not found - Make sure it's in the path or use --with-ant-home" "$LINENO" 5
 else
   # resolve relative or absolute symlink
   while test -h "$ANT"; do
@@ -27849,8 +21910,8 @@ else
   fi
   ant_minminor1=`echo $ant_minver | cut -d"." -f2`
 
-  echo "$as_me:$LINENO: checking whether ant is >= $ant_minver" >&5
-echo $ECHO_N "checking whether ant is >= $ant_minver... $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ant is >= $ant_minver" >&5
+$as_echo_n "checking whether ant is >= $ant_minver... " >&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`
@@ -27858,18 +21919,16 @@ 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
-  	echo "$as_me:$LINENO: result: yes, $ant_version" >&5
-echo "${ECHO_T}yes, $ant_version" >&6
+  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, $ant_version" >&5
+$as_echo "yes, $ant_version" >&6; }
   elif test "$ant_version_major" = "1" && test "$ant_version_minor" -ge "$ant_minminor1"; then
-  	echo "$as_me:$LINENO: result: yes, $ant_version" >&5
-echo "${ECHO_T}yes, $ant_version" >&6
+  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, $ant_version" >&5
+$as_echo "yes, $ant_version" >&6; }
   else
-  	{ { 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; }; }
+  	as_fn_error "no, you need at least ant >= $ant_minver" "$LINENO" 5
   fi
-  echo "$as_me:$LINENO: checking if $ANT works" >&5
-echo $ECHO_N "checking if $ANT works... $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $ANT works" >&5
+$as_echo_n "checking if $ANT works... " >&6; }
 cat > conftest.java << EOF
     public class conftest {
 	int testmethod(int a, int b) {
@@ -27893,14 +21952,14 @@ EOF
   else
     ant_cmd="$ANT -buildfile conftest.xml 1>&2"
   fi
-  { (eval echo "$as_me:$LINENO: \"$ant_cmd\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ant_cmd\""; } >&5
   (eval $ant_cmd) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
   if test $? = 0 && test -f ./conftest.class ; then
-    echo "$as_me:$LINENO: result: Ant works" >&5
-echo "${ECHO_T}Ant works" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Ant works" >&5
+$as_echo "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
@@ -27913,8 +21972,8 @@ echo "${ECHO_T}Ant works" >&6
     echo "configure: Ant test failed" >&5
     cat conftest.java >&5
     cat conftest.xml >&5
-    { 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;}
+    { $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;}
     ANT_HOME=""
     echo "Ant does not work - Some Java projects will not build!" >>warn
   fi
@@ -27927,8 +21986,8 @@ fi
 
 
 if test "$ANT_HOME" != "NO_ANT_HOME"; then
-   echo "$as_me:$LINENO: checking Ant lib directory" >&5
-echo $ECHO_N "checking Ant lib directory... $ECHO_C" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking Ant lib directory" >&5
+$as_echo_n "checking Ant lib directory... " >&6; }
    if test -f $ANT_HOME/lib/ant.jar; then
 	  ANT_LIB="$ANT_HOME/lib"
    else
@@ -27944,23 +22003,21 @@ echo $ECHO_N "checking Ant lib directory... $ECHO_C" >&6
                 if test -f $ANT_HOME/lib/ant/ant.jar; then
                     ANT_LIB="$ANT_HOME/lib/ant"
                 else
-                    { { echo "$as_me:$LINENO: error: Ant libraries not found!" >&5
-echo "$as_me: error: Ant libraries not found!" >&2;}
-   { (exit 1); exit 1; }; }
+                    as_fn_error "Ant libraries not found!" "$LINENO" 5
                 fi
              fi
           fi
       fi
    fi
-   echo "$as_me:$LINENO: result: Ant lib directory found." >&5
-echo "${ECHO_T}Ant lib directory found." >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: Ant lib directory found." >&5
+$as_echo "Ant lib directory found." >&6; }
 fi
 
 fi
 
 if test "$ENABLE_MEDIAWIKI" = "YES"; then
-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
+{ $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; }
 rm -rf confdir
 mkdir confdir
 cat > conftest.java << EOF
@@ -27992,181 +22049,179 @@ EOF
   else
     ant_cmd="$ANT -buildfile conftest.xml 1>&2"
   fi
-  { (eval echo "$as_me:$LINENO: \"$ant_cmd\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ant_cmd\""; } >&5
   (eval $ant_cmd) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
   if test $? = 0 && test -f ./conftest.class ; then
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     rm -rf confdir
   else
     echo "configure: Ant test failed" >&5
     cat conftest.java >&5
     cat conftest.xml >&5
     rm -rf confdir
-    { { 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; }; }
+    as_fn_error "no. Did you install ant-apache-regexp?" "$LINENO" 5
   fi
 fi
 rm -f conftest* core core.* *.core
 
-echo "$as_me:$LINENO: checking which languages to be built" >&5
-echo $ECHO_N "checking which languages to be built... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which languages to be built" >&5
+$as_echo_n "checking which languages to be built... " >&6; }
 WITH_LANG="$with_lang"
 if test -z "$WITH_LANG"; then
-   echo "$as_me:$LINENO: result: en-US" >&5
-echo "${ECHO_T}en-US" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: en-US" >&5
+$as_echo "en-US" >&6; }
 else
-   echo "$as_me:$LINENO: result: $WITH_LANG" >&5
-echo "${ECHO_T}$WITH_LANG" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WITH_LANG" >&5
+$as_echo "$WITH_LANG" >&6; }
 fi
 
 
-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
+{ $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; }
 WITH_POOR_HELP_LOCALIZATIONS="$with_poor_help_localizations"
 if test -z "$WITH_POOR_HELP_LOCALIZATIONS"; then
-   echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
 else
-   echo "$as_me:$LINENO: result: $WITH_POOR_HELP_LOCALIZATIONS" >&5
-echo "${ECHO_T}$WITH_POOR_HELP_LOCALIZATIONS" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WITH_POOR_HELP_LOCALIZATIONS" >&5
+$as_echo "$WITH_POOR_HELP_LOCALIZATIONS" >&6; }
 fi
 
 
-echo "$as_me:$LINENO: checking which dictionaries to include" >&5
-echo $ECHO_N "checking which dictionaries to include... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which dictionaries to include" >&5
+$as_echo_n "checking which dictionaries to include... " >&6; }
 if test -z "$with_dict"; then
    WITH_DICT=,ALL,
-   echo "$as_me:$LINENO: result: ALL" >&5
-echo "${ECHO_T}ALL" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ALL" >&5
+$as_echo "ALL" >&6; }
 else
    WITH_DICT=","$with_dict","
-   echo "$as_me:$LINENO: result: $with_dict" >&5
-echo "${ECHO_T}$with_dict" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dict" >&5
+$as_echo "$with_dict" >&6; }
 fi
 
 
-echo "$as_me:$LINENO: checking for additional 'intro' bitmaps" >&5
-echo $ECHO_N "checking for additional 'intro' bitmaps... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for additional 'intro' bitmaps" >&5
+$as_echo_n "checking for additional 'intro' bitmaps... " >&6; }
 INTRO_BITMAPS=
 if test -z "$with_intro_bitmaps" -o "$with_intro_bitmaps" = "no" ; then
    INTRO_BITMAPS=
-   echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
 else
    for bitmap in `echo $with_intro_bitmaps | tr ',' ' '` ; do
       case "$bitmap" in
          *.bmp) ;;
-         *)     bitmap= ; { echo "$as_me:$LINENO: WARNING: Intro bitmaps should be .bmp files!" >&5
-echo "$as_me: WARNING: Intro bitmaps should be .bmp files!" >&2;} ;;
+         *)     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;} ;;
       esac
       if test -n "$bitmap" ; then
          INTRO_BITMAPS="$INTRO_BITMAPS $bitmap"
       fi
    done
-   echo "$as_me:$LINENO: result: $INTRO_BITMAPS" >&5
-echo "${ECHO_T}$INTRO_BITMAPS" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTRO_BITMAPS" >&5
+$as_echo "$INTRO_BITMAPS" >&6; }
 fi
 
 
-echo "$as_me:$LINENO: checking for additional 'about' bitmaps" >&5
-echo $ECHO_N "checking for additional 'about' bitmaps... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for additional 'about' bitmaps" >&5
+$as_echo_n "checking for additional 'about' bitmaps... " >&6; }
 ABOUT_BITMAPS=
 if test -z "$with_about_bitmaps" -o "$with_about_bitmaps" = "no" ; then
    ABOUT_BITMAPS=
-   echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
 else
    for bitmap in `echo $with_about_bitmaps | tr ',' ' '` ; do
       case "$bitmap" in
          *.bmp) ;;
-         *)     bitmap= ; { echo "$as_me:$LINENO: WARNING: About bitmaps should be .bmp files!" >&5
-echo "$as_me: WARNING: About bitmaps should be .bmp files!" >&2;} ;;
+         *)     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;} ;;
       esac
       if test -n "$bitmap" ; then
          ABOUT_BITMAPS="$ABOUT_BITMAPS $bitmap"
       fi
    done
-   echo "$as_me:$LINENO: result: $ABOUT_BITMAPS" >&5
-echo "${ECHO_T}$ABOUT_BITMAPS" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ABOUT_BITMAPS" >&5
+$as_echo "$ABOUT_BITMAPS" >&6; }
 fi
 
 
 OOO_VENDOR=
-echo "$as_me:$LINENO: checking for vendor" >&5
-echo $ECHO_N "checking for vendor... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for vendor" >&5
+$as_echo_n "checking for vendor... " >&6; }
 if test -z "$with_vendor" -o "$with_vendor" = "no" ; then
-   echo "$as_me:$LINENO: result: not set" >&5
-echo "${ECHO_T}not set" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5
+$as_echo "not set" >&6; }
 else
    OOO_VENDOR="$with_vendor"
-   echo "$as_me:$LINENO: result: $OOO_VENDOR" >&5
-echo "${ECHO_T}$OOO_VENDOR" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OOO_VENDOR" >&5
+$as_echo "$OOO_VENDOR" >&6; }
 fi
 
 
 UNIXWRAPPERNAME=
-echo "$as_me:$LINENO: checking for UNIX wrapper name" >&5
-echo $ECHO_N "checking for UNIX wrapper name... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UNIX wrapper name" >&5
+$as_echo_n "checking for UNIX wrapper name... " >&6; }
 if test -z "$with_unix_wrapper" -o "$with_unix_wrapper" = "no"  -o "$with_unix_wrapper" = "yes" ; then
-   echo "$as_me:$LINENO: result: not set" >&5
-echo "${ECHO_T}not set" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5
+$as_echo "not set" >&6; }
 else
    UNIXWRAPPERNAME="$with_unix_wrapper"
-   echo "$as_me:$LINENO: result: $UNIXWRAPPERNAME" >&5
-echo "${ECHO_T}$UNIXWRAPPERNAME" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNIXWRAPPERNAME" >&5
+$as_echo "$UNIXWRAPPERNAME" >&6; }
 fi
 
 
-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
+{ $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; }
 if test -n "$enable_static_gtk" && test "$enable_static_gtk" != "no"; then
    ENABLE_STATIC_GTK="TRUE"
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
    ENABLE_STATIC_GTK="FALSE"
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
-echo "$as_me:$LINENO: checking whether to use layout dialogs" >&5
-echo $ECHO_N "checking whether to use layout dialogs... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use layout dialogs" >&5
+$as_echo_n "checking whether to use layout dialogs... " >&6; }
 if test -n "$enable_layout" && test "$enable_layout" != "no"; then
    ENABLE_LAYOUT="TRUE"
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
    ENABLE_LAYOUT="FALSE"
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 # ===================================================================
 # De- or increase default verbosity of build process
 # ===================================================================
-echo "$as_me:$LINENO: checking build verbosity" >&5
-echo $ECHO_N "checking build verbosity... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build verbosity" >&5
+$as_echo_n "checking build verbosity... " >&6; }
 if test -n "$enable_verbose"; then
    if test "$enable_verbose" == "yes"; then
       VERBOSE="TRUE"
-      echo "$as_me:$LINENO: result: high" >&5
-echo "${ECHO_T}high" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: high" >&5
+$as_echo "high" >&6; }
    fi
    if test "$enable_verbose" == "no"; then
       VERBOSE="FALSE"
-      echo "$as_me:$LINENO: result: low" >&5
-echo "${ECHO_T}low" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: low" >&5
+$as_echo "low" >&6; }
    fi
 else
-   echo "$as_me:$LINENO: result: not set" >&5
-echo "${ECHO_T}not set" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5
+$as_echo "not set" >&6; }
 fi
 
 
@@ -28177,22 +22232,20 @@ echo "*                                                                  *"
 echo "********************************************************************"
 
 if test -z "$COMPATH"; then
-   { { echo "$as_me:$LINENO: error: No compiler found." >&5
-echo "$as_me: error: No compiler found." >&2;}
-   { (exit 1); exit 1; }; }
+   as_fn_error "No compiler found." "$LINENO" 5
 fi
 
 
-echo "$as_me:$LINENO: checking solver path" >&5
-echo $ECHO_N "checking solver path... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking solver path" >&5
+$as_echo_n "checking solver path... " >&6; }
 if test -z "$with_local_solver"; then
    LOCAL_SOLVER="DEFAULT"
-   echo "$as_me:$LINENO: result: default" >&5
-echo "${ECHO_T}default" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: default" >&5
+$as_echo "default" >&6; }
 else
    LOCAL_SOLVER=$with_local_solver
-   echo "$as_me:$LINENO: result: $with_local_solver" >&5
-echo "${ECHO_T}$with_local_solver" >&6
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_local_solver" >&5
+$as_echo "$with_local_solver" >&6; }
 fi
 
 
@@ -28201,7 +22254,8 @@ 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
@@ -28220,39 +22274,59 @@ _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, don't put newlines in cache variables' values.
+# So, we kill variables containing newlines.
 # 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 `(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 \).
+    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 \.
       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 \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
-    esac;
-} |
+    esac |
+    sort
+) |
   sed '
+     /^ac_cv_env_/b end
      t clear
-     : clear
+     :clear
      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
      t end
-     /^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"
+     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;}
     cat confcache >$cache_file
   else
-    echo "not updating unwritable cache $cache_file"
+    { $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;}
   fi
 fi
 rm -f confcache
@@ -28261,63 +22335,54 @@ 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 we branch to the quote section.  Otherwise,
+# take arguments), then branch to the quote section.  Otherwise,
 # look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
+ac_script='
+:mline
+/\\$/{
+ N
+ s,\\\n,,
+ b mline
+}
 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
-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
+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`
 
 
 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_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'
+  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'
 done
 LIBOBJS=$ac_libobjs
 
@@ -28325,12 +22390,15 @@ 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"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $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
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -28340,81 +22408,252 @@ cat >$CONFIG_STATUS <<_ACEOF
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+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 :
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
 fi
-DUALCASE=1; export DUALCASE # for MKS sh
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# 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=';'
+  }
 fi
 
 
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+# 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
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-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
+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
   fi
-done
+  $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
 
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; 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
 
-# Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_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'
@@ -28422,148 +22661,123 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$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= ;;
+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';;
 esac
 
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
 else
-  as_expr=false
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
 fi
-
-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
+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
+    as_ln_s='cp -p'
   fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
 
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
-as_executable_p="test -f"
+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
 
 # 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'"
@@ -28572,31 +22786,20 @@ 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
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
+## ----------------------------------- ##
+## 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
 # report actual input values of CONFIG_FILES etc. instead of their
-# 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
-
+# values after options handling.
+ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
+generated by GNU Autoconf 2.64.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -28604,124 +22807,107 @@ generated by GNU Autoconf 2.59.  Invocation command line was
   CONFIG_COMMANDS = $CONFIG_COMMANDS
   $ $0 $@
 
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
 _ACEOF
 
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
 
-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
 
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+_ACEOF
 
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$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.
 
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
+  -V, --version    print version number and configuration settings, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
 
 Configuration files:
 $config_files
 
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
+Report bugs to the package provider."
 
-cat >>$CONFIG_STATUS <<_ACEOF
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.64,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-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.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 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 | --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 )
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_FILES " '$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.
-  -*) { { 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_error "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
 
-  *) ac_config_targets="$ac_config_targets $1" ;;
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
 
   esac
   shift
@@ -28735,31 +22921,45 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  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
+  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 "\$@"
 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
 
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
+# Handling of arguments.
 for ac_config_target in $ac_config_targets
 do
-  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; }; };;
+  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;;
   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
@@ -28769,668 +22969,403 @@ if $ac_need_defaults; then
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
+# simply because there is no reason against having it here, and in addition,
 # creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
+# 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'.
 $debug ||
 {
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
+  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
 }
-
 # Create a (secure) tmp directory for tmp files.
 
 {
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
   test -n "$tmp" && test -d "$tmp"
 }  ||
 {
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $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
+
+
+{
+  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//
+}
+' >>$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 = ""
+
+}
 {
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
+  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
 
-cat >>$CONFIG_STATUS <<_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
 
-#
-# CONFIG_FILES section.
-#
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
 
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@EGREP@,$EGREP,;t t
-s,@AWK@,$AWK,;t t
-s,@SED@,$SED,;t t
-s,@LOCAL_SOLENV@,$LOCAL_SOLENV,;t t
-s,@_solenv@,$_solenv,;t t
-s,@UPD@,$UPD,;t t
-s,@SOURCEVERSION@,$SOURCEVERSION,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@target@,$target,;t t
-s,@target_cpu@,$target_cpu,;t t
-s,@target_vendor@,$target_vendor,;t t
-s,@target_os@,$target_os,;t t
-s,@GNUTAR@,$GNUTAR,;t t
-s,@OSVERSION@,$OSVERSION,;t t
-s,@PTHREAD_CFLAGS@,$PTHREAD_CFLAGS,;t t
-s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t
-s,@ENABLE_CRASHDUMP@,$ENABLE_CRASHDUMP,;t t
-s,@VC_STANDARD@,$VC_STANDARD,;t t
-s,@ENABLE_WERROR@,$ENABLE_WERROR,;t t
-s,@ENABLE_DEBUG@,$ENABLE_DEBUG,;t t
-s,@PRODUCT@,$PRODUCT,;t t
-s,@PROFULLSWITCH@,$PROFULLSWITCH,;t t
-s,@PROEXT@,$PROEXT,;t t
-s,@ENABLE_SYMBOLS@,$ENABLE_SYMBOLS,;t t
-s,@DISABLE_STRIP@,$DISABLE_STRIP,;t t
-s,@ENABLE_CUPS@,$ENABLE_CUPS,;t t
-s,@ENABLE_FONTCONFIG@,$ENABLE_FONTCONFIG,;t t
-s,@WITH_BINFILTER@,$WITH_BINFILTER,;t t
-s,@ENABLE_DIRECTX@,$ENABLE_DIRECTX,;t t
-s,@DISABLE_ACTIVEX@,$DISABLE_ACTIVEX,;t t
-s,@DISABLE_ATL@,$DISABLE_ATL,;t t
-s,@ENABLE_RPATH@,$ENABLE_RPATH,;t t
-s,@WITH_MYSPELL_DICTS@,$WITH_MYSPELL_DICTS,;t t
-s,@SYSTEM_DICTS@,$SYSTEM_DICTS,;t t
-s,@DICT_SYSTEM_DIR@,$DICT_SYSTEM_DIR,;t t
-s,@HYPH_SYSTEM_DIR@,$HYPH_SYSTEM_DIR,;t t
-s,@THES_SYSTEM_DIR@,$THES_SYSTEM_DIR,;t t
-s,@USE_SHELL@,$USE_SHELL,;t t
-s,@WITH_MINGWIN@,$WITH_MINGWIN,;t t
-s,@SHELLPATH@,$SHELLPATH,;t t
-s,@GCC_HOME@,$GCC_HOME,;t t
-s,@CC@,$CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@OBJEXT@,$OBJEXT,;t t
-s,@COMPATH@,$COMPATH,;t t
-s,@GCCVER@,$GCCVER,;t t
-s,@HAVE_LD_BSYMBOLIC_FUNCTIONS@,$HAVE_LD_BSYMBOLIC_FUNCTIONS,;t t
-s,@ENABLE_PCH@,$ENABLE_PCH,;t t
-s,@NO_HIDS@,$NO_HIDS,;t t
-s,@GNUMAKE@,$GNUMAKE,;t t
-s,@_cc@,$_cc,;t t
-s,@HAVE_LD_HASH_STYLE@,$HAVE_LD_HASH_STYLE,;t t
-s,@PERL@,$PERL,;t t
-s,@MSPDB_PATH@,$MSPDB_PATH,;t t
-s,@COMEX@,$COMEX,;t t
-s,@USE_MINGW@,$USE_MINGW,;t t
-s,@MIDL_PATH@,$MIDL_PATH,;t t
-s,@CSC_PATH@,$CSC_PATH,;t t
-s,@FRAME_HOME@,$FRAME_HOME,;t t
-s,@CPP@,$CPP,;t t
-s,@CXX@,$CXX,;t t
-s,@CXXFLAGS@,$CXXFLAGS,;t t
-s,@ac_ct_CXX@,$ac_ct_CXX,;t t
-s,@CXXCPP@,$CXXCPP,;t t
-s,@SIZEOF_LONG@,$SIZEOF_LONG,;t t
-s,@WORDS_BIGENDIAN@,$WORDS_BIGENDIAN,;t t
-s,@LFS_CFLAGS@,$LFS_CFLAGS,;t t
-s,@ENABLE_VBA@,$ENABLE_VBA,;t t
-s,@VBA_EXTENSION@,$VBA_EXTENSION,;t t
-s,@PAM@,$PAM,;t t
-s,@NEW_SHADOW_API@,$NEW_SHADOW_API,;t t
-s,@PAM_LINK@,$PAM_LINK,;t t
-s,@CRYPT_LINK@,$CRYPT_LINK,;t t
-s,@GXX_INCLUDE_PATH@,$GXX_INCLUDE_PATH,;t t
-s,@MINGW_LIB_INCLUDE_PATH@,$MINGW_LIB_INCLUDE_PATH,;t t
-s,@MINGW_BACKWARD_INCLUDE_PATH@,$MINGW_BACKWARD_INCLUDE_PATH,;t t
-s,@MINGW_CLIB_DIR@,$MINGW_CLIB_DIR,;t t
-s,@MINGW_SHARED_GCCLIB@,$MINGW_SHARED_GCCLIB,;t t
-s,@MINGW_GCCLIB_EH@,$MINGW_GCCLIB_EH,;t t
-s,@MINGW_SHARED_GXXLIB@,$MINGW_SHARED_GXXLIB,;t t
-s,@MINGW_GCCDLL@,$MINGW_GCCDLL,;t t
-s,@MINGW_GXXDLL@,$MINGW_GXXDLL,;t t
-s,@EXCEPTIONS@,$EXCEPTIONS,;t t
-s,@STLPORT4@,$STLPORT4,;t t
-s,@STLPORT_VER@,$STLPORT_VER,;t t
-s,@USE_SYSTEM_STL@,$USE_SYSTEM_STL,;t t
-s,@USE_CCACHE@,$USE_CCACHE,;t t
-s,@CCACHE@,$CCACHE,;t t
-s,@HAVE_GCC_VISIBILITY_FEATURE@,$HAVE_GCC_VISIBILITY_FEATURE,;t t
-s,@ALLOC@,$ALLOC,;t t
-s,@BUILD_VER_STRING@,$BUILD_VER_STRING,;t t
-s,@SOLAR_JAVA@,$SOLAR_JAVA,;t t
-s,@JAVAINTERPRETER@,$JAVAINTERPRETER,;t t
-s,@JAVACOMPILER@,$JAVACOMPILER,;t t
-s,@JAVACISGCJ@,$JAVACISGCJ,;t t
-s,@JAVADOC@,$JAVADOC,;t t
-s,@AWTLIB@,$AWTLIB,;t t
-s,@JAVAAOTCOMPILER@,$JAVAAOTCOMPILER,;t t
-s,@JAVA_HOME@,$JAVA_HOME,;t t
-s,@JDK@,$JDK,;t t
-s,@JAVAFLAGS@,$JAVAFLAGS,;t t
-s,@DMAKE@,$DMAKE,;t t
-s,@BUILD_DMAKE@,$BUILD_DMAKE,;t t
-s,@EPM@,$EPM,;t t
-s,@DPKG@,$DPKG,;t t
-s,@PKGMK@,$PKGMK,;t t
-s,@BUILD_EPM@,$BUILD_EPM,;t t
-s,@PKGFORMAT@,$PKGFORMAT,;t t
-s,@RPM@,$RPM,;t t
-s,@GPERF@,$GPERF,;t t
-s,@MINGWCXX@,$MINGWCXX,;t t
-s,@ac_ct_MINGWCXX@,$ac_ct_MINGWCXX,;t t
-s,@MINGWSTRIP@,$MINGWSTRIP,;t t
-s,@ac_ct_MINGWSTRIP@,$ac_ct_MINGWSTRIP,;t t
-s,@BUILD_UNOWINREG@,$BUILD_UNOWINREG,;t t
-s,@BUILD_QADEVOOO@,$BUILD_QADEVOOO,;t t
-s,@SYSTEM_STDLIBS@,$SYSTEM_STDLIBS,;t t
-s,@SYSTEM_ZLIB@,$SYSTEM_ZLIB,;t t
-s,@SYSTEM_JPEG@,$SYSTEM_JPEG,;t t
-s,@SYSTEM_EXPAT@,$SYSTEM_EXPAT,;t t
-s,@PKG_CONFIG@,$PKG_CONFIG,;t t
-s,@LIBWPD_CFLAGS@,$LIBWPD_CFLAGS,;t t
-s,@LIBWPD_LIBS@,$LIBWPD_LIBS,;t t
-s,@SYSTEM_LIBWPD@,$SYSTEM_LIBWPD,;t t
-s,@FREETYPE_CFLAGS@,$FREETYPE_CFLAGS,;t t
-s,@FREETYPE_LIBS@,$FREETYPE_LIBS,;t t
-s,@USE_FT_EMBOLDEN@,$USE_FT_EMBOLDEN,;t t
-s,@LIBXSLT_CFLAGS@,$LIBXSLT_CFLAGS,;t t
-s,@LIBXSLT_LIBS@,$LIBXSLT_LIBS,;t t
-s,@XSLTPROC@,$XSLTPROC,;t t
-s,@SYSTEM_LIBXSLT@,$SYSTEM_LIBXSLT,;t t
-s,@LIBXML_CFLAGS@,$LIBXML_CFLAGS,;t t
-s,@LIBXML_LIBS@,$LIBXML_LIBS,;t t
-s,@SYSTEM_LIBXML@,$SYSTEM_LIBXML,;t t
-s,@PYTHON@,$PYTHON,;t t
-s,@PYTHON_VERSION@,$PYTHON_VERSION,;t t
-s,@PYTHON_PREFIX@,$PYTHON_PREFIX,;t t
-s,@PYTHON_EXEC_PREFIX@,$PYTHON_EXEC_PREFIX,;t t
-s,@PYTHON_PLATFORM@,$PYTHON_PLATFORM,;t t
-s,@pythondir@,$pythondir,;t t
-s,@pkgpythondir@,$pkgpythondir,;t t
-s,@pyexecdir@,$pyexecdir,;t t
-s,@pkgpyexecdir@,$pkgpyexecdir,;t t
-s,@BZIP2@,$BZIP2,;t t
-s,@SYSTEM_PYTHON@,$SYSTEM_PYTHON,;t t
-s,@PYTHON_CFLAGS@,$PYTHON_CFLAGS,;t t
-s,@PYTHON_LIBS@,$PYTHON_LIBS,;t t
-s,@HOME@,$HOME,;t t
-s,@SYSTEM_DB@,$SYSTEM_DB,;t t
-s,@DB_VERSION@,$DB_VERSION,;t t
-s,@DB_INCLUDES@,$DB_INCLUDES,;t t
-s,@DB_JAR@,$DB_JAR,;t t
-s,@SYSTEM_LUCENE@,$SYSTEM_LUCENE,;t t
-s,@LUCENE_CORE_JAR@,$LUCENE_CORE_JAR,;t t
-s,@LUCENE_ANALYZERS_JAR@,$LUCENE_ANALYZERS_JAR,;t t
-s,@SYSTEM_HSQLDB@,$SYSTEM_HSQLDB,;t t
-s,@HSQLDB_JAR@,$HSQLDB_JAR,;t t
-s,@SYSTEM_BSH@,$SYSTEM_BSH,;t t
-s,@BSH_JAR@,$BSH_JAR,;t t
-s,@SERIALIZER_JAR@,$SERIALIZER_JAR,;t t
-s,@SYSTEM_SAXON@,$SYSTEM_SAXON,;t t
-s,@SAXON_JAR@,$SAXON_JAR,;t t
-s,@CURLCONFIG@,$CURLCONFIG,;t t
-s,@SYSTEM_CURL@,$SYSTEM_CURL,;t t
-s,@CURL_CFLAGS@,$CURL_CFLAGS,;t t
-s,@CURL_LIBS@,$CURL_LIBS,;t t
-s,@SYSTEM_BOOST@,$SYSTEM_BOOST,;t t
-s,@SYSTEM_VIGRA@,$SYSTEM_VIGRA,;t t
-s,@SYSTEM_ODBC_HEADERS@,$SYSTEM_ODBC_HEADERS,;t t
-s,@WITH_MOZILLA@,$WITH_MOZILLA,;t t
-s,@WITH_LDAP@,$WITH_LDAP,;t t
-s,@WITH_OPENLDAP@,$WITH_OPENLDAP,;t t
-s,@MOZ_NSS_CFLAGS@,$MOZ_NSS_CFLAGS,;t t
-s,@MOZ_NSS_LIBS@,$MOZ_NSS_LIBS,;t t
-s,@NSS_LIB@,$NSS_LIB,;t t
-s,@MOZ_NSPR_CFLAGS@,$MOZ_NSPR_CFLAGS,;t t
-s,@MOZ_NSPR_LIBS@,$MOZ_NSPR_LIBS,;t t
-s,@NSPR_LIB@,$NSPR_LIB,;t t
-s,@MOZILLAXPCOM_CFLAGS@,$MOZILLAXPCOM_CFLAGS,;t t
-s,@MOZILLAXPCOM_LIBS@,$MOZILLAXPCOM_LIBS,;t t
-s,@MOZILLA_VERSION@,$MOZILLA_VERSION,;t t
-s,@MOZILLA_TOOLKIT@,$MOZILLA_TOOLKIT,;t t
-s,@MOZGTK2_CFLAGS@,$MOZGTK2_CFLAGS,;t t
-s,@MOZGTK2_LIBS@,$MOZGTK2_LIBS,;t t
-s,@MOZLIBREQ_CFLAGS@,$MOZLIBREQ_CFLAGS,;t t
-s,@MOZLIBREQ_LIBS@,$MOZLIBREQ_LIBS,;t t
-s,@BUILD_MOZAB@,$BUILD_MOZAB,;t t
-s,@ENABLE_NSS_MODULE@,$ENABLE_NSS_MODULE,;t t
-s,@MOZILLABUILD@,$MOZILLABUILD,;t t
-s,@SYSTEM_MOZILLA@,$SYSTEM_MOZILLA,;t t
-s,@MOZ_FLAVOUR@,$MOZ_FLAVOUR,;t t
-s,@MOZ_INC@,$MOZ_INC,;t t
-s,@MOZ_LIB@,$MOZ_LIB,;t t
-s,@MOZ_LIB_XPCOM@,$MOZ_LIB_XPCOM,;t t
-s,@MOZ_LDAP_CFLAGS@,$MOZ_LDAP_CFLAGS,;t t
-s,@SYSTEM_SANE_HEADER@,$SYSTEM_SANE_HEADER,;t t
-s,@SYSTEM_GENBRK@,$SYSTEM_GENBRK,;t t
-s,@SYSTEM_GENCCODE@,$SYSTEM_GENCCODE,;t t
-s,@SYSTEM_GENCMN@,$SYSTEM_GENCMN,;t t
-s,@SYSTEM_ICU@,$SYSTEM_ICU,;t t
-s,@GRAPHITE_CFLAGS@,$GRAPHITE_CFLAGS,;t t
-s,@GRAPHITE_LIBS@,$GRAPHITE_LIBS,;t t
-s,@ENABLE_GRAPHITE@,$ENABLE_GRAPHITE,;t t
-s,@SYSTEM_GRAPHITE@,$SYSTEM_GRAPHITE,;t t
-s,@X_CFLAGS@,$X_CFLAGS,;t t
-s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
-s,@X_LIBS@,$X_LIBS,;t t
-s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
-s,@XINC@,$XINC,;t t
-s,@XLIB@,$XLIB,;t t
-s,@XAU_LIBS@,$XAU_LIBS,;t t
-s,@DISABLE_XAW@,$DISABLE_XAW,;t t
-s,@SYSTEM_XRENDER_HEADERS@,$SYSTEM_XRENDER_HEADERS,;t t
-s,@XRENDER_LINK@,$XRENDER_LINK,;t t
-s,@XRANDR_CFLAGS@,$XRANDR_CFLAGS,;t t
-s,@XRANDR_LIBS@,$XRANDR_LIBS,;t t
-s,@XRANDR_DLOPEN@,$XRANDR_DLOPEN,;t t
-s,@ENABLE_RANDR@,$ENABLE_RANDR,;t t
-s,@DISABLE_NEON@,$DISABLE_NEON,;t t
-s,@NEON_CFLAGS@,$NEON_CFLAGS,;t t
-s,@NEON_LIBS@,$NEON_LIBS,;t t
-s,@SYSTEM_NEON@,$SYSTEM_NEON,;t t
-s,@NEON_VERSION@,$NEON_VERSION,;t t
-s,@OPENSSL_CFLAGS@,$OPENSSL_CFLAGS,;t t
-s,@OPENSSL_LIBS@,$OPENSSL_LIBS,;t t
-s,@SYSTEM_OPENSSL@,$SYSTEM_OPENSSL,;t t
-s,@ENABLE_AGG@,$ENABLE_AGG,;t t
-s,@AGG_CFLAGS@,$AGG_CFLAGS,;t t
-s,@AGG_LIBS@,$AGG_LIBS,;t t
-s,@SYSTEM_AGG@,$SYSTEM_AGG,;t t
-s,@AGG_VERSION@,$AGG_VERSION,;t t
-s,@REDLAND_CFLAGS@,$REDLAND_CFLAGS,;t t
-s,@REDLAND_LIBS@,$REDLAND_LIBS,;t t
-s,@SYSTEM_REDLAND@,$SYSTEM_REDLAND,;t t
-s,@HUNSPELL_CFLAGS@,$HUNSPELL_CFLAGS,;t t
-s,@HUNSPELL_LIBS@,$HUNSPELL_LIBS,;t t
-s,@SYSTEM_HUNSPELL@,$SYSTEM_HUNSPELL,;t t
-s,@SYSTEM_HYPH@,$SYSTEM_HYPH,;t t
-s,@HYPHEN_LIB@,$HYPHEN_LIB,;t t
-s,@SYSTEM_MYTHES@,$SYSTEM_MYTHES,;t t
-s,@SYSTEM_LPSOLVE@,$SYSTEM_LPSOLVE,;t t
-s,@PSDK_HOME@,$PSDK_HOME,;t t
-s,@WINDOWS_VISTA_PSDK@,$WINDOWS_VISTA_PSDK,;t t
-s,@DIRECTXSDK_HOME@,$DIRECTXSDK_HOME,;t t
-s,@DIRECTXSDK_LIB@,$DIRECTXSDK_LIB,;t t
-s,@NSIS_PATH@,$NSIS_PATH,;t t
-s,@BISON@,$BISON,;t t
-s,@FLEX@,$FLEX,;t t
-s,@PATCH@,$PATCH,;t t
-s,@GNUCP@,$GNUCP,;t t
-s,@GNUPATCH@,$GNUPATCH,;t t
-s,@CYGWIN_PATH@,$CYGWIN_PATH,;t t
-s,@ML_EXE@,$ML_EXE,;t t
-s,@ASM_HOME@,$ASM_HOME,;t t
-s,@ZIP@,$ZIP,;t t
-s,@UNZIP@,$UNZIP,;t t
-s,@ZIP_HOME@,$ZIP_HOME,;t t
-s,@ENABLE_GTK@,$ENABLE_GTK,;t t
-s,@ENABLE_KDE@,$ENABLE_KDE,;t t
-s,@ENABLE_KDE4@,$ENABLE_KDE4,;t t
-s,@GCONF_CFLAGS@,$GCONF_CFLAGS,;t t
-s,@GCONF_LIBS@,$GCONF_LIBS,;t t
-s,@ENABLE_GCONF@,$ENABLE_GCONF,;t t
-s,@GNOMEVFS_CFLAGS@,$GNOMEVFS_CFLAGS,;t t
-s,@GNOMEVFS_LIBS@,$GNOMEVFS_LIBS,;t t
-s,@ENABLE_GNOMEVFS@,$ENABLE_GNOMEVFS,;t t
-s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t
-s,@GTK_LIBS@,$GTK_LIBS,;t t
-s,@DBUS_CFLAGS@,$DBUS_CFLAGS,;t t
-s,@DBUS_LIBS@,$DBUS_LIBS,;t t
-s,@GIO_CFLAGS@,$GIO_CFLAGS,;t t
-s,@GIO_LIBS@,$GIO_LIBS,;t t
-s,@ENABLE_GIO@,$ENABLE_GIO,;t t
-s,@ENABLE_DBUS@,$ENABLE_DBUS,;t t
-s,@ENABLE_SYSTRAY_GTK@,$ENABLE_SYSTRAY_GTK,;t t
-s,@CAIRO_CFLAGS@,$CAIRO_CFLAGS,;t t
-s,@CAIRO_LIBS@,$CAIRO_LIBS,;t t
-s,@ENABLE_CAIRO@,$ENABLE_CAIRO,;t t
-s,@BUILD_PIXMAN@,$BUILD_PIXMAN,;t t
-s,@SYSTEM_CAIRO@,$SYSTEM_CAIRO,;t t
-s,@ENABLE_OPENGL@,$ENABLE_OPENGL,;t t
-s,@ENABLE_MINIMIZER@,$ENABLE_MINIMIZER,;t t
-s,@ENABLE_PRESENTER_SCREEN@,$ENABLE_PRESENTER_SCREEN,;t t
-s,@POPPLER_CFLAGS@,$POPPLER_CFLAGS,;t t
-s,@POPPLER_LIBS@,$POPPLER_LIBS,;t t
-s,@ENABLE_PDFIMPORT@,$ENABLE_PDFIMPORT,;t t
-s,@SYSTEM_POPPLER@,$SYSTEM_POPPLER,;t t
-s,@ENABLE_MEDIAWIKI@,$ENABLE_MEDIAWIKI,;t t
-s,@SYSTEM_SERVLETAPI@,$SYSTEM_SERVLETAPI,;t t
-s,@SERVLETAPI_JAR@,$SERVLETAPI_JAR,;t t
-s,@ENABLE_REPORTBUILDER@,$ENABLE_REPORTBUILDER,;t t
-s,@SYSTEM_JFREEREPORT@,$SYSTEM_JFREEREPORT,;t t
-s,@SAC_JAR@,$SAC_JAR,;t t
-s,@LIBXML_JAR@,$LIBXML_JAR,;t t
-s,@FLUTE_JAR@,$FLUTE_JAR,;t t
-s,@JFREEREPORT_JAR@,$JFREEREPORT_JAR,;t t
-s,@LIBBASE_JAR@,$LIBBASE_JAR,;t t
-s,@LIBLAYOUT_JAR@,$LIBLAYOUT_JAR,;t t
-s,@LIBLOADER_JAR@,$LIBLOADER_JAR,;t t
-s,@LIBFORMULA_JAR@,$LIBFORMULA_JAR,;t t
-s,@LIBREPOSITORY_JAR@,$LIBREPOSITORY_JAR,;t t
-s,@LIBFONTS_JAR@,$LIBFONTS_JAR,;t t
-s,@LIBSERIALIZER_JAR@,$LIBSERIALIZER_JAR,;t t
-s,@SYSTEM_APACHE_COMMONS@,$SYSTEM_APACHE_COMMONS,;t t
-s,@COMMONS_CODEC_JAR@,$COMMONS_CODEC_JAR,;t t
-s,@COMMONS_LANG_JAR@,$COMMONS_LANG_JAR,;t t
-s,@COMMONS_HTTPCLIENT_JAR@,$COMMONS_HTTPCLIENT_JAR,;t t
-s,@COMMONS_LOGGING_JAR@,$COMMONS_LOGGING_JAR,;t t
-s,@MOC@,$MOC,;t t
-s,@KDE_CFLAGS@,$KDE_CFLAGS,;t t
-s,@KDE_LIBS@,$KDE_LIBS,;t t
-s,@MOC4@,$MOC4,;t t
-s,@KDE4_CFLAGS@,$KDE4_CFLAGS,;t t
-s,@KDE4_LIBS@,$KDE4_LIBS,;t t
-s,@ENABLE_LOCKDOWN@,$ENABLE_LOCKDOWN,;t t
-s,@GOBJECT_CFLAGS@,$GOBJECT_CFLAGS,;t t
-s,@GOBJECT_LIBS@,$GOBJECT_LIBS,;t t
-s,@ENABLE_EVOAB2@,$ENABLE_EVOAB2,;t t
-s,@ENABLE_KAB@,$ENABLE_KAB,;t t
-s,@WITH_FONTS@,$WITH_FONTS,;t t
-s,@WITHOUT_PPDS@,$WITHOUT_PPDS,;t t
-s,@WITHOUT_AFMS@,$WITHOUT_AFMS,;t t
-s,@SCPDEFS@,$SCPDEFS,;t t
-s,@USE_XINERAMA@,$USE_XINERAMA,;t t
-s,@XINERAMA_LINK@,$XINERAMA_LINK,;t t
-s,@ANT@,$ANT,;t t
-s,@ANT_HOME@,$ANT_HOME,;t t
-s,@ANT_LIB@,$ANT_LIB,;t t
-s,@WITH_LANG@,$WITH_LANG,;t t
-s,@WITH_POOR_HELP_LOCALIZATIONS@,$WITH_POOR_HELP_LOCALIZATIONS,;t t
-s,@WITH_DICT@,$WITH_DICT,;t t
-s,@INTRO_BITMAPS@,$INTRO_BITMAPS,;t t
-s,@ABOUT_BITMAPS@,$ABOUT_BITMAPS,;t t
-s,@OOO_VENDOR@,$OOO_VENDOR,;t t
-s,@UNIXWRAPPERNAME@,$UNIXWRAPPERNAME,;t t
-s,@ENABLE_STATIC_GTK@,$ENABLE_STATIC_GTK,;t t
-s,@ENABLE_LAYOUT@,$ENABLE_LAYOUT,;t t
-s,@VERBOSE@,$VERBOSE,;t t
-s,@LOCAL_SOLVER@,$LOCAL_SOLVER,;t t
-s,@BUILD_TYPE@,$BUILD_TYPE,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
 
-_ACEOF
+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
 
-  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
-    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`
+  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
+
+    # 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;}
     fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
+    # 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
 
-_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 ;;
+    case $ac_tag in
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
   esac
 
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+  ac_dir=`$as_dirname -- "$ac_file" ||
 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while 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; }; }; }
-
+	 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
   ac_builddir=.
 
-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 "$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
 
 case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
+  .)  # We are building in place.
     ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
+    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 ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+    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
 
-# 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
 
-  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; }
+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
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+
+# 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
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-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
+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
+ ;;
 
-done
-_ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
 
-{ (exit 0); exit 0; }
+  esac
+
+done # for ac_tag
+
+
+as_fn_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.
@@ -29450,7 +23385,11 @@ 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 || { (exit 1); exit 1; }
+  $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;}
 fi
 
 
diff --git a/configure.in b/configure.in
index 0ce538aeed8e..abf5176b095d 100644
--- a/configure.in
+++ b/configure.in
@@ -382,6 +382,10 @@ AC_ARG_WITH(beanshell-jar,
 [  --with-beanshell-jar=JARFILE   Specify path to jarfile manually ],
 [ BSH_JAR="$withval"
 ])
+AC_ARG_ENABLE(presenter-extra-ui,
+[  --enable-presenter-extra-ui   enables extra functionality during slideshow,
+                                 e.g. selecting pen color, erasing drawings etc.
+],,enable_presenter_extra_ui=no)
 AC_ARG_ENABLE(minimizer,
 [  --enable-minimizer          enables the build of the Presentation Minimizer extension
 ],,)
@@ -3495,7 +3499,7 @@ AC_SUBST(BUILD_QADEVOOO)
 dnl ===================================================================
 dnl Check for prelinked libgcc_s.so.1
 dnl ===================================================================
-if test -z "$with_system_stdlibs" -a -z "$with_system_libs"; then
+if test "$_os" = "Linux" -a -z "$with_system_stdlibs" -a -z "$with_system_libs"; then
   if test -n "$checkforstdlibproblems"; then
     if test -f /etc/rpm/macros.prelink; then
       with_system_stdlibs=yes
@@ -4472,12 +4476,6 @@ if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" == "z"
         AC_MSG_RESULT([external])
         SYSTEM_GRAPHITE=YES
         PKG_CHECK_MODULES( GRAPHITE, silgraphite )
-	AC_MSG_CHECKING([STL compatibility])
-	if test "$WITH_STLPORT" != "no"; then
-		AC_MSG_ERROR([to use system graphite you need to use --without-stlport])
-	else
-		AC_MSG_RESULT([OK])	
-	fi
     else
         AC_MSG_RESULT([internal])
         SYSTEM_GRAPHITE=NO
@@ -4870,6 +4868,7 @@ if test -n "$with_system_altlinuxhyph" -o -n "$with_system_libs" && \
 else
     AC_MSG_RESULT([internal])
     SYSTEM_HYPH=NO
+    BUILD_TYPE="$BUILD_TYPE HYPHEN"
 fi
 AC_SUBST(SYSTEM_HYPH)
 AC_SUBST(HYPHEN_LIB)
@@ -5531,6 +5530,16 @@ fi
 
 AC_SUBST(ENABLE_OPENGL)
 
+AC_MSG_CHECKING([whether to build extra presenter ui])
+if test -n "$enable_presenter_extra_ui" -a "$enable_presenter_extra_ui" != "no"; then
+   AC_MSG_RESULT([yes])
+   ENABLE_PRESENTER_EXTRA_UI=YES
+else
+   AC_MSG_RESULT([no])
+   ENABLE_PRESENTER_EXTRA_UI=NO
+fi
+AC_SUBST(ENABLE_PRESENTER_EXTRA_UI)
+
 AC_MSG_CHECKING([whether to build the Presentation Minimizer extension])
 if test -n "$enable_minimizer" -a "$enable_minimizer" != "no"; then
    AC_MSG_RESULT([yes])
diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst
index abf5f14740da..f3fbbec38273 100644
--- a/scp2/prj/build.lst
+++ b/scp2/prj/build.lst
@@ -1,4 +1,4 @@
-cp    scp2    :    l10n i18npool setup_native transex3 PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
+cp    scp2    :    l10n i18npool setup_native l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
 cp    scp2                        usr1     -    all    cp_mkout NULL
 cp    scp2\macros                 nmake    -    all    cp_langmacros NULL
 cp    scp2\source\templates       nmake    -    all    cp_langtemplates NULL
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 88c1e02a7591..bfb171387aa3 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -430,7 +430,7 @@ File gid_Brand_File_Desktophelper_Txt
     Styles = (PACKED);
     Dir = gid_Brand_Dir_Program;
     Name = "desktophelper.txt";
-	ComponentCondition = "CREATEDESKTOPLINK=1";
+    ComponentCondition = "CREATEDESKTOPLINK=1";
 End
 #endif
 
@@ -461,17 +461,17 @@ End
 
 #ifdef WNT
 File gid_Brand_File_Bin_Rebaseoo
-	BIN_FILE_BODY;
-	Dir = gid_Brand_Dir_Program;
-	Styles = (PACKED);
-	Name = "rebaseoo.exe";
+    BIN_FILE_BODY;
+    Dir = gid_Brand_Dir_Program;
+    Styles = (PACKED);
+    Name = "rebaseoo.exe";
 End
 
 File gid_Brand_File_Bin_Rebasegui
-	BIN_FILE_BODY;
-	Dir = gid_Brand_Dir_Program;
-	Styles = (PACKED);
-	Name = "rebasegui.exe";
+    BIN_FILE_BODY;
+    Dir = gid_Brand_Dir_Program;
+    Styles = (PACKED);
+    Name = "rebasegui.exe";
 End
 #endif
 
@@ -620,37 +620,37 @@ End
 
 #if defined UNX && ! defined MACOSX
 File gid_Brand_File_Share_Xdg_Calc
-	TXT_FILE_BODY;
-	Dir = gid_Brand_Dir_Share_Xdg;
-	Name = "calc.desktop";
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Xdg;
+    Name = "calc.desktop";
     Styles = (PACKED,SCPZIP_REPLACE);
 End
 #endif
 
 #if defined UNX && ! defined MACOSX
 File gid_Brand_File_Share_Xdg_Draw
-	TXT_FILE_BODY;
-	Dir = gid_Brand_Dir_Share_Xdg;
-	Name = "draw.desktop";
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Xdg;
+    Name = "draw.desktop";
     Styles = (PACKED,SCPZIP_REPLACE);
 End
 #endif
 
 #if defined UNX && ! defined MACOSX
 File gid_Brand_File_Share_Xdg_Impress
-	TXT_FILE_BODY;
-	Dir = gid_Brand_Dir_Share_Xdg;
-	Name = "impress.desktop";
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Xdg;
+    Name = "impress.desktop";
     Styles = (PACKED,SCPZIP_REPLACE);
 End
 #endif
 
 #if defined UNX && ! defined MACOSX
 File gid_Brand_File_Share_Xdg_Math
-	TXT_FILE_BODY;
-	Dir = gid_Brand_Dir_Share_Xdg;
-	Name = "math.desktop";
-	Styles = (PACKED,SCPZIP_REPLACE);
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Xdg;
+    Name = "math.desktop";
+    Styles = (PACKED,SCPZIP_REPLACE);
 End
 #endif
 
@@ -1094,7 +1094,7 @@ ProfileItem gid_Brand_Profileitem_Version_Extensionupdateurl
     Section = "Version";
     Order = 18;
     Key = "ExtensionUpdateURL";
-    Value = "http://updateext.services.openoffice.org/ProductUpdateService/check.Update";
+    Value = "http://updateexte.services.openoffice.org/ExtensionUpdateService/check.Update";
 End
 
 ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Base_Dir
diff --git a/set_soenv.in b/set_soenv.in
index 4d3e41383a38..47aed42b0736 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1592,6 +1592,7 @@ ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
 ToFile( "ENABLE_CAIRO",      "@ENABLE_CAIRO@",     "e" );
 ToFile( "ENABLE_OPENGL",     "@ENABLE_OPENGL@",    "e" );
 ToFile( "ENABLE_PDFIMPORT",  "@ENABLE_PDFIMPORT@", "e" );
+ToFile( "ENABLE_PRESENTER_EXTRA_UI","@ENABLE_PRESENTER_EXTRA_UI@","e" );
 ToFile( "ENABLE_MINIMIZER",   "@ENABLE_MINIMIZER@","e" );
 ToFile( "ENABLE_PRESENTER_SCREEN","@ENABLE_PRESENTER_SCREEN@","e" );
 ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" );
diff --git a/soldep/bootstrp/prj.cxx b/soldep/bootstrp/prj.cxx
index f81e03c5a7a3..5e93c1142673 100644
--- a/soldep/bootstrp/prj.cxx
+++ b/soldep/bootstrp/prj.cxx
@@ -216,6 +216,7 @@ CommandData::CommandData()
     nOSType = 0;
     nCommand = 0;
     pDepList = 0;
+    pCommandList = 0;
 }
 
 /*****************************************************************************/
@@ -234,6 +235,18 @@ CommandData::~CommandData()
 
         pDepList = NULL;
     }
+    if ( pCommandList )
+    {
+        ByteString *pString = pCommandList->First();
+        while ( pString )
+        {
+            delete pString;
+            pString = pCommandList->Next();
+        }
+        delete pCommandList;
+
+        pCommandList = NULL;
+    }
 }
 
 /*****************************************************************************/
@@ -296,6 +309,15 @@ ByteString CommandData::GetCommandTypeString()
 }
 
 /*****************************************************************************/
+void CommandData::AddCommand(ByteString* pCommand)
+/*****************************************************************************/
+{
+    if (!pCommandList)
+        pCommandList = new SByteStringList();
+    pCommandList->Insert(pCommand, LIST_APPEND);
+}
+
+/*****************************************************************************/
 CommandData& CommandData::operator>>  ( SvStream& rStream )
 /*****************************************************************************/
 {
@@ -325,6 +347,14 @@ CommandData& CommandData::operator>>  ( SvStream& rStream )
     else
         rStream << sal_False;
 
+    if (pCommandList)
+    {
+        rStream << sal_True;
+        *pCommandList >> rStream;
+    }
+    else
+        rStream << sal_False;
+
     return *this;
 }
 
@@ -361,7 +391,26 @@ CommandData& CommandData::operator<<  ( SvStream& rStream )
         *pDepList << rStream;
     }
     else
+    {
+        if (pDepList)
         DELETEZ (pDepList);
+    }
+
+    BOOL bCommandList;
+    rStream >> bCommandList;
+    if (pCommandList)
+        pCommandList->CleanUp();
+    if (bCommandList)
+    {
+        if (!pCommandList)
+            pCommandList = new SByteStringList();
+        *pCommandList << rStream;
+    }
+    else
+    {
+        if (pCommandList)
+            DELETEZ (pCommandList);
+    }
 
     return *this;
 }
@@ -751,11 +800,12 @@ CommandData* Prj::GetDirectoryList ( USHORT nWhatOS, USHORT nCommand )
 CommandData* Prj::GetDirectoryData( ByteString aLogFileName )
 /*****************************************************************************/
 {
+    PrjList* pPrjList = GetCommandDataList ();
     CommandData *pData = NULL;
-    ULONG nCount_l = Count();
+    ULONG nCount_l = pPrjList->Count();
     for ( ULONG i=0; i<nCount_l; i++ )
     {
-        pData = GetObject(i);
+        pData = pPrjList->GetObject(i);
         if ( pData->GetLogFile() == aLogFileName )
             return pData;
     }
@@ -775,7 +825,9 @@ Prj::Prj() :
     bHardDependencies( FALSE ),
     bFixedDependencies( FALSE ),
     bVisited( FALSE ),
-    bIsAvailable( TRUE )
+    bIsAvailable( TRUE ),
+    pTempCommandDataList (0),
+    bTempCommandDataListPermanent (FALSE)
 /*****************************************************************************/
 {
 }
@@ -790,7 +842,9 @@ Prj::Prj( ByteString aName ) :
     bHardDependencies( FALSE ),
     bFixedDependencies( FALSE ),
     bVisited( FALSE ),
-    bIsAvailable( TRUE )
+    bIsAvailable( TRUE ),
+    pTempCommandDataList (0),
+    bTempCommandDataListPermanent (FALSE)
 /*****************************************************************************/
 {
 }
@@ -954,7 +1008,8 @@ BOOL Prj::InsertDirectory ( ByteString aDirName, USHORT aWhat,
     pData->SetLogFile( aLogFileName );
     pData->SetClientRestriction( rClientRestriction );
 
-    Insert( pData );
+    PrjList* pPrjList = GetCommandDataList ();
+    pPrjList->Insert( pData );
 
     return FALSE;
 }
@@ -966,14 +1021,15 @@ BOOL Prj::InsertDirectory ( ByteString aDirName, USHORT aWhat,
 CommandData* Prj::RemoveDirectory ( ByteString aLogFileName )
 /*****************************************************************************/
 {
-    ULONG nCount_l = Count();
+    PrjList* pPrjList = GetCommandDataList ();
+    ULONG nCount_l = pPrjList->Count();
     CommandData* pData;
     CommandData* pDataFound = NULL;
     SByteStringList* pDataDeps;
 
     for ( USHORT i = 0; i < nCount_l; i++ )
     {
-        pData = GetObject( i );
+        pData = pPrjList->GetObject( i );
         if ( pData->GetLogFile() == aLogFileName )
             pDataFound = pData;
         else
@@ -1033,6 +1089,56 @@ void Prj::ExtractDependencies()
 }
 
 /*****************************************************************************/
+PrjList* Prj::GetCommandDataList ()
+/*****************************************************************************/
+{
+    if (pTempCommandDataList)
+        return pTempCommandDataList;
+    else
+        return (PrjList*)this;
+}
+
+/*****************************************************************************/
+void Prj::RemoveTempCommandDataList()
+/*****************************************************************************/
+{
+    if (pTempCommandDataList)
+    {
+        delete pTempCommandDataList; // this list remove the elements by itself
+        pTempCommandDataList = NULL;
+    }
+}
+
+/*****************************************************************************/
+void Prj::GenerateTempCommandDataList()
+/*****************************************************************************/
+{
+    if (pTempCommandDataList)
+        RemoveTempCommandDataList();
+    pTempCommandDataList = new PrjList();
+    CommandData* pCommandData = First();
+    while (pCommandData) {
+        SvMemoryStream* pStream = new SvMemoryStream();
+        *pCommandData >> *pStream;
+        CommandData* pNewCommandData = new CommandData();
+        pStream->Seek( STREAM_SEEK_TO_BEGIN );
+        *pNewCommandData << *pStream;
+        pTempCommandDataList->Insert(pNewCommandData, LIST_APPEND);
+        delete pStream;
+        pCommandData = Next();
+    }
+}
+
+/*****************************************************************************/
+void Prj::GenerateEmptyTempCommandDataList()
+/*****************************************************************************/
+{
+    if (pTempCommandDataList)
+        RemoveTempCommandDataList();
+    pTempCommandDataList = new PrjList();
+}
+
+/*****************************************************************************/
 Prj& Prj::operator>>  ( SvStream& rStream )
 /*****************************************************************************/
 {
@@ -1639,7 +1745,8 @@ void Star::InsertToken ( char *yytext )
                 pStaticDepList = 0;
                 break;
         case 1:
-                    aDirName = yytext;
+                aDirName = yytext;
+                aProjectName = aDirName.GetToken ( 0, 0x5c);
                 break;
         case 2:
                 if ( !strcmp( yytext, ":" ))
@@ -1674,7 +1781,6 @@ void Star::InsertToken ( char *yytext )
                 }
                 if (bPrjDep)
                 {
-                    aProjectName = aDirName.GetToken ( 0, 0x5c);
                     if ( HasProject( aProjectName ))
                     {
                         RemovePrj(GetPrj(aProjectName));
@@ -1708,7 +1814,7 @@ void Star::InsertToken ( char *yytext )
         case 5:
                 if ( !bPrjDep )
                 {
-                    aLogFileName = yytext;
+                    aLogFileName = (ByteString(aProjectName).Append("_")).Append(yytext);
                 }
                 break;
         default:
@@ -1725,7 +1831,8 @@ void Star::InsertToken ( char *yytext )
                         // ggfs. Dependency liste anlegen und ergaenzen
                         if ( !pStaticDepList )
                             pStaticDepList = new SByteStringList;
-                        pStaticDepList->PutString( new ByteString( aItem ));
+                        ByteString* pStr = new ByteString ((ByteString (aProjectName).Append("_")).Append(aItem));
+                        pStaticDepList->PutString( pStr );
                     }
                 }
                 else
@@ -1748,7 +1855,6 @@ void Star::InsertToken ( char *yytext )
                             bHasModes = TRUE;
                         }
 
-                        aProjectName = aDirName.GetToken ( 0, 0x5c);
                         if ( HasProject( aProjectName ))
                         {
                             pPrj = GetPrj( aProjectName );
@@ -1782,7 +1888,6 @@ void Star::InsertToken ( char *yytext )
        der Solar-Projekte einfuegen */
     if ( i == -1 )
     {
-        aProjectName = aDirName.GetToken ( 0, 0x5c);
         if ( HasProject( aProjectName ))
         {
             pPrj = GetPrj( aProjectName );
diff --git a/soldep/inc/soldep/prj.hxx b/soldep/inc/soldep/prj.hxx
index 858afac2d56a..bd94a3e87f9a 100644
--- a/soldep/inc/soldep/prj.hxx
+++ b/soldep/inc/soldep/prj.hxx
@@ -87,6 +87,7 @@ class CommandData
     ByteString      aComment;
     ByteString      sClientRestriction;
     SByteStringList *pDepList;
+    SByteStringList *pCommandList;
     USHORT      nOSType;
     USHORT      nCommand;
 
@@ -131,6 +132,9 @@ public:
     void        AddDepth(){nDepth++;}
     ULONG       GetDepth(){return nDepth;}
 
+    void AddCommand(ByteString* pCommand);
+    SByteStringList* GetCommandList() {return pCommandList;}
+
     CommandData& operator<<  ( SvStream& rStream );
     CommandData& operator>>  ( SvStream& rStream );
 };
@@ -284,6 +288,8 @@ private:
     BOOL            bIsAvailable;
     SByteStringList* RemoveStringList(SByteStringList* pStringList );
     SDepInfoList*   RemoveDepInfoList(SDepInfoList* pInfoList );
+    PrjList*        pTempCommandDataList;
+    BOOL            bTempCommandDataListPermanent;
 public:
                     Prj();
                     Prj( ByteString aName );
@@ -318,6 +324,14 @@ public:
 
     void            ExtractDependencies();
 
+    PrjList*        GetCommandDataList ();
+    void            RemoveTempCommandDataList();
+    void            GenerateTempCommandDataList();
+    void            GenerateEmptyTempCommandDataList();
+    BOOL            HasTempCommandDataList() {return pTempCommandDataList != NULL;}
+    void            SetTempCommandDataListPermanent (BOOL bVar = TRUE) {bTempCommandDataListPermanent = bVar;}
+    BOOL            IsTempCommandDataListPermanent() {return bTempCommandDataListPermanent;}
+
     Prj&            operator<<  ( SvStream& rStream );
     Prj&            operator>>  ( SvStream& rStream );
 };
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index cc0677220777..5b4d4622754a 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -118,7 +118,7 @@
     $pre_custom_job = '';
     $custom_job = '';
     $post_custom_job = '';
-    %LocalDepsHash = ();
+    %local_deps_hash = ();
     %PathHash = ();
     %PlatformHash = ();
     %AliveDependencies = ();
@@ -185,7 +185,7 @@
     $setenv_string = ''; # string for configuration of the client environment
     $ports_string = ''; # string with possible ports for server
     @server_ports = ();
-    $html_port;
+    $html_port = 0;
     $server_socket_obj = undef; # socket object for server
     $html_socket_obj = undef; # socket object for server
     my %clients_jobs = ();
@@ -201,7 +201,6 @@
     my %module_paths = (); # hash with absolute module paths
     my %active_modules = ();
     my $generate_config = 0;
-    my $add_modules_to_config = 0;
     my %add_to_config = ();
     my %remove_from_config = ();
     my $clear_config = 0;
@@ -385,7 +384,7 @@ sub generate_config_file {
                     $removal_message .= "$1 ";
                 } else {
                     push(@config_content_new, $_);
-                    if (defined $add_to_config{$1}) {
+                    if (defined $add_to_config{$1} && !$prepare) {
                         push(@warnings, "Module $1 already activated in $source_config_file\n");
                         delete $add_to_config{$1};
                     }
@@ -492,11 +491,12 @@ sub start_html_message_trigger {
         my $rv;
         my $full_buffer = '';
         my %modules_to_rebuild = ();
+        my $paddr;
         while ($rv = sysread(HTML_PIPE, $buffer, $buffer_size)) {
             $full_buffer .= $buffer;
         };
         if (length $full_buffer) {
-            print "**********Got message $fullbuffer\n";
+            print "**********Got message $full_buffer\n";
             socket(SOCKET, PF_INET, SOCK_STREAM, getprotobyname('tcp')) or die "socket: $!";
             if (connect(SOCKET, $paddr)) {
                 $full_buffer .= "\n";
@@ -568,8 +568,8 @@ sub schedule_delete {
             kill 9, keys %{$module_deps_hash_pids{$projects_deps_hash{$_}}};
             handle_dead_children(0);
         };
-        RemoveFromDependencies($_, \%global_deps_hash);
-        RemoveFromDependencies($_, \%global_deps_hash_backup);
+        remove_from_dependencies($_, \%global_deps_hash);
+        remove_from_dependencies($_, \%global_deps_hash_backup);
         delete $reversed_dependencies{$_};
         delete $build_is_finished{$_} if defined $build_is_finished{$_};
         delete $modules_with_errors{$_} if defined $modules_with_errors{$_};
@@ -618,6 +618,7 @@ sub schedule_rebuild {
 #
 sub get_build_list_path {
     my $module = shift;
+    return $build_list_paths{$module} if (defined $build_list_paths{$module});
     my @possible_dirs = ($module, $module. '.lnk', $module. '.link');
     return $build_list_paths{$module} if (defined $build_list_paths{$module});
     foreach (@possible_dirs) {
@@ -720,19 +721,17 @@ sub build_all {
             $modules_types{$initial_module} = 'mod';
         };
         modules_classify(keys %global_deps_hash);
-        store_weights(\%global_deps_hash);
-        prepare_build_from(\%global_deps_hash) if ($build_from);
+        expand_dependencies (\%global_deps_hash);
+#        prepare_build_from(\%global_deps_hash) if (scalar keys %incompatibles);
         prepare_incompatible_build(\%global_deps_hash) if ($incompatible);
         if ($build_all_cont || $build_since) {
-            print STDERR "There are active module in $source_config_file. Inactive modules will be skipped.\n";
-            push (@warnings, "\nThere are active module in $source_config_file. Inactive modules are skipped.\n\n");
             prepare_build_all_cont(\%global_deps_hash);
         };
         if ($generate_config) {
             %add_to_config = %global_deps_hash;
             generate_config_file();
             exit 0;
-        } elsif (keys %incompatibles) {
+        } elsif ($incompatible) {
             my @missing_modules = ();
             foreach (keys %global_deps_hash) {
                 push(@missing_modules, $_) if (!defined $active_modules{$_});
@@ -741,8 +740,12 @@ sub build_all {
                 print_error("There are modules:\n@missing_modules\n\nthat should be built, but they are not activated. Please, verify your $source_config_file.\n");
             };
         };
+        foreach my $module (%dead_parents) {
+            remove_from_dependencies($module, \%global_deps_hash);
+            delete ($global_deps_hash{$module}) if (defined $global_deps_hash{$module});
+        };
+        store_weights(\%global_deps_hash);
         backup_deps_hash(\%global_deps_hash, \%global_deps_hash_backup);
-        expand_dependencies (\%global_deps_hash_backup);
         reverse_dependensies(\%global_deps_hash_backup);
         $modules_number = scalar keys %global_deps_hash;
         initialize_html_info($_) foreach (keys %global_deps_hash);
@@ -757,34 +760,34 @@ sub build_all {
             if (!defined $dead_parents{$Prj}) {
                 if (scalar keys %broken_build) {
                     print $echo . "Skipping project $Prj because of error(s)\n";
-                    RemoveFromDependencies($Prj, \%global_deps_hash);
+                    remove_from_dependencies($Prj, \%global_deps_hash);
                     $build_is_finished{$Prj}++;
                     next;
                 };
 
                 $PrjDir = $module_paths{$Prj};
-                get_module_dep_hash($Prj, \%LocalDepsHash);
+                get_module_dep_hash($Prj, \%local_deps_hash);
                 my $info_hash = $html_info{$Prj};
-                $$info_hash{DIRS} = check_deps_hash(\%LocalDepsHash, $Prj);
-                $module_by_hash{\%LocalDepsHash} = $Prj;
-                build_dependent(\%LocalDepsHash);
+                $$info_hash{DIRS} = check_deps_hash(\%local_deps_hash, $Prj);
+                $module_by_hash{\%local_deps_hash} = $Prj;
+                build_dependent(\%local_deps_hash);
                 print $check_error_string;
             };
 
-            RemoveFromDependencies($Prj, \%global_deps_hash);
+            remove_from_dependencies($Prj, \%global_deps_hash);
             $build_is_finished{$Prj}++;
         };
     } else {
         store_build_list_content($initial_module);
-        get_module_dep_hash($initial_module, \%LocalDepsHash);
+        get_module_dep_hash($initial_module, \%local_deps_hash);
         initialize_html_info($initial_module);
         my $info_hash = $html_info{$initial_module};
-        $$info_hash{DIRS} = check_deps_hash(\%LocalDepsHash, $initial_module);
-        $module_by_hash{\%LocalDepsHash} = $initial_module;
+        $$info_hash{DIRS} = check_deps_hash(\%local_deps_hash, $initial_module);
+        $module_by_hash{\%local_deps_hash} = $initial_module;
         if ($server_mode) {
             run_server();
         } else {
-            build_dependent(\%LocalDepsHash);
+            build_dependent(\%local_deps_hash);
         };
     };
 };
@@ -811,43 +814,42 @@ sub initialize_html_info {
 # Do job
 #
 sub dmake_dir {
-    my ($new_BuildDir, $OldBuildDir, $error_code);
-    my $BuildDir = shift;
-    $jobs_hash{$BuildDir}->{START_TIME} = time();
-    $jobs_hash{$BuildDir}->{STATUS} = 'building';
-    if ($BuildDir =~ /(\s)/o && (!-d $BuildDir)) {
-        print "\n$BuildDir\n\n" if ($BuildDir =~ /\sdeliver$/o);
-        $error_code = do_custom_job($BuildDir, \%LocalDepsHash);
+    my ($new_job_name, $error_code);
+    my $job_name = shift;
+    $jobs_hash{$job_name}->{START_TIME} = time();
+    $jobs_hash{$job_name}->{STATUS} = 'building';
+    if ($job_name =~ /(\s)/o && (!-d $job_name)) {
+        $error_code = do_custom_job($job_name, \%local_deps_hash);
     } else {
-        html_store_job_info(\%LocalDepsHash, $BuildDir);
-        print_error("$BuildDir not found!!\n") if (!-d $BuildDir);
-        if (!-d $BuildDir) {
-            $new_BuildDir = $BuildDir;
-            $new_BuildDir =~ s/_simple//g;
-            if ((-d $new_BuildDir)) {
-                print("\nTrying $new_BuildDir, $BuildDir not found!!\n");
-                $BuildDir = $new_BuildDir;
+        html_store_job_info(\%local_deps_hash, $job_name);
+        print_error("$job_name not found!!\n") if (!-d $job_name);
+        if (!-d $job_name) {
+            $new_job_name = $job_name;
+            $new_job_name =~ s/_simple//g;
+            if ((-d $new_job_name)) {
+                print("\nTrying $new_job_name, $job_name not found!!\n");
+                $job_name = $new_job_name;
             } else {
-                print_error("\n$BuildDir not found!!\n");
+                print_error("\n$job_name not found!!\n");
             }
         }
         if ($cmd_file) {
-            print "cd $BuildDir\n";
+            print "cd $job_name\n";
             print $check_error_string;
-            print $echo.$BuildDir."\n";
+            print $echo.$job_name."\n";
             print "$dmake\n";
             print $check_error_string;
         } else {
             print "\n" if ( ! $show );
-            print "Entering $BuildDir\n";
+            print "Entering $job_name\n";
         };
-        RemoveFromDependencies($BuildDir, \%LocalDepsHash) if (!$child);
+        remove_from_dependencies($job_name, \%local_deps_hash) if (!$child);
         return if ($cmd_file || $show);
-        $error_code = run_job($dmake, $BuildDir);
-        html_store_job_info(\%LocalDepsHash, $BuildDir, $error_code) if (!$child);
+        $error_code = run_job($dmake, $job_name);
+        html_store_job_info(\%local_deps_hash, $job_name, $error_code) if (!$child);
     };
     if ($error_code && $ignore) {
-        push(@ignored_errors, $BuildDir);
+        push(@ignored_errors, $job_name);
         $error_code = 0;
     };
     if ($child) {
@@ -863,7 +865,7 @@ sub dmake_dir {
         _exit(0);
     } elsif ($error_code && ($error_code != -1)) {
         return $error_code;
-#        print_error("Error $? occurred while making $BuildDir");
+#        print_error("Error $? occurred while making $job_name");
     };
 };
 
@@ -1065,7 +1067,7 @@ sub get_deps_hash {
         foreach my $alias (keys %DeadDependencies) {
             next if defined $AliveDependencies{$alias};
             if (!IsHashNative($alias)) {
-                RemoveFromDependencies($alias, $dependencies_hash);
+                remove_from_dependencies($alias, $dependencies_hash);
                 delete $DeadDependencies{$alias};
             };
         };
@@ -1208,7 +1210,9 @@ sub get_stand_dir {
         foreach (@possible_build_lists) {# ('build.lst', 'build.xlist');
             if (-e $StandDir . '/prj/'.$_) {
                 $initial_module = File::Basename::basename($StandDir);
+                $build_list_paths{$initial_module} =$StandDir . '/prj/'.$_;
                 $StandDir = File::Basename::dirname($StandDir);
+                $module_paths{$initial_module} = $StandDir . "/$initial_module";
                 return $StandDir;
             } elsif ($StandDir eq $previous_dir) {
                 $ENV{mk_tmp} = '';
@@ -1255,7 +1259,7 @@ sub CheckPlatform {
 # Remove project to build ahead from dependencies and make an array
 # of all from given project dependent projects
 #
-sub RemoveFromDependencies {
+sub remove_from_dependencies {
     my ($ExclPrj, $i, $Prj, $Dependencies);
     $ExclPrj = shift;
     my $ExclPrj_orig = '';
@@ -1326,7 +1330,7 @@ sub check_deps_hash {
                                             CLIENT => '-'
                     };
                 };
-                RemoveFromDependencies($key, \%deps_hash);
+                remove_from_dependencies($key, \%deps_hash);
                 delete $deps_hash{$key};
                 $consistent++;
             };
@@ -1576,7 +1580,6 @@ sub get_options {
         $arg =~ /^--genconf$/        and $generate_config = 1                  and next;
         if ($arg =~ /^--add$/)      {
                                         get_list_of_modules(\%add_to_config);
-                                        $add_modules_to_config++;
                                         next;
         };
         if ($arg =~ /^--remove$/)   {
@@ -1676,16 +1679,19 @@ sub get_options {
 };
 
 sub get_module_and_buildlist_paths {
-    my $source_config = SourceConfig -> new($StandDir);
-    $source_config_file = $source_config->get_config_file_path();
-    $active_modules{$_}++ foreach ($source_config->get_active_modules());
-    my %active_modules_copy = %active_modules;
-    foreach ($source_config->get_all_modules()) {
-        delete $active_modules_copy{$_} if defined($active_modules_copy{$_});
-        $module_paths{$_} = $source_config->get_module_path($_);
-        $build_list_paths{$_} = $source_config->get_module_build_list($_)
-    }
-    $dead_parents{$_}++ foreach (keys %active_modules_copy);
+    if ($build_all_parents) {
+        my $source_config = SourceConfig -> new($StandDir);
+        $source_config_file = $source_config->get_config_file_path();
+        $active_modules{$_}++ foreach ($source_config->get_active_modules());
+        my %active_modules_copy = %active_modules;
+        foreach ($source_config->get_all_modules()) {
+            delete $active_modules_copy{$_} if defined($active_modules_copy{$_});
+            next if ($_ eq $initial_module);
+            $module_paths{$_} = $source_config->get_module_path($_);
+            $build_list_paths{$_} = $source_config->get_module_build_list($_)
+        }
+        $dead_parents{$_}++ foreach (keys %active_modules_copy);
+    };
 };
 
 
@@ -1735,7 +1741,7 @@ sub cancel_build {
     } else {
         $message_part .= "--all:@broken_modules_names\n";
     };
-    if ($broken_modules_number) {
+    if ($broken_modules_number && $build_all_parents) {
         print "\n";
         print $broken_modules_number;
         print " module(s): ";
@@ -1848,7 +1854,7 @@ sub clear_from_child {
     if (defined $broken_build{$child_nick}) {
         $error_code = $broken_build{$child_nick};
     } else {
-        RemoveFromDependencies($child_nick,
+        remove_from_dependencies($child_nick,
                             $folders_hashes{$child_nick});
     };
     foreach (keys %module_deps_hash_pids) {
@@ -2034,12 +2040,12 @@ sub build_actual_queue {
                 delete $$build_queue{$Prj};
                 next;
             };
-            $started_children =+ build_dependent($projects_deps_hash{$Prj});
+            $started_children += build_dependent($projects_deps_hash{$Prj});
             if ((!scalar keys %{$projects_deps_hash{$Prj}}) &&
                 !$running_children{$projects_deps_hash{$Prj}}) {
                 if (!defined $modules_with_errors{$projects_deps_hash{$Prj}} || $ignore)
                 {
-                    RemoveFromDependencies($Prj, \%global_deps_hash);
+                    remove_from_dependencies($Prj, \%global_deps_hash);
                     $build_is_finished{$Prj}++;
                     delete $$build_queue{$Prj};
                     $finished_projects++;
@@ -2060,10 +2066,8 @@ sub build_actual_queue {
 sub run_job {
     my ($job, $path, $registered_name) = @_;
     my $job_to_do = $job;
-    if ( $show ) {
-        print "$job_to_do\n";
-        return 0;
-    }
+    print "$registered_name\n";
+    return 0 if ( $show );
     $job_to_do = $deliver_command if ($job eq 'deliver');
     $registered_name = $path if (!defined $registered_name);
     chdir $path;
@@ -2095,7 +2099,7 @@ sub do_custom_job {
     if ($job eq $pre_job) {
         announce_module($module);
 #        html_store_job_info($dependencies_hash, $job_dir);
-        RemoveFromDependencies($module_job, $dependencies_hash);
+        remove_from_dependencies($module_job, $dependencies_hash);
     } else {
         $error_code = run_job($job, $module_paths{$module}, $module_job);
         if ($error_code) {
@@ -2108,7 +2112,7 @@ sub do_custom_job {
             $modules_with_errors{$dependencies_hash}++;
             $broken_build{$module} = $error_code;
         } else {
-            RemoveFromDependencies($module_job, $dependencies_hash);
+            remove_from_dependencies($module_job, $dependencies_hash);
         };
     };
     html_store_job_info($dependencies_hash, $module_job, $error_code);
@@ -2349,19 +2353,17 @@ sub fix_permissions {
 sub prepare_incompatible_build {
     my ($prj, $deps_hash, @missing_modules);
     $deps_hash = shift;
-    foreach (keys %incompatibles) {
-        my $incomp_prj = $_;
-        if (!defined $$deps_hash{$_}) {
-            $incomp_prj .= '.lnk' if ($module_paths{$module} =~ /\.lnk$/);
-            $incomp_prj .= '.link' if ($module_paths{$module} =~ /\.link$/);
+    foreach my $module (keys %incompatibles) {
+        if (!defined $$deps_hash{$module}) {
+            print_error("The module $initial_module is independent from $module\n");
         }
-        delete $incompatibles{$_};
-        $incompatibles{$incomp_prj} = $$deps_hash{$incomp_prj};
-        delete $$deps_hash{$incomp_prj};
+        delete $incompatibles{$module};
+        $incompatibles{$module} = $$deps_hash{$module};
+        delete $$deps_hash{$module};
     }
     while ($prj = pick_prj_to_build($deps_hash)) {
-        RemoveFromDependencies($prj, $deps_hash);
-        RemoveFromDependencies($prj, \%incompatibles);
+        remove_from_dependencies($prj, $deps_hash);
+        remove_from_dependencies($prj, \%incompatibles);
     };
     foreach (keys %incompatibles) {
         $$deps_hash{$_} = $incompatibles{$_};
@@ -2373,7 +2375,7 @@ sub prepare_incompatible_build {
     @modules_built = keys %$deps_hash;
     %add_to_config = %$deps_hash;
     if ($prepare) {
-        generate_config_file();
+        generate_config_file() if ((!defined $ENV{UPDATER}) || (defined $ENV{CWS_WORK_STAMP}));
         clear_delivered();
     }
     my $old_output_tree = '';
@@ -2419,16 +2421,16 @@ sub prepare_incompatible_build {
 # Removes projects which it is not necessary to build
 # with -with_branches switch
 #
-sub prepare_build_from {
-    my ($prj, $deps_hash);
-    $deps_hash = shift;
-    my %from_deps_hash = ();   # hash of dependencies of the -from project
-    get_parent_deps($build_from_with_branches, \%from_deps_hash);
-    foreach $prj (keys %from_deps_hash) {
-        delete $$deps_hash{$prj};
-        RemoveFromDependencies($prj, $deps_hash);
-    };
-};
+#sub prepare_build_from {
+#    my ($prj, $deps_hash);
+#    $deps_hash = shift;
+#    my %from_deps_hash = ();   # hash of dependencies of the -from project
+#    get_parent_deps($build_from_with_branches, \%from_deps_hash);
+#    foreach $prj (keys %from_deps_hash) {
+#        delete $$deps_hash{$prj};
+#        remove_from_dependencies($prj, $deps_hash);
+#    };
+#};
 
 #
 # Removes projects which it is not necessary to build
@@ -2445,13 +2447,13 @@ sub prepare_build_all_cont {
         $orig_prj = $` if ($prj =~ /\.link$/o);
         if (($border_prj ne $prj) &&
             ($border_prj ne $orig_prj)) {
-            RemoveFromDependencies($prj, $deps_hash);
+            remove_from_dependencies($prj, $deps_hash);
             next;
         } else {
             if ($build_all_cont) {
                 $$deps_hash{$prj} = ();
             } else {
-                RemoveFromDependencies($prj, $deps_hash);
+                remove_from_dependencies($prj, $deps_hash);
             };
             return;
         };
@@ -2605,15 +2607,15 @@ sub clear_delivered {
         my $undeliver = "$deliver_command $deliver_delete_switches $nul";
 #        my $current_dir = getcwd();
         foreach my $module (sort @modules_built) {
-            if (!chdir($module_paths{$module})) {
-                push(@warnings, "Could not remove delivered files from the module $module. Your build can become inconsistent.\n");
-            } else {
+            if (chdir($module_paths{$module})) {
                 print "Removing delivered from module $module\n";
                 next if ($show);
                 if (system($undeliver)) {
                     $ENV{$_} = $backup_vars{$_} foreach (keys %backup_vars);
                     print_error("Cannot run: $undeliver");
                 }
+            } else {
+                push(@warnings, "Could not remove delivered files from the module $module. Your build can become inconsistent.\n");
             };
         };
 #        chdir $current_dir;
@@ -3520,9 +3522,9 @@ sub get_job_string {
             };
         } while (!$job_dir);
     } else {
-        $dependencies_hash = \%LocalDepsHash;
+        $dependencies_hash = \%local_deps_hash;
         do {
-            $job_dir = pick_prj_to_build(\%LocalDepsHash);
+            $job_dir = pick_prj_to_build(\%local_deps_hash);
             if (!$job_dir && !children_number()) {
                 cancel_build() if (scalar keys %broken_build);
                 mp_success_exit();
@@ -3577,7 +3579,7 @@ sub pick_jobdir {
         if ((!scalar keys %$prj_deps_hash) && !$running_children{$prj_deps_hash}) {
             if (!defined $modules_with_errors{$prj_deps_hash} || $ignore)
             {
-                RemoveFromDependencies($Prj, \%global_deps_hash);
+                remove_from_dependencies($Prj, \%global_deps_hash);
                 $build_is_finished{$Prj}++;
                 splice (@$build_queue, $i, 1);
                 next;
diff --git a/solenv/bin/localize b/solenv/bin/localize
index 74a75ecc3aee..e14b149226b5 100755
--- a/solenv/bin/localize
+++ b/solenv/bin/localize
@@ -12,9 +12,9 @@ else
     export LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
 fi
 
-if [ x${SOLARVER}x = xx -o x${UPDMINOR}x = xx  ]; then
+if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
     exec perl -w $SOLARVERSION/$INPATH/bin/localize.pl "$@"
 else
-    exec perl -w $SOLARVERSION/$INPATH/bin.$UPDMINOR/localize.pl "$@"
+    exec perl -w $SOLARVERSION/$INPATH/bin$UPDMINOREXT/localize.pl "$@"
 fi
 
diff --git a/solenv/bin/localize_sl b/solenv/bin/localize_sl
new file mode 100755
index 000000000000..df8205cf6d22
--- /dev/null
+++ b/solenv/bin/localize_sl
@@ -0,0 +1,18 @@
+#!/bin/sh
+if [ x${SOLARENV}x = xx ]; then
+    echo No environment found, please use 'setsolar'
+exit 1
+fi
+
+if [ "${OS?}" = MACOSX ]; then
+    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+else
+    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+fi
+
+if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
+    exec $SOLARVERSION/$INPATH/bin/localize_sl "$@"
+else
+    exec $SOLARVERSION/$INPATH/bin$UPDMINOREXT/localize_sl "$@"
+fi
+
diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm
index e43b1f50a990..088005e43d7b 100644
--- a/solenv/bin/modules/SourceConfig.pm
+++ b/solenv/bin/modules/SourceConfig.pm
@@ -57,12 +57,16 @@ sub new {
     my $proto = shift;
     my $class = ref($proto) || $proto;
     my $source_root = shift;
+    my $self = {};
+    $self->{USER_SOURCE_ROOT} = undef;
     if (defined $source_root) {
+        $self->{USER_SOURCE_ROOT} = $source_root;
         $source_root =~ s/\\|\/$//;
+        $source_root .= '/..';
     } else {
-        $source_root = $ENV{SOLARSRC};
+        $source_root = $ENV{SOURCE_ROOT_DIR};
     };
-    my $self = {};
+    $source_root = Cwd::realpath($source_root);
     $self->{DEBUG} = 0;
     $self->{SOURCE_ROOT} = $source_root;
     $self->{REPOSITORIES} = {};
@@ -71,8 +75,11 @@ sub new {
     $self->{ACTIVATED_MODULES} = {};
     $self->{MODULE_REPOSITORY} = {};
     $self->{REAL_MODULES} = {};
+    if (defined $self->{USER_SOURCE_ROOT}) {
+        ${$self->{REPOSITORIES}}{File::Basename::basename($self->{USER_SOURCE_ROOT})} = $self->{USER_SOURCE_ROOT};
+    };
     $self->{SOURCE_CONFIG_FILE} = get_config_file($source_root);
-    $self->{SOURCE_CONFIG_DEFAULT} = Cwd::realpath($source_root) .'/'.SOURCE_CONFIG_FILE_NAME;
+    $self->{SOURCE_CONFIG_DEFAULT} = $source_root .'/'.SOURCE_CONFIG_FILE_NAME;
     read_config_file($self);
     bless($self, $class);
     return $self;
@@ -201,23 +208,46 @@ sub get_module_paths {
             croak("Cannot read $_ repository content");
         };
     };
+    my @false_actives = ();
+    foreach (keys %{$self->{ACTIVATED_MODULES}}) {
+        push(@false_actives, $_) if (!defined  ${$self->{MODULE_PATHS}}{$_});
+    };
+    croak("Error!! Activated module(s): @false_actives\nnot found in the active repositories!! Please check your " . $self->{SOURCE_CONFIG_FILE} . "\n") if (scalar @false_actives);
     croak("No modules found!") if (!scalar keys %{$self->{MODULE_PATHS}});
 };
 
 sub get_config_file {
     my $source_root = shift;
-    foreach ($source_root, $source_root . '/..') {
-        if (-f $_ . '/' . SOURCE_CONFIG_FILE_NAME) {
-            return Cwd::realpath($_) .'/'.SOURCE_CONFIG_FILE_NAME;
+    my $possible_path = $source_root . '/' . SOURCE_CONFIG_FILE_NAME;
+    return $possible_path if (-f $possible_path);
+    return '';
+};
+
+sub get_hg_root {
+    my $self = shift;
+    return $self->{USER_SOURCE_ROOT} if (defined $self->{USER_SOURCE_ROOT});
+    my $hg_root;
+    if (open(COMMAND, "hg root 2>&1 |")) {
+        foreach (<COMMAND>) {
+            next if (/^Not trusting file/);
+            chomp;
+            $hg_root = $_;
+            last;
+        };
+        close COMMAND;
+        chomp $hg_root;
+        if ($hg_root !~ /There is no Mercurial repository here/) {
+            return $hg_root;
         };
     };
-    return '';
+    croak('Cannot open find source_config and/or determine hg root directory for ' . cwd());
 };
 
 sub read_config_file {
     my $self = shift;
     if (!$self->{SOURCE_CONFIG_FILE}) {
-        ${$self->{REPOSITORIES}}{File::Basename::basename($self->{SOURCE_ROOT})} = $self->{SOURCE_ROOT};
+        my $repository_root = get_hg_root($self);
+        ${$self->{REPOSITORIES}}{File::Basename::basename($repository_root)} = $repository_root;
         return;
     };
     my $repository_section = 0;
@@ -243,7 +273,7 @@ sub read_config_file {
             next if (!$repository_section && !$module_section);
             if (/\s*(\S+)=active\s*(\s+#)*/) {
                 if ($repository_section) {
-                    ${$self->{REPOSITORIES}}{$1} = File::Basename::dirname($self->{SOURCE_ROOT}) . "/$1";
+                    ${$self->{REPOSITORIES}}{$1} = $self->{SOURCE_ROOT} . "/$1";
                     next;
                 }
                 if ($module_section) {
@@ -254,6 +284,11 @@ sub read_config_file {
             croak("Line $line in " . $self->{SOURCE_CONFIG_FILE} . 'violates format. Please make your checks!!');
         };
         close SOURCE_CONFIG_FILE;
+        if (!scalar keys %{$self->{REPOSITORIES}}) {
+            # Fallback - default repository is the directory where is our module...
+            my $hg_root = get_hg_root($self);
+            ${$self->{REPOSITORIES}}{File::Basename::basename($hg_root)} = $hg_root;
+        };
     } else {
         croak('Cannot open ' . $self->{SOURCE_CONFIG_FILE} . 'for reading');
     };
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index c3b6f91c9dd7..055c5c146d98 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 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
 			common_build TRUE
 			COMMON_OUTDIR common
 			CONFIG_PROJECT config_office
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index c81283b50ebb..b2edcd774b83 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=300
-RSCREVISION=300m70(Build:9478)
-BUILD=9478
-LAST_MINOR=m70
+RSCREVISION=300m71(Build:9481)
+BUILD=9481
+LAST_MINOR=m71
 SOURCEVERSION=DEV300
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 991309d6de6e..2722661ab45d 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -32,7 +32,7 @@
 MKFILENAME:=RULES.MK
 
 $(OBJ)/%.obj : %.cxx
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx
@@ -56,7 +56,7 @@ $(OBJ)/%.obj : %.cxx
 .ENDIF			# "$(nodep)"==""
 
 $(OBJ)/%.obj : %.cpp
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp
@@ -78,7 +78,7 @@ $(OBJ)/%.obj : %.cpp
 .ENDIF			# "$(nodep)"==""
 
 $(OBJ)/%.obj : %.cc
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cc
@@ -159,7 +159,7 @@ $(SLO)/precompiled_ex.% .PHONY:
 .ENDIF			# "$(ENABLE_PCH)"!=""
 
 $(SLO)/%.obj : %.cxx
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(ENABLE_PCH)"!="" && ( "$(BUILD_SPECIAL)"!="TRUE" )
 # just a helper var	
     @noop $(assign used_exc_switches=$(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)))
@@ -198,7 +198,7 @@ $(SLO)/%.obj : %.cxx
 .ENDIF			# "$(nodep)"==""
 
 $(SLO)/%.obj : %.cpp
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(PWD)/$*.cpp
@@ -224,7 +224,7 @@ $(SLO)/%.obj : %.cpp
 .ENDIF			# "$(nodep)"==""
 
 $(SLO)/%.obj : $(MISC)/%.cxx
-    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(MISC)/$*.cxx
@@ -249,7 +249,7 @@ $(SLO)/%.obj : $(MISC)/%.cxx
 .ENDIF			# "$(nodep)"==""
 
 $(SLO)/%.obj : $(MISC)/%.cc
-    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(MISC)/$*.cc
@@ -266,7 +266,7 @@ $(SLO)/%.obj : $(MISC)/%.cc
 .ENDIF
 
 $(OBJ)/%.obj : $(MISC)/%.cxx
-    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(MISC)/$*.cxx
@@ -291,7 +291,7 @@ $(OBJ)/%.obj : $(MISC)/%.cxx
 .ENDIF			# "$(nodep)"==""
 
 $(OBJ)/%.obj : %.c
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
     $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.c
@@ -321,7 +321,7 @@ $(OBJ)/%.obj : %.c
 .ENDIF			# "$(nodep)"==""
 
 $(OBJ)/%.obj : $(MISC)/%.c
-    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.c
@@ -343,7 +343,7 @@ $(OBJ)/%.obj : $(MISC)/%.c
 .ENDIF			# "$(nodep)"==""
 
 $(SLO)/%.obj : $(MISC)/%.c
-    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.c
@@ -366,7 +366,7 @@ $(SLO)/%.obj : $(MISC)/%.c
 .ENDIF			# "$(nodep)"==""
 
 $(SLO)/%.obj : %.c
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.c
@@ -389,7 +389,7 @@ $(SLO)/%.obj : %.c
 
 # Objective-C files
 $(OBJ)/%.obj : %.m
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(OS)"=="MACOSX"
 .IF "$(TEST)"!=""
     $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.m
@@ -404,7 +404,7 @@ $(OBJ)/%.obj : %.m
 
 # Objective-C files
 $(OBJ)/%.obj : $(MISC)/%.m
-    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
 .IF "$(OS)"=="MACOSX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.m
@@ -415,7 +415,7 @@ $(OBJ)/%.obj : $(MISC)/%.m
 
 # Objective-C files
 $(SLO)/%.obj : $(MISC)/%.m
-    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE)
 .IF "$(OS)"=="MACOSX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.m
@@ -426,7 +426,7 @@ $(SLO)/%.obj : $(MISC)/%.m
 
 # Objective-C files
 $(SLO)/%.obj : %.m
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(OS)"=="MACOSX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.m
@@ -442,7 +442,7 @@ not_existing/o_%.dpcc : %.c;@noop $(assign all_local_obj+:=$<)
 
 # Objective-C++ files
 $(OBJ)/%.obj : %.mm
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(OS)"=="MACOSX"
 .IF "$(TEST)"!=""
     $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.mm
@@ -461,7 +461,7 @@ $(OBJ)/%.obj : %.mm
 
 # Objective-C++ files
 $(OBJ)/%.obj : $(MISC)/%.mm
-    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
 .IF "$(OS)"=="MACOSX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.mm
@@ -476,7 +476,7 @@ $(OBJ)/%.obj : $(MISC)/%.mm
 
 # Objective-C++ files
 $(SLO)/%.obj : $(MISC)/%.mm
-    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE)
 .IF "$(OS)"=="MACOSX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.mm
@@ -491,7 +491,7 @@ $(SLO)/%.obj : $(MISC)/%.mm
 
 # Objective-C++ files
 $(SLO)/%.obj : %.mm
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(OS)"=="MACOSX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.mm
@@ -639,7 +639,7 @@ $(MISC)/%.dpj :
 .ENDIF			# "$(nodep)"==""
 
 $(SLO)/%.obj : %.asm
-       @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+       @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(COM)"=="GCC"
 .IF "$(ASM)"=="ml"
        $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm
@@ -666,7 +666,7 @@ $(SLO)/%.obj : %.asm
 .ENDIF
 
 $(OBJ)/%.obj : %.asm
-       @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+       @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(COM)"=="GCC"
 .IF "$(ASM)"=="ml"
        $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(OBJ)/$*.obj $*.asm
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 6110498edd29..2980d939a2ce 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -983,6 +983,8 @@ RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) $(SOLARBINDIR)/rsc
         ULFEX_VERBOSITY=-QQ
     .ENDIF
 .ENDIF # "$(VERBOSE)" == "TRUE"
+COMPILE_ECHO_SWITCH=
+COMPILE_ECHO_FILE=$(<:f)
 
 #new
 RSCUPDVER=$(RSCREVISION)
diff --git a/solenv/inc/tg_dep.mk b/solenv/inc/tg_dep.mk
index 22eb11198bb2..8fb6d5502fd4 100644
--- a/solenv/inc/tg_dep.mk
+++ b/solenv/inc/tg_dep.mk
@@ -94,6 +94,7 @@ ALLDPC:
     @echo $(EMQ)# > $(MISC)/$(TARGET).dpc
 
 ALLDEP:
+    @echo nothing to do here...
 
 .ENDIF
 
diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk
index 3d2750fd2dc6..1bb994f1ad6f 100644
--- a/solenv/inc/wntmsci11.mk
+++ b/solenv/inc/wntmsci11.mk
@@ -75,6 +75,11 @@ CXX+= /NMttNoLines
 NOLOGO*=-nologo
 .ENDIF
 
+.IF "$(VERBOSE)" != "TRUE"
+COMPILE_ECHO_SWITCH=-n
+COMPILE_ECHO_FILE=
+.ENDIF
+
 # Flags for COMEX == 11
 
 # disable "warning C4675: resolved overload was found by argument-dependent
diff --git a/soltools/mkdepend/collectdircontent.cxx b/soltools/mkdepend/collectdircontent.cxx
index 691996d56cca..c9308faf0562 100755
--- a/soltools/mkdepend/collectdircontent.cxx
+++ b/soltools/mkdepend/collectdircontent.cxx
@@ -73,6 +73,10 @@ extern "C" {
             return new IncludesCollection;
     }
 
+    void delete_IncludesCollection(IncludesCollection *m) {
+            delete m;
+    }
+
     int call_IncludesCollection_exists(IncludesCollection* m, const char * filePath) {
         return m->exists(filePath);
     }
diff --git a/soltools/mkdepend/collectdircontent.hxx b/soltools/mkdepend/collectdircontent.hxx
index 1ffd9cf60f0c..1896df0c8bc7 100644
--- a/soltools/mkdepend/collectdircontent.hxx
+++ b/soltools/mkdepend/collectdircontent.hxx
@@ -47,6 +47,7 @@ extern "C" {
 #endif
 
 struct IncludesCollection * create_IncludesCollection(void);
+void delete_IncludesCollection(struct IncludesCollection *);
 
 int call_IncludesCollection_exists(struct IncludesCollection* m, const char* filePath);
 
diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c
index a786f5a4d7f6..fd9bdc18e5d2 100644
--- a/soltools/mkdepend/main.c
+++ b/soltools/mkdepend/main.c
@@ -465,6 +465,9 @@ int main(argc, argv)
     }
     if (printed)
         printf("\n");
+
+    delete_IncludesCollection(incCollection);
+
     exit(0);
 }
 
diff --git a/splitbuild/prj/build.lst b/splitbuild/prj/build.lst
index 82a85ea665fe..39ab5b22f919 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 transex3 ucb  ucbhelper unotools unoxml vos xmerge xmlhelp xmloff xmlscript wizards animations sd slideshow migrationanalysis reportbuilder sdext swext afms agg apache-commons apple_remote beanshell berkeleydb bitstream_vera_fonts boost cairo cppunit curl epm expat external fondu graphite hsqldb hunspell hyphen icc icu JFREEREPORT:jfreereport jpeg libegg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD moz neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib automation avmedia basic drawinglayer embeddedobj filter formula fpicker framework idl oox sfx2 svx uui accessibility canvas cppcanvas dtrans padmin psprint_config setup_native svtools vbahelper 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