sb120: merged in DEV300_m78

author: sb <sb@openoffice.org> 2010-05-20 15:46:46 +0200
committer: sb <sb@openoffice.org> 2010-05-20 15:46:46 +0200
commit: 09993c4710798dfb1e9c67b2a02a31ce14adab98 (patch)
tree: 7dfd861fc95b03d54f15c5daba8cca73a07a81c3
parent: 4aee4ee739adaa21e46876ec1c4ac941d54ed8d5 (diff)
parent: ff94b38b00f90b4fbc8f49d132d46f27c537e143 (diff)
48 files changed, 12706 insertions, 5871 deletions
diff --git a/configure b/configure
index b4edc39b6ff0..41c9001eaa19 100755
--- a/configure
+++ b/configure
@@ -1,23 +1,19 @@
 #! /bin/sh
 # From configure.in Revision: 1.290  .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65.
-#
+# Generated by GNU Autoconf 2.63.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-#
-#
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+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
@@ -25,15 +21,23 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
 esac
+
 fi
 
 
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
 as_nl='
 '
 export as_nl
@@ -41,13 +45,7 @@ export as_nl
 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
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -58,7 +56,7 @@ else
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in #(
+      case $arg in
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -81,6 +79,13 @@ if test "${PATH_SEPARATOR+set}" != set; then
   }
 fi
 
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -90,15 +95,15 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in #((
+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
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
 IFS=$as_save_IFS
 
      ;;
@@ -110,16 +115,12 @@ if test "x$as_myself" = x; then
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
+  { (exit 1); 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 || :
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
 done
 PS1='$ '
 PS2='> '
@@ -131,299 +132,330 @@ export LC_ALL
 LANGUAGE=C
 export LANGUAGE
 
+# Required to use basename.
+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
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
 # CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+$as_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
+  if (eval ":") 2>/dev/null; then
+  as_have_required=yes
 else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
+  as_have_required=no
 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; }
+
+  if test $as_have_required = yes &&	 (eval ":
+(as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
 
 exitcode=0
-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
+if as_func_success; then
+  :
 else
-  as_have_required=no
+  exitcode=1
+  echo as_func_success failed.
 fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
 else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=\$LINENO
+  as_lineno_2=\$LINENO
+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+  :
+else
+  as_candidate_shells=
+    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=.
-  as_found=:
-  case $as_dir in #(
+  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
+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
 	   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
+      for as_shell in $as_candidate_shells $SHELL; do
+	 # Try only shells that exist, to save several forks.
+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
 
-    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_echo "$0: Please tell bug-autoconf@gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
-  fi
-  exit 1
-fi
 fi
+
+
+:
+_ASEOF
+}; then
+  CONFIG_SHELL=$as_shell
+	       as_have_required=yes
+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-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_func_return () {
+  (exit $1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
 }
-as_unset=as_fn_unset
 
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
 
-# 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 ()
-{
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
 
-  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
-  }'
+if as_func_ret_success; then
+  :
 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=$(( $* ))
-  }'
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+  :
 else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
+  exitcode=1
+  echo positional parameters were not saved.
+fi
 
+test $exitcode = 0) || { (exit 1); exit 1; }
 
-# 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
+(
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
 
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
+_ASEOF
+}; then
+  break
+fi
+
+fi
+
+      done
+
+      if test "x$CONFIG_SHELL" != x; then
+  for as_var in BASH_ENV ENV
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+    if test $as_have_required = no; then
+  echo This script requires a shell more modern than all the
+      echo shells that I found on your system.  Please install a
+      echo modern shell, or manually run the script under such a
+      echo shell if you do have one.
+      { (exit 1); exit 1; }
+fi
+
+
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
 else
-  as_expr=false
+  exitcode=1
+  echo as_func_success failed.
 fi
 
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
 else
-  as_basename=false
+  exitcode=1
+  echo as_func_ret_success failed.
 fi
 
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
 else
-  as_dirname=false
+  exitcode=1
+  echo positional parameters were not saved.
 fi
 
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
+test \$exitcode = 0") || {
+  echo No shell found that supports shell functions.
+  echo Please tell bug-autoconf@gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
+}
+
 
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
 
-  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.  :-)
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
     /[$]LINENO/=
@@ -440,7 +472,8 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { $as_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
@@ -450,18 +483,29 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   exit
 }
 
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
+case `echo -n x` in
 -n*)
-  case `echo 'xy\c'` in
+  case `echo 'x\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='	';;
+  *)   ECHO_C='\c';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -491,7 +535,7 @@ 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='mkdir -p "$as_dir"'
+  as_mkdir_p=:
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -510,10 +554,10 @@ else
       if test -d "$1"; then
 	test -d "$1/.";
       else
-	case $1 in #(
+	case $1 in
 	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -527,8 +571,8 @@ 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'"
 
 
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
+
+exec 7<&0 </dev/null 6>&1
 
 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
@@ -546,6 +590,7 @@ cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
 PACKAGE_NAME=
@@ -553,7 +598,6 @@ PACKAGE_TARNAME=
 PACKAGE_VERSION=
 PACKAGE_STRING=
 PACKAGE_BUGREPORT=
-PACKAGE_URL=
 
 # Factoring default headers for most tests.
 ac_includes_default="\
@@ -988,7 +1032,6 @@ bindir
 program_transform_name
 prefix
 exec_prefix
-PACKAGE_URL
 PACKAGE_BUGREPORT
 PACKAGE_STRING
 PACKAGE_VERSION
@@ -1132,6 +1175,7 @@ with_system_mythes
 with_system_altlinuxhyph
 with_system_lpsolve
 with_system_cppunit
+with_system_redland
 with_system_mozilla
 with_stlport
 with_jdk_home
@@ -1294,7 +1338,8 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1320,7 +1365,8 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1524,7 +1570,8 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1540,7 +1587,8 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1570,17 +1618,17 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
-    esac
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+   { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
@@ -1597,13 +1645,15 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1626,7 +1676,8 @@ do
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; }
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1656,9 +1707,11 @@ 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"
+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
+   { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
+   { (exit 1); exit 1; }; }
 
 
 # Find the source files, if location was not specified.
@@ -1697,11 +1750,13 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+   { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
+   { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -2178,6 +2233,8 @@ Optional Packages:
 
   --with-system-cppunit         Use cppunit already on system
 
+  --with-system-redland   Use redland library already on system
+
   --with-system-mozilla   Use mozilla already on system. Note that some
                           components cannot be built against a contemporary
                           mozilla. The flavour used can be specified by
@@ -2390,7 +2447,7 @@ Some influential environment variables:
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+  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
@@ -2401,7 +2458,6 @@ Some influential environment variables:
 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
@@ -2465,857 +2521,21 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.65
+generated by GNU Autoconf 2.63
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
   exit
 fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $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
-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;}
-  as_fn_set_status $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
-
-       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;}
-  as_fn_set_status $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;}
-  as_fn_set_status $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;}
-  as_fn_set_status $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
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_hi=$ac_mid
-else
-  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in #((
-?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
-'') ac_retval=1 ;;
-esac
-  else
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-static long int longval () { return $2; }
-static unsigned long int ulongval () { return $2; }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (($2) < 0)
-    {
-      long int i = longval ();
-      if (i != ($2))
-	return 1;
-      fprintf (f, "%ld", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ($2))
-	return 1;
-      fprintf (f, "%lu", i);
-    }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
-else
-  ac_retval=1
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-rm -f conftest.val
-
-  fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $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;}
-  as_fn_set_status $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;}
-  as_fn_set_status $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.65.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
 
@@ -3351,8 +2571,8 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
+  $as_echo "PATH: $as_dir"
+done
 IFS=$as_save_IFS
 
 } >&5
@@ -3389,9 +2609,9 @@ do
       ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
     2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
+      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
       if test $ac_must_keep_next = true; then
 	ac_must_keep_next=false # Got value, back to normal.
       else
@@ -3407,13 +2627,13 @@ do
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      as_fn_append ac_configure_args " '$ac_arg'"
+      ac_configure_args="$ac_configure_args '$ac_arg'"
       ;;
     esac
   done
 done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
@@ -3438,13 +2658,13 @@ _ASBOX
     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
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
+      *) $as_unset $ac_var ;;
       esac ;;
     esac
   done
@@ -3516,39 +2736,37 @@ _ASBOX
     exit $exit_status
 ' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-$as_echo "/* confdefs.h */" > confdefs.h
-
 # Predefined preprocessor variables.
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_NAME "$PACKAGE_NAME"
 _ACEOF
 
+
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 _ACEOF
 
+
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION "$PACKAGE_VERSION"
 _ACEOF
 
+
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_STRING "$PACKAGE_STRING"
 _ACEOF
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
 
 cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _ACEOF
 
 
@@ -3568,8 +2786,8 @@ fi
 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
   test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+  if test -r "$ac_site_file"; then
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
@@ -3577,10 +2795,10 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special files
-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+  # Some versions of bash will fail to source /dev/null (special
+  # files actually), so we avoid doing that.
+  if test -f "$cache_file"; then
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
@@ -3588,7 +2806,7 @@ $as_echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
 $as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -3603,11 +2821,11 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { $as_echo "$as_me:$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)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
@@ -3617,17 +2835,17 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
 	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:$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:$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:$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:$LINENO:   current value: \`$ac_new_val'" >&5
 $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
@@ -3639,20 +2857,35 @@ $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
     esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+  { $as_echo "$as_me:$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:$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
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+   { (exit 1); exit 1; }; }
 fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -3664,13 +2897,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 echo "$@" >config.parms
 
 # Check whether --with-gnu-patch was given.
-if test "${with_gnu_patch+set}" = set; then :
+if test "${with_gnu_patch+set}" = set; then
   withval=$with_gnu_patch;
 fi
 
 
 # Check whether --with-agg was given.
-if test "${with_agg+set}" = set; then :
+if test "${with_agg+set}" = set; then
   withval=$with_agg;
 else
   with_agg=yes
@@ -3678,72 +2911,72 @@ fi
 
 
 # Check whether --with-gnu-cp was given.
-if test "${with_gnu_cp+set}" = set; then :
+if test "${with_gnu_cp+set}" = set; then
   withval=$with_gnu_cp;
 fi
 
 # Check whether --enable-graphite was given.
-if test "${enable_graphite+set}" = set; then :
+if test "${enable_graphite+set}" = set; then
   enableval=$enable_graphite;
 fi
 
 
 # Check whether --with-system-graphite was given.
-if test "${with_system_graphite+set}" = set; then :
+if test "${with_system_graphite+set}" = set; then
   withval=$with_system_graphite;
 fi
 
 # Check whether --enable-ldap was given.
-if test "${enable_ldap+set}" = set; then :
+if test "${enable_ldap+set}" = set; then
   enableval=$enable_ldap;
 fi
 
 # Check whether --enable-fetch-external was given.
-if test "${enable_fetch_external+set}" = set; then :
+if test "${enable_fetch_external+set}" = set; then
   enableval=$enable_fetch_external;
 fi
 
 
 # Check whether --with-external-tar was given.
-if test "${with_external_tar+set}" = set; then :
+if test "${with_external_tar+set}" = set; then
   withval=$with_external_tar;  TARFILE_LOCATION="$withval"
 
 fi
 
 
 # Check whether --with-openldap was given.
-if test "${with_openldap+set}" = set; then :
+if test "${with_openldap+set}" = set; then
   withval=$with_openldap;
 fi
 
 # Check whether --enable-lockdown was given.
-if test "${enable_lockdown+set}" = set; then :
+if test "${enable_lockdown+set}" = set; then
   enableval=$enable_lockdown;
 fi
 
 # Check whether --enable-vba was given.
-if test "${enable_vba+set}" = set; then :
+if test "${enable_vba+set}" = set; then
   enableval=$enable_vba;
 fi
 
 
 # Check whether --with-vba-package-format was given.
-if test "${with_vba_package_format+set}" = set; then :
+if test "${with_vba_package_format+set}" = set; then
   withval=$with_vba_package_format;
 fi
 
 # Check whether --enable-pch was given.
-if test "${enable_pch+set}" = set; then :
+if test "${enable_pch+set}" = set; then
   enableval=$enable_pch;
 fi
 
 # Check whether --enable-hids was given.
-if test "${enable_hids+set}" = set; then :
+if test "${enable_hids+set}" = set; then
   enableval=$enable_hids;
 fi
 
 # Check whether --enable-mozilla was given.
-if test "${enable_mozilla+set}" = set; then :
+if test "${enable_mozilla+set}" = set; then
   enableval=$enable_mozilla;
 else
   enable_mozilla="yes"
@@ -3751,24 +2984,24 @@ fi
 
 
 # Check whether --with-fonts was given.
-if test "${with_fonts+set}" = set; then :
+if test "${with_fonts+set}" = set; then
   withval=$with_fonts;
 fi
 
 
 # Check whether --with-ppds was given.
-if test "${with_ppds+set}" = set; then :
+if test "${with_ppds+set}" = set; then
   withval=$with_ppds;
 fi
 
 
 # Check whether --with-afms was given.
-if test "${with_afms+set}" = set; then :
+if test "${with_afms+set}" = set; then
   withval=$with_afms;
 fi
 
 # Check whether --enable-epm was given.
-if test "${enable_epm+set}" = set; then :
+if test "${enable_epm+set}" = set; then
   enableval=$enable_epm;
 else
   enable_epm="yes"
@@ -3776,127 +3009,127 @@ fi
 
 
 # Check whether --with-epm was given.
-if test "${with_epm+set}" = set; then :
+if test "${with_epm+set}" = set; then
   withval=$with_epm;
 fi
 
 
 # Check whether --with-package-format was given.
-if test "${with_package_format+set}" = set; then :
+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 :
+if test "${enable_odk+set}" = set; then
   enableval=$enable_odk;
 else
   enable_odk="yes"
 fi
 
 # Check whether --enable-mathmldtd was given.
-if test "${enable_mathmldtd+set}" = set; then :
+if test "${enable_mathmldtd+set}" = set; then
   enableval=$enable_mathmldtd;
 else
   enable_mathmldtd="yes"
 fi
 
 # Check whether --enable-evolution2 was given.
-if test "${enable_evolution2+set}" = set; then :
+if test "${enable_evolution2+set}" = set; then
   enableval=$enable_evolution2;
 fi
 
 
 # Check whether --with-system-stdlibs was given.
-if test "${with_system_stdlibs+set}" = set; then :
+if test "${with_system_stdlibs+set}" = set; then
   withval=$with_system_stdlibs;
 else
   checkforstdlibproblems=yes
 fi
 
 # Check whether --enable-cups was given.
-if test "${enable_cups+set}" = set; then :
+if test "${enable_cups+set}" = set; then
   enableval=$enable_cups;
 else
   enable_cups=yes
 fi
 
 # Check whether --enable-fontconfig was given.
-if test "${enable_fontconfig+set}" = set; then :
+if test "${enable_fontconfig+set}" = set; then
   enableval=$enable_fontconfig;
 else
   enable_fontconfig=yes
 fi
 
 # Check whether --enable-directx was given.
-if test "${enable_directx+set}" = set; then :
+if test "${enable_directx+set}" = set; then
   enableval=$enable_directx;
 else
   enable_directx=yes
 fi
 
 # Check whether --enable-activex was given.
-if test "${enable_activex+set}" = set; then :
+if test "${enable_activex+set}" = set; then
   enableval=$enable_activex;
 fi
 
 
 # Check whether --enable-atl was given.
-if test "${enable_atl+set}" = set; then :
+if test "${enable_atl+set}" = set; then
   enableval=$enable_atl;
 fi
 
 
 # Check whether --enable-symbols was given.
-if test "${enable_symbols+set}" = set; then :
+if test "${enable_symbols+set}" = set; then
   enableval=$enable_symbols;
 fi
 
 # Check whether --enable-strip-solver was given.
-if test "${enable_strip_solver+set}" = set; then :
+if test "${enable_strip_solver+set}" = set; then
   enableval=$enable_strip_solver;
 fi
 
 # Check whether --enable-werror was given.
-if test "${enable_werror+set}" = set; then :
+if test "${enable_werror+set}" = set; then
   enableval=$enable_werror;
 fi
 
 # Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then :
+if test "${enable_debug+set}" = set; then
   enableval=$enable_debug;
 fi
 
 # Check whether --enable-dbgutil was given.
-if test "${enable_dbgutil+set}" = set; then :
+if test "${enable_dbgutil+set}" = set; then
   enableval=$enable_dbgutil;
 fi
 
 # Check whether --enable-crashdump was given.
-if test "${enable_crashdump+set}" = set; then :
+if test "${enable_crashdump+set}" = set; then
   enableval=$enable_crashdump;
 fi
 
 # Check whether --enable-cl-standard was given.
-if test "${enable_cl_standard+set}" = set; then :
+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 :
+if test "${enable_gtk+set}" = set; then
   enableval=$enable_gtk;
 else
   enable_gtk=yes
 fi
 
 # Check whether --enable-systray was given.
-if test "${enable_systray+set}" = set; then :
+if test "${enable_systray+set}" = set; then
   enableval=$enable_systray;
 else
   enable_systray=yes
 fi
 
 # Check whether --enable-cairo was given.
-if test "${enable_cairo+set}" = set; then :
+if test "${enable_cairo+set}" = set; then
   enableval=$enable_cairo;
 else
   enable_cairo=no
@@ -3904,139 +3137,139 @@ fi
 
 
 # Check whether --with-system-cairo was given.
-if test "${with_system_cairo+set}" = set; then :
+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 :
+if test "${enable_opengl+set}" = set; then
   enableval=$enable_opengl;
 else
   enable_opengl=no
 fi
 
 # Check whether --enable-dbus was given.
-if test "${enable_dbus+set}" = set; then :
+if test "${enable_dbus+set}" = set; then
   enableval=$enable_dbus;
 else
   enable_dbus=no
 fi
 
 # Check whether --enable-gconf was given.
-if test "${enable_gconf+set}" = set; then :
+if test "${enable_gconf+set}" = set; then
   enableval=$enable_gconf;
 else
   enable_gconf=yes
 fi
 
 # Check whether --enable-gnome-vfs was given.
-if test "${enable_gnome_vfs+set}" = set; then :
+if test "${enable_gnome_vfs+set}" = set; then
   enableval=$enable_gnome_vfs;
 else
   enable_gnome_vfs=yes
 fi
 
 # Check whether --enable-gio was given.
-if test "${enable_gio+set}" = set; then :
+if test "${enable_gio+set}" = set; then
   enableval=$enable_gio;
 else
   enable_gio=no
 fi
 
 # Check whether --enable-static-gtk was given.
-if test "${enable_static_gtk+set}" = set; then :
+if test "${enable_static_gtk+set}" = set; then
   enableval=$enable_static_gtk;
 fi
 
 # Check whether --enable-layout was given.
-if test "${enable_layout+set}" = set; then :
+if test "${enable_layout+set}" = set; then
   enableval=$enable_layout;
 fi
 
 # Check whether --enable-build-mozilla was given.
-if test "${enable_build_mozilla+set}" = set; then :
+if test "${enable_build_mozilla+set}" = set; then
   enableval=$enable_build_mozilla;
 fi
 
 
 # Check whether --with-mozilla-version was given.
-if test "${with_mozilla_version+set}" = set; then :
+if test "${with_mozilla_version+set}" = set; then
   withval=$with_mozilla_version;
 fi
 
 
 # Check whether --with-mozilla-toolkit was given.
-if test "${with_mozilla_toolkit+set}" = set; then :
+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 :
+if test "${enable_nss_module+set}" = set; then
   enableval=$enable_nss_module;
 else
   enable_nss_module=yes
 fi
 
 # Check whether --enable-kde was given.
-if test "${enable_kde+set}" = set; then :
+if test "${enable_kde+set}" = set; then
   enableval=$enable_kde;
 fi
 
 # Check whether --enable-kdeab was given.
-if test "${enable_kdeab+set}" = set; then :
+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 was given.
-if test "${enable_kde4+set}" = set; then :
+if test "${enable_kde4+set}" = set; then
   enableval=$enable_kde4;
 fi
 
 # Check whether --enable-binfilter was given.
-if test "${enable_binfilter+set}" = set; then :
+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 was given.
-if test "${enable_rpath+set}" = set; then :
+if test "${enable_rpath+set}" = set; then
   enableval=$enable_rpath;
 fi
 
 # Check whether --enable-pam was given.
-if test "${enable_pam+set}" = set; then :
+if test "${enable_pam+set}" = set; then
   enableval=$enable_pam;
 fi
 
 # Check whether --enable-pam-link was given.
-if test "${enable_pam_link+set}" = set; then :
+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 :
+if test "${enable_crypt_link+set}" = set; then
   enableval=$enable_crypt_link;
 else
   enable_crypt_link=yes
 fi
 
 # Check whether --enable-xrender-link was given.
-if test "${enable_xrender_link+set}" = set; then :
+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 :
+if test "${enable_randr+set}" = set; then
   enableval=$enable_randr;
 else
   enable_randr=yes
 fi
 
 # Check whether --enable-randr-link was given.
-if test "${enable_randr_link+set}" = set; then :
+if test "${enable_randr_link+set}" = set; then
   enableval=$enable_randr_link;
 else
   enable_randr_link=yes
@@ -4044,448 +3277,454 @@ fi
 
 
 # Check whether --with-myspell-dicts was given.
-if test "${with_myspell_dicts+set}" = set; then :
+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 :
+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 :
+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 :
+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 :
+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 :
+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 :
+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 :
+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 :
+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 :
+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 :
+if test "${with_system_jpeg+set}" = set; then
   withval=$with_system_jpeg;
 fi
 
 
 # Check whether --with-system-expat was given.
-if test "${with_system_expat+set}" = set; then :
+if test "${with_system_expat+set}" = set; then
   withval=$with_system_expat;
 fi
 
 
 # Check whether --with-system-libwpd was given.
-if test "${with_system_libwpd+set}" = set; then :
+if test "${with_system_libwpd+set}" = set; then
   withval=$with_system_libwpd;
 fi
 
 
 # Check whether --with-system-libxml was given.
-if test "${with_system_libxml+set}" = set; then :
+if test "${with_system_libxml+set}" = set; then
   withval=$with_system_libxml;
 fi
 
 
 # Check whether --with-system-python was given.
-if test "${with_system_python+set}" = set; then :
+if test "${with_system_python+set}" = set; then
   withval=$with_system_python;
 fi
 
 
 # Check whether --with-system-icu was given.
-if test "${with_system_icu+set}" = set; then :
+if test "${with_system_icu+set}" = set; then
   withval=$with_system_icu;
 fi
 
 
 # Check whether --with-system-poppler was given.
-if test "${with_system_poppler+set}" = set; then :
+if test "${with_system_poppler+set}" = set; then
   withval=$with_system_poppler;
 fi
 
 
 # Check whether --with-system-db was given.
-if test "${with_system_db+set}" = set; then :
+if test "${with_system_db+set}" = set; then
   withval=$with_system_db;
 fi
 
 
 # Check whether --with-system-lucene was given.
-if test "${with_system_lucene+set}" = set; then :
+if test "${with_system_lucene+set}" = set; then
   withval=$with_system_lucene;
 fi
 
 
 # Check whether --with-lucene-core-jar was given.
-if test "${with_lucene_core_jar+set}" = set; then :
+if test "${with_lucene_core_jar+set}" = set; then
   withval=$with_lucene_core_jar;  LUCENE_CORE_JAR="$withval"
 
 fi
 
 
 # Check whether --with-lucene-analyzers-jar was given.
-if test "${with_lucene_analyzers_jar+set}" = set; then :
+if test "${with_lucene_analyzers_jar+set}" = set; then
   withval=$with_lucene_analyzers_jar;  LUCENE_ANALYZERS_JAR="$withval"
 
 fi
 
 # Check whether --enable-mysql-connector was given.
-if test "${enable_mysql_connector+set}" = set; then :
+if test "${enable_mysql_connector+set}" = set; then
   enableval=$enable_mysql_connector;
 fi
 
 
 # Check whether --with-system-mysql was given.
-if test "${with_system_mysql+set}" = set; then :
+if test "${with_system_mysql+set}" = set; then
   withval=$with_system_mysql;
 fi
 
 
 # Check whether --with-libmysql-path was given.
-if test "${with_libmysql_path+set}" = set; then :
+if test "${with_libmysql_path+set}" = set; then
   withval=$with_libmysql_path;
 fi
 
 
 # Check whether --with-system-mysql-cppconn was given.
-if test "${with_system_mysql_cppconn+set}" = set; then :
+if test "${with_system_mysql_cppconn+set}" = set; then
   withval=$with_system_mysql_cppconn;
 fi
 
 
 # Check whether --with-system-hsqldb was given.
-if test "${with_system_hsqldb+set}" = set; then :
+if test "${with_system_hsqldb+set}" = set; then
   withval=$with_system_hsqldb;
 fi
 
 
 # Check whether --with-hsqldb-jar was given.
-if test "${with_hsqldb_jar+set}" = set; then :
+if test "${with_hsqldb_jar+set}" = set; then
   withval=$with_hsqldb_jar;  HSQLDB_JAR="$withval"
 
 fi
 
 
 # Check whether --with-system-beanshell was given.
-if test "${with_system_beanshell+set}" = set; then :
+if test "${with_system_beanshell+set}" = set; then
   withval=$with_system_beanshell;
 fi
 
 
 # Check whether --with-beanshell-jar was given.
-if test "${with_beanshell_jar+set}" = set; then :
+if test "${with_beanshell_jar+set}" = set; then
   withval=$with_beanshell_jar;  BSH_JAR="$withval"
 
 fi
 
 # Check whether --enable-presenter-extra-ui was given.
-if test "${enable_presenter_extra_ui+set}" = set; then :
+if test "${enable_presenter_extra_ui+set}" = set; then
   enableval=$enable_presenter_extra_ui;
 else
   enable_presenter_extra_ui=no
 fi
 
 # Check whether --enable-minimizer was given.
-if test "${enable_minimizer+set}" = set; then :
+if test "${enable_minimizer+set}" = set; then
   enableval=$enable_minimizer;
 fi
 
 # Check whether --enable-presenter-console was given.
-if test "${enable_presenter_console+set}" = set; then :
+if test "${enable_presenter_console+set}" = set; then
   enableval=$enable_presenter_console;
 fi
 
 # Check whether --enable-pdfimport was given.
-if test "${enable_pdfimport+set}" = set; then :
+if test "${enable_pdfimport+set}" = set; then
   enableval=$enable_pdfimport;
 fi
 
 # Check whether --enable-wiki-publisher was given.
-if test "${enable_wiki_publisher+set}" = set; then :
+if test "${enable_wiki_publisher+set}" = set; then
   enableval=$enable_wiki_publisher;
 fi
 
 
 # Check whether --with-commons-codec-jar was given.
-if test "${with_commons_codec_jar+set}" = set; then :
+if test "${with_commons_codec_jar+set}" = set; then
   withval=$with_commons_codec_jar;  COMMONS_CODEC_JAR="$withval"
 
 fi
 
 
 # Check whether --with-commons-lang-jar was given.
-if test "${with_commons_lang_jar+set}" = set; then :
+if test "${with_commons_lang_jar+set}" = set; then
   withval=$with_commons_lang_jar;  COMMONS_LANG_JAR="$withval"
 
 fi
 
 
 # Check whether --with-commons-httpclient-jar was given.
-if test "${with_commons_httpclient_jar+set}" = set; then :
+if test "${with_commons_httpclient_jar+set}" = set; then
   withval=$with_commons_httpclient_jar;  COMMONS_HTTPCLIENT_JAR="$withval"
 
 fi
 
 
 # Check whether --with-commons-logging-jar was given.
-if test "${with_commons_logging_jar+set}" = set; then :
+if test "${with_commons_logging_jar+set}" = set; then
   withval=$with_commons_logging_jar;  COMMONS_LOGGING_JAR="$withval"
 
 fi
 
 
 # Check whether --with-servlet-api-jar was given.
-if test "${with_servlet_api_jar+set}" = set; then :
+if test "${with_servlet_api_jar+set}" = set; then
   withval=$with_servlet_api_jar;  SERVLETAPI_JAR="$withval"
 
 fi
 
 # Check whether --enable-report-builder was given.
-if test "${enable_report_builder+set}" = set; then :
+if test "${enable_report_builder+set}" = set; then
   enableval=$enable_report_builder;
 fi
 
 
 # Check whether --with-system-jfreereport was given.
-if test "${with_system_jfreereport+set}" = set; then :
+if test "${with_system_jfreereport+set}" = set; then
   withval=$with_system_jfreereport;
 fi
 
 
 # Check whether --with-sac-jar was given.
-if test "${with_sac_jar+set}" = set; then :
+if test "${with_sac_jar+set}" = set; then
   withval=$with_sac_jar;  SAC_JAR="$withval"
 
 fi
 
 
 # Check whether --with-libxml-jar was given.
-if test "${with_libxml_jar+set}" = set; then :
+if test "${with_libxml_jar+set}" = set; then
   withval=$with_libxml_jar;  LIBXML_JAR="$withval"
 
 fi
 
 
 # Check whether --with-flute-jar was given.
-if test "${with_flute_jar+set}" = set; then :
+if test "${with_flute_jar+set}" = set; then
   withval=$with_flute_jar;  FLUTE_JAR="$withval"
 
 fi
 
 
 # Check whether --with-jfreereport-jar was given.
-if test "${with_jfreereport_jar+set}" = set; then :
+if test "${with_jfreereport_jar+set}" = set; then
   withval=$with_jfreereport_jar;  JFREEREPORT_JAR="$withval"
 
 fi
 
 
 # Check whether --with-liblayout-jar was given.
-if test "${with_liblayout_jar+set}" = set; then :
+if test "${with_liblayout_jar+set}" = set; then
   withval=$with_liblayout_jar;  LIBLAYOUT_JAR="$withval"
 
 fi
 
 
 # Check whether --with-libloader-jar was given.
-if test "${with_libloader_jar+set}" = set; then :
+if test "${with_libloader_jar+set}" = set; then
   withval=$with_libloader_jar;  LIBLOADER_JAR="$withval"
 
 fi
 
 
 # Check whether --with-libloader-jar was given.
-if test "${with_libloader_jar+set}" = set; then :
+if test "${with_libloader_jar+set}" = set; then
   withval=$with_libloader_jar;  LIBLOADER_JAR="$withval"
 
 fi
 
 
 # Check whether --with-libformula-jar was given.
-if test "${with_libformula_jar+set}" = set; then :
+if test "${with_libformula_jar+set}" = set; then
   withval=$with_libformula_jar;  LIBFORMULA_JAR="$withval"
 
 fi
 
 
 # Check whether --with-librepository-jar was given.
-if test "${with_librepository_jar+set}" = set; then :
+if test "${with_librepository_jar+set}" = set; then
   withval=$with_librepository_jar;  LIBREPOSITORY_JAR="$withval"
 
 fi
 
 
 # Check whether --with-libfonts-jar was given.
-if test "${with_libfonts_jar+set}" = set; then :
+if test "${with_libfonts_jar+set}" = set; then
   withval=$with_libfonts_jar;  LIBFONTS_JAR="$withval"
 
 fi
 
 
 # Check whether --with-libserializer-jar was given.
-if test "${with_libserializer_jar+set}" = set; then :
+if test "${with_libserializer_jar+set}" = set; then
   withval=$with_libserializer_jar;  LIBSERIALIZER_JAR="$withval"
 
 fi
 
 
 # Check whether --with-libbase-jar was given.
-if test "${with_libbase_jar+set}" = set; then :
+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 :
+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 :
+if test "${with_saxon_jar+set}" = set; then
   withval=$with_saxon_jar;  SAXON_JAR="$withval"
 
 fi
 
 
 # Check whether --with-system-libxslt was given.
-if test "${with_system_libxslt+set}" = set; then :
+if test "${with_system_libxslt+set}" = set; then
   withval=$with_system_libxslt;
 fi
 
 
 # Check whether --with-system-odbc was given.
-if test "${with_system_odbc+set}" = set; then :
+if test "${with_system_odbc+set}" = set; then
   withval=$with_system_odbc;
 fi
 
 
 # Check whether --with-system-sane was given.
-if test "${with_system_sane+set}" = set; then :
+if test "${with_system_sane+set}" = set; then
   withval=$with_system_sane;
 fi
 
 
 # Check whether --with-system-xrender was given.
-if test "${with_system_xrender+set}" = set; then :
+if test "${with_system_xrender+set}" = set; then
   withval=$with_system_xrender;
 fi
 
 
 # Check whether --with-system-curl was given.
-if test "${with_system_curl+set}" = set; then :
+if test "${with_system_curl+set}" = set; then
   withval=$with_system_curl;
 fi
 
 
 # Check whether --with-system-boost was given.
-if test "${with_system_boost+set}" = set; then :
+if test "${with_system_boost+set}" = set; then
   withval=$with_system_boost;
 fi
 
 
 # Check whether --with-system-vigra was given.
-if test "${with_system_vigra+set}" = set; then :
+if test "${with_system_vigra+set}" = set; then
   withval=$with_system_vigra;
 fi
 
 # Check whether --enable-neon was given.
-if test "${enable_neon+set}" = set; then :
+if test "${enable_neon+set}" = set; then
   enableval=$enable_neon;
 fi
 
 # Check whether --enable-Xaw was given.
-if test "${enable_Xaw+set}" = set; then :
+if test "${enable_Xaw+set}" = set; then
   enableval=$enable_Xaw;
 fi
 
 
 # Check whether --with-system-neon was given.
-if test "${with_system_neon+set}" = set; then :
+if test "${with_system_neon+set}" = set; then
   withval=$with_system_neon;
 fi
 
 
 # Check whether --with-system-agg was given.
-if test "${with_system_agg+set}" = set; then :
+if test "${with_system_agg+set}" = set; then
   withval=$with_system_agg;
 fi
 
 
 # Check whether --with-system-hunspell was given.
-if test "${with_system_hunspell+set}" = set; then :
+if test "${with_system_hunspell+set}" = set; then
   withval=$with_system_hunspell;
 fi
 
 
 # Check whether --with-system-mythes was given.
-if test "${with_system_mythes+set}" = set; then :
+if test "${with_system_mythes+set}" = set; then
   withval=$with_system_mythes;
 fi
 
 
 # Check whether --with-system-altlinuxhyph was given.
-if test "${with_system_altlinuxhyph+set}" = set; then :
+if test "${with_system_altlinuxhyph+set}" = set; then
   withval=$with_system_altlinuxhyph;
 fi
 
 
 # Check whether --with-system-lpsolve was given.
-if test "${with_system_lpsolve+set}" = set; then :
+if test "${with_system_lpsolve+set}" = set; then
   withval=$with_system_lpsolve;
 fi
 
 
 # Check whether --with-system-cppunit was given.
-if test "${with_system_cppunit+set}" = set; then :
+if test "${with_system_cppunit+set}" = set; then
   withval=$with_system_cppunit;
 fi
 
 
+# Check whether --with-system-redland was given.
+if test "${with_system_redland+set}" = set; then
+  withval=$with_system_redland;
+fi
+
+
 # Check whether --with-system-mozilla was given.
-if test "${with_system_mozilla+set}" = set; then :
+if test "${with_system_mozilla+set}" = set; then
   withval=$with_system_mozilla; WITH_SYSTEM_MOZILLA=$withval
 else
   WITH_SYSTEM_MOZILLA=no
@@ -4493,7 +3732,7 @@ fi
 
 
 # Check whether --with-stlport was given.
-if test "${with_stlport+set}" = set; then :
+if test "${with_stlport+set}" = set; then
   withval=$with_stlport; WITH_STLPORT=$withval
 else
   WITH_STLPORT=auto
@@ -4501,38 +3740,38 @@ fi
 
 
 # Check whether --with-jdk-home was given.
-if test "${with_jdk_home+set}" = set; then :
+if test "${with_jdk_home+set}" = set; then
   withval=$with_jdk_home;
 fi
 
 
 # Check whether --with-gxx_include_path was given.
-if test "${with_gxx_include_path+set}" = set; then :
+if test "${with_gxx_include_path+set}" = set; then
   withval=$with_gxx_include_path;
 fi
 
 
 # Check whether --with-java was given.
-if test "${with_java+set}" = set; then :
+if test "${with_java+set}" = set; then
   withval=$with_java; if test "$withval" = "yes"; then WITH_JAVA=java; else WITH_JAVA=$withval; fi
 else
   WITH_JAVA=java
 fi
 
 # Check whether --enable-gcjaot was given.
-if test "${enable_gcjaot+set}" = set; then :
+if test "${enable_gcjaot+set}" = set; then
   enableval=$enable_gcjaot;
 fi
 
 
 # Check whether --with-ant-home was given.
-if test "${with_ant_home+set}" = set; then :
+if test "${with_ant_home+set}" = set; then
   withval=$with_ant_home;
 fi
 
 
 # Check whether --with-junit was given.
-if test "${with_junit+set}" = set; then :
+if test "${with_junit+set}" = set; then
   withval=$with_junit;
 else
   with_junit=yes
@@ -4540,83 +3779,83 @@ fi
 
 
 # Check whether --with-perl-home was given.
-if test "${with_perl_home+set}" = set; then :
+if test "${with_perl_home+set}" = set; then
   withval=$with_perl_home;
 fi
 
 
 # Check whether --with-cl-home was given.
-if test "${with_cl_home+set}" = set; then :
+if test "${with_cl_home+set}" = set; then
   withval=$with_cl_home;
 fi
 
 
 # Check whether --with-mspdb-path was given.
-if test "${with_mspdb_path+set}" = set; then :
+if test "${with_mspdb_path+set}" = set; then
   withval=$with_mspdb_path;
 fi
 
 
 # Check whether --with-midl-path was given.
-if test "${with_midl_path+set}" = set; then :
+if test "${with_midl_path+set}" = set; then
   withval=$with_midl_path;
 fi
 
 
 # Check whether --with-csc-path was given.
-if test "${with_csc_path+set}" = set; then :
+if test "${with_csc_path+set}" = set; then
   withval=$with_csc_path;
 fi
 
 
 # Check whether --with-nsis-path was given.
-if test "${with_nsis_path+set}" = set; then :
+if test "${with_nsis_path+set}" = set; then
   withval=$with_nsis_path;
 fi
 
 
 # Check whether --with-frame-home was given.
-if test "${with_frame_home+set}" = set; then :
+if test "${with_frame_home+set}" = set; then
   withval=$with_frame_home;
 fi
 
 
 # Check whether --with-psdk-home was given.
-if test "${with_psdk_home+set}" = set; then :
+if test "${with_psdk_home+set}" = set; then
   withval=$with_psdk_home;
 fi
 
 
 # Check whether --with-directx-home was given.
-if test "${with_directx_home+set}" = set; then :
+if test "${with_directx_home+set}" = set; then
   withval=$with_directx_home;
 fi
 
 
 # Check whether --with-mozilla-build was given.
-if test "${with_mozilla_build+set}" = set; then :
+if test "${with_mozilla_build+set}" = set; then
   withval=$with_mozilla_build; MOZILLABUILD=$withval
 fi
 
 
 # Check whether --with-local-solenv was given.
-if test "${with_local_solenv+set}" = set; then :
+if test "${with_local_solenv+set}" = set; then
   withval=$with_local_solenv;
 fi
 
 
 # Check whether --with-local-solver was given.
-if test "${with_local_solver+set}" = set; then :
+if test "${with_local_solver+set}" = set; then
   withval=$with_local_solver;
 fi
 
 # Check whether --enable-check-only was given.
-if test "${enable_check_only+set}" = set; then :
+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 :
+if test "${enable_ccache_skip+set}" = set; then
   enableval=$enable_ccache_skip;
 else
   enable_ccache_skip=auto
@@ -4624,73 +3863,73 @@ fi
 
 
 # Check whether --with-lang was given.
-if test "${with_lang+set}" = set; then :
+if test "${with_lang+set}" = set; then
   withval=$with_lang;
 fi
 
 
 # Check whether --with-poor-help-localizations was given.
-if test "${with_poor_help_localizations+set}" = set; then :
+if test "${with_poor_help_localizations+set}" = set; then
   withval=$with_poor_help_localizations;
 fi
 
 
 # Check whether --with-dict was given.
-if test "${with_dict+set}" = set; then :
+if test "${with_dict+set}" = set; then
   withval=$with_dict;
 fi
 
 
 # Check whether --with-intro-bitmaps was given.
-if test "${with_intro_bitmaps+set}" = set; then :
+if test "${with_intro_bitmaps+set}" = set; then
   withval=$with_intro_bitmaps;
 fi
 
 
 # Check whether --with-about-bitmaps was given.
-if test "${with_about_bitmaps+set}" = set; then :
+if test "${with_about_bitmaps+set}" = set; then
   withval=$with_about_bitmaps;
 fi
 
 
 # Check whether --with-vendor was given.
-if test "${with_vendor+set}" = set; then :
+if test "${with_vendor+set}" = set; then
   withval=$with_vendor;
 fi
 
 
 # Check whether --with-unix-wrapper was given.
-if test "${with_unix_wrapper+set}" = set; then :
+if test "${with_unix_wrapper+set}" = set; then
   withval=$with_unix_wrapper;
 fi
 
 
 # Check whether --with-asm-home was given.
-if test "${with_asm_home+set}" = set; then :
+if test "${with_asm_home+set}" = set; then
   withval=$with_asm_home;
 fi
 
 
 # Check whether --with-os-version was given.
-if test "${with_os_version+set}" = set; then :
+if test "${with_os_version+set}" = set; then
   withval=$with_os_version;
 fi
 
 
 # Check whether --with-unzip-home was given.
-if test "${with_unzip_home+set}" = set; then :
+if test "${with_unzip_home+set}" = set; then
   withval=$with_unzip_home;
 fi
 
 
 # Check whether --with-zip-home was given.
-if test "${with_zip_home+set}" = set; then :
+if test "${with_zip_home+set}" = set; then
   withval=$with_zip_home;
 fi
 
 
 # Check whether --with-mingwin was given.
-if test "${with_mingwin+set}" = set; then :
+if test "${with_mingwin+set}" = set; then
   withval=$with_mingwin; WITH_MINGWIN=$withval
 else
   WITH_MINGWIN=0
@@ -4698,18 +3937,18 @@ fi
 
 
 # Check whether --with-build-version was given.
-if test "${with_build_version+set}" = set; then :
+if test "${with_build_version+set}" = set; then
   withval=$with_build_version; with_build_version=$withval
 fi
 
 
 # Check whether --with-alloc was given.
-if test "${with_alloc+set}" = set; then :
+if test "${with_alloc+set}" = set; then
   withval=$with_alloc;
 fi
 
 # Check whether --enable-verbose was given.
-if test "${enable_verbose+set}" = set; then :
+if test "${enable_verbose+set}" = set; then
   enableval=$enable_verbose;
 fi
 
@@ -4739,9 +3978,9 @@ echo "*                                                                  *"
 echo "********************************************************************"
 echo ""
 cat /dev/null > warn
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if test "${ac_cv_path_GREP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -4752,7 +3991,7 @@ 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_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
@@ -4772,7 +4011,7 @@ case `"$ac_path_GREP" --version 2>&1` in
     $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
+    ac_count=`expr $ac_count + 1`
     if test $ac_count -gt ${ac_path_GREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_GREP="$ac_path_GREP"
@@ -4787,24 +4026,26 @@ esac
       $ac_path_GREP_found && break 3
     done
   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
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
   fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
 $as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+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
@@ -4818,7 +4059,7 @@ 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_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
@@ -4838,7 +4079,7 @@ case `"$ac_path_EGREP" --version 2>&1` in
     $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
+    ac_count=`expr $ac_count + 1`
     if test $ac_count -gt ${ac_path_EGREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_EGREP="$ac_path_EGREP"
@@ -4853,10 +4094,12 @@ esac
       $ac_path_EGREP_found && break 3
     done
   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
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -4864,7 +4107,7 @@ fi
 
    fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
 $as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
@@ -4873,9 +4116,9 @@ for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
+if test "${ac_cv_prog_AWK+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -4886,24 +4129,24 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
 $as_echo "$AWK" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4913,9 +4156,9 @@ done
 
 # Extract the first word of "$AWK", so it can be a program name with args.
 set dummy $AWK; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_AWK+set}" = set; then :
+if test "${ac_cv_path_AWK+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $AWK in
@@ -4928,14 +4171,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -4943,25 +4186,27 @@ esac
 fi
 AWK=$ac_cv_path_AWK
 if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
 $as_echo "$AWK" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 if test -z "$AWK"; then
-   as_fn_error "install awk to run this script" "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: install awk to run this script" >&5
+$as_echo "$as_me: error: install awk to run this script" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 for ac_prog in sed
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then :
+if test "${ac_cv_path_SED+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $SED in
@@ -4974,14 +4219,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -4989,10 +4234,10 @@ esac
 fi
 SED=$ac_cv_path_SED
 if test -n "$SED"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
+  { $as_echo "$as_me:$LINENO: result: $SED" >&5
 $as_echo "$SED" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5001,18 +4246,20 @@ fi
 done
 
 if test -z "$SED"; then
-   as_fn_error "install sed to run this script" "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: install sed to run this script" >&5
+$as_echo "$as_me: error: install sed to run this script" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for solenv environment" >&5
+{ $as_echo "$as_me:$LINENO: checking for solenv environment" >&5
 $as_echo_n "checking for solenv environment... " >&6; }
 if test -z "$with_local_solenv"; then
    LOCAL_SOLENV="DEFAULT"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: default" >&5
+   { $as_echo "$as_me:$LINENO: result: default" >&5
 $as_echo "default" >&6; }
 else
    LOCAL_SOLENV=$with_local_solenv
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_local_solenv" >&5
+   { $as_echo "$as_me:$LINENO: result: $with_local_solenv" >&5
 $as_echo "$with_local_solenv" >&6; }
 fi
 
@@ -5031,21 +4278,31 @@ if test -e $_solenv/inc/minor.mk; then
    SOURCEVERSION="`grep SOURCEVERSION= $_solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
 
 else
-   as_fn_error "$_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation..." "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: $_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation..." >&5
+$as_echo "$as_me: error: $_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation..." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 # These three variables are undocumented and unsupported,
@@ -5059,27 +4316,35 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+   { (exit 1); exit 1; }; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
+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
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+   { (exit 1); exit 1; }; }
 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
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+{ $as_echo "$as_me:$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;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
+   { (exit 1); exit 1; }; };;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -5095,24 +4360,28 @@ IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
+if test "${ac_cv_host+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 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
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+{ $as_echo "$as_me:$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;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
+   { (exit 1); exit 1; }; };;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -5128,24 +4397,28 @@ IFS=$ac_save_IFS
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
+{ $as_echo "$as_me:$LINENO: checking target system type" >&5
 $as_echo_n "checking target system type... " >&6; }
-if test "${ac_cv_target+set}" = set; then :
+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=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
+{ $as_echo "$as_me:$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;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
+$as_echo "$as_me: error: invalid value of canonical target" >&2;}
+   { (exit 1); exit 1; }; };;
 esac
 target=$ac_cv_target
 ac_save_IFS=$IFS; IFS='-'
@@ -5167,22 +4440,23 @@ test -n "$target_alias" &&
   test "$program_prefix$program_suffix$program_transform_name" = \
     NONENONEs,x,x, &&
   program_prefix=${target_alias}-
-
 if test "$build" != "$host" -o "$build" != "$target" \
   -o "$host" != "$target"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross-compiling by any means is not supported (yet)!" >&5
+	{ $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking Cygwin version" >&5
+   { $as_echo "$as_me:$LINENO: checking Cygwin version" >&5
 $as_echo_n "checking Cygwin version... " >&6; }
    CygwinVer=`uname -r`
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CygwinVer" >&5
+   { $as_echo "$as_me:$LINENO: result: $CygwinVer" >&5
 $as_echo "$CygwinVer" >&6; }
    if test "`echo $CygwinVer | $AWK -F . '{ print $1$2 }'`" -lt "15"; then
-      as_fn_error "You need at least Cygwin V1.5.x" "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: You need at least Cygwin V1.5.x" >&5
+$as_echo "$as_me: error: You need at least Cygwin V1.5.x" >&2;}
+   { (exit 1); exit 1; }; }
    fi
 else
    CygwinVer="false"
@@ -5199,9 +4473,9 @@ case "$build_os" in
 		_os=SunOS
 		# Extract the first word of "gtar", so it can be a program name with args.
 set dummy gtar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GNUTAR+set}" = set; then :
+if test "${ac_cv_path_GNUTAR+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $GNUTAR in
@@ -5215,14 +4489,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -5230,36 +4504,42 @@ esac
 fi
 GNUTAR=$ac_cv_path_GNUTAR
 if test -n "$GNUTAR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUTAR" >&5
+  { $as_echo "$as_me:$LINENO: result: $GNUTAR" >&5
 $as_echo "$GNUTAR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 		if test -z "$GNUTAR"; then
-			as_fn_error "gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." "$LINENO" 5
+			{ { $as_echo "$as_me:$LINENO: error: gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." >&5
+$as_echo "$as_me: error: gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." >&2;}
+   { (exit 1); exit 1; }; }
 		fi
 
 
-						   		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the Solaris operating system release" >&5
+						   		{ $as_echo "$as_me:$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
-      			as_fn_error "use solaris >= 6 to build OpenOffice.org" "$LINENO" 5
+      			{ { $as_echo "$as_me:$LINENO: error: use solaris >= 6 to build OpenOffice.org" >&5
+$as_echo "$as_me: error: use solaris >= 6 to build OpenOffice.org" >&2;}
+   { (exit 1); exit 1; }; }
    		else
-      			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok ($_os_release)" >&5
+      			{ $as_echo "$as_me:$LINENO: result: ok ($_os_release)" >&5
 $as_echo "ok ($_os_release)" >&6; }
    		fi
 
-   		   		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the processor type" >&5
+   		   		{ $as_echo "$as_me:$LINENO: checking the processor type" >&5
 $as_echo_n "checking the processor type... " >&6; }
    		if test "$build_cpu" = "sparc" -o "$build_cpu" = "i386"; then
-      			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok ($build_cpu)" >&5
+      			{ $as_echo "$as_me:$LINENO: result: ok ($build_cpu)" >&5
 $as_echo "ok ($build_cpu)" >&6; }
    		else
-      			as_fn_error "only sparc and i386 processors are supported" "$LINENO" 5
+      			{ { $as_echo "$as_me:$LINENO: error: only sparc and i386 processors are supported" >&5
+$as_echo "$as_me: error: only sparc and i386 processors are supported" >&2;}
+   { (exit 1); exit 1; }; }
    		fi
 		;;
 	linux-gnu*)
@@ -5290,7 +4570,7 @@ $as_echo "ok ($build_cpu)" >&6; }
 		test_freetype=no
 		_os=Darwin
       if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >&5
+         { $as_echo "$as_me:$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
@@ -5312,16 +4592,16 @@ $as_echo "$as_me: WARNING: Disabling gtk-quickstarter - not supported on Mac. Us
 		test_cups=yes
         test_randr=yes
 		test_freetype=yes
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the FreeBSD operating system release" >&5
+		{ $as_echo "$as_me:$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
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found OSVERSION=$OSVERSION" >&5
+		{ $as_echo "$as_me:$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 "$as_me:$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"
@@ -5333,7 +4613,7 @@ $as_echo_n "checking which thread library to use... " >&6; }
 			PTHREAD_CFLAGS=""
 			PTHREAD_LIBS="-pthread"
 		fi
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_LIBS" >&5
+		{ $as_echo "$as_me:$LINENO: result: $PTHREAD_LIBS" >&5
 $as_echo "$PTHREAD_LIBS" >&6; }
 		_os=FreeBSD
 		;;
@@ -5363,7 +4643,9 @@ $as_echo "$PTHREAD_LIBS" >&6; }
 		_os=AIX
 		;;
    *)
-   as_fn_error "$_os operating system is not suitable to build OpenOffice.org!" "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: $_os operating system is not suitable to build OpenOffice.org!" >&5
+$as_echo "$as_me: error: $_os operating system is not suitable to build OpenOffice.org!" >&2;}
+   { (exit 1); exit 1; }; }
    ;;
 esac
 
@@ -5371,16 +4653,16 @@ esac
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable crashdump feature" >&5
+{ $as_echo "$as_me:$LINENO: checking whether to enable crashdump feature" >&5
 $as_echo_n "checking whether to enable crashdump feature... " >&6; }
 if test "$enable_crashdump" = "yes"; then
    ENABLE_CRASHDUMP="TRUE"
    BUILD_TYPE="$BUILD_TYPE CRASHREP"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 else
    ENABLE_CRASHDUMP=""
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5390,88 +4672,90 @@ if test "$_os" = "WINNT"; then
 fi
 
 if test "$_os" = "WINNT"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use the standard non-optimizing compiler" >&5
+            { $as_echo "$as_me:$LINENO: checking whether to use the standard non-optimizing compiler" >&5
 $as_echo_n "checking whether to use the standard non-optimizing compiler... " >&6; }
    if test "$enable_cl_standard" = "" -o "$enable_cl_standard" = "no"; then
       VC_STANDARD=""
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+      { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
    else
       VC_STANDARD="TRUE"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+      { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
    fi
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to turn warnings to errors" >&5
+{ $as_echo "$as_me:$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"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:$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:$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:$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"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to do a debug build" >&5
+{ $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 else
    ENABLE_DEBUG="FALSE"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with additional debug utilities" >&5
+{ $as_echo "$as_me:$LINENO: checking whether to build with additional debug utilities" >&5
 $as_echo_n "checking whether to build with additional debug utilities... " >&6; }
 if test -n "$enable_dbgutil" && test "$enable_dbgutil" != "no"; then
    PROEXT=""
    PRODUCT=""
    PROFULLSWITCH=""
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 else
    PRODUCT="full"
    PROFULLSWITCH="product=full"
    PROEXT=".pro"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, full product build" >&5
+   { $as_echo "$as_me:$LINENO: result: no, full product build" >&5
 $as_echo "no, full product build" >&6; }
 fi
 
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include symbols into final build" >&5
+{ $as_echo "$as_me:$LINENO: checking whether to include symbols into final build" >&5
 $as_echo_n "checking whether to include symbols into final build... " >&6; }
 if test -n "$enable_symbols" && test "$enable_symbols" != "no"; then
 	if test "$enable_symbols" = "yes" -o "$enable_symbols" = "TRUE"; then
 		ENABLE_SYMBOLS="TRUE"
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+		{ $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 	else
 		if test "$enable_symbols" = "SMALL" -o "$enable_symbols" = "small"; then
 			ENABLE_SYMBOLS="SMALL"
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, small ones" >&5
+			{ $as_echo "$as_me:$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
-			     as_fn_error "--enable-symbols only accepts yes, TRUE or SMALL as parameter." "$LINENO" 5
+			     { { $as_echo "$as_me:$LINENO: error: --enable-symbols only accepts yes, TRUE or SMALL as parameter." >&5
+$as_echo "$as_me: error: --enable-symbols only accepts yes, TRUE or SMALL as parameter." >&2;}
+   { (exit 1); exit 1; }; }
            	     else
               		     ENABLE_SYMBOLS=
 		     fi
@@ -5479,12 +4763,12 @@ $as_echo "yes, small ones" >&6; }
 	fi
 else
    ENABLE_SYMBOLS=
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to strip the solver or not." >&5
+{ $as_echo "$as_me:$LINENO: checking whether to strip the solver or not." >&5
 $as_echo_n "checking whether to strip the solver or not.... " >&6; }
 if test -n "$enable_strip_solver"; then
    if test "$enable_strip_solver" = "yes"; then
@@ -5492,7 +4776,9 @@ if test -n "$enable_strip_solver"; then
    else if test "$enable_strip_solver" = "no"; then
            DISABLE_STRIP="TRUE"
         else
-           as_fn_error "--disable-strip-solver only accepts yes or no as parameter." "$LINENO" 5
+           { { $as_echo "$as_me:$LINENO: error: --disable-strip-solver only accepts yes or no as parameter." >&5
+$as_echo "$as_me: error: --disable-strip-solver only accepts yes or no as parameter." >&2;}
+   { (exit 1); exit 1; }; }
         fi
    fi
 else
@@ -5504,28 +4790,28 @@ else
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable native CUPS support" >&5
+{ $as_echo "$as_me:$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"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 else
    ENABLE_CUPS=""
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable fontconfig support" >&5
+{ $as_echo "$as_me:$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"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 else
    ENABLE_FONTCONFIG=""
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5541,123 +4827,123 @@ if test -z "$enable_fetch_external" || test "$enable_fetch_external" = "yes" \
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable filters for legacy binary file formats (StarOffice 5.2)" >&5
+{ $as_echo "$as_me:$LINENO: checking whether to enable filters for legacy binary file formats (StarOffice 5.2)" >&5
 $as_echo_n "checking whether to enable filters for legacy binary file formats (StarOffice 5.2)... " >&6; }
 if test "$enable_binfilter" = "no"; then
    WITH_BINFILTER="NO"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 else
    WITH_BINFILTER="YES"
    BUILD_TYPE="$BUILD_TYPE BINFILTER"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 fi
 
 
 if test "$_os" = "WINNT"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use DirectX" >&5
+   { $as_echo "$as_me:$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"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+      { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
    else
       ENABLE_DIRECTX=""
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+      { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
    fi
 
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use ActiveX" >&5
+   { $as_echo "$as_me:$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=""
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+      { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
    else
       DISABLE_ACTIVEX="TRUE"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+      { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
    fi
 
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use ATL" >&5
+   { $as_echo "$as_me:$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=""
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+      { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
    else
       DISABLE_ATL="TRUE"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+      { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
    fi
 
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use RPATH in shared libraries" >&5
+{ $as_echo "$as_me:$LINENO: checking whether to use RPATH in shared libraries" >&5
 $as_echo_n "checking whether to use RPATH in shared libraries... " >&6; }
 if test "$enable_rpath" = "no"; then
    ENABLE_RPATH="no"
 else
    ENABLE_RPATH="yes"
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_RPATH" >&5
+{ $as_echo "$as_me:$LINENO: result: $ENABLE_RPATH" >&5
 $as_echo "$ENABLE_RPATH" >&6; }
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include MySpell dictionaries" >&5
+{ $as_echo "$as_me:$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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
   WITH_MYSPELL_DICTS=YES
   BUILD_TYPE="$BUILD_TYPE DICTIONARIES"
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
   WITH_MYSPELL_DICTS=NO
 fi
 
 
 if test "$WITH_MYSPELL_DICTS" = "NO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use dicts from external paths" >&5
+  { $as_echo "$as_me:$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
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+	{ $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 	SYSTEM_DICTS=YES
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for spelling dictionary directory" >&5
+	{ $as_echo "$as_me:$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
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DICT_SYSTEM_DIR" >&5
+	{ $as_echo "$as_me:$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 "$as_me:$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
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $HYPH_SYSTEM_DIR" >&5
+	{ $as_echo "$as_me:$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 "$as_me:$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
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $THES_SYSTEM_DIR" >&5
+	{ $as_echo "$as_me:$LINENO: result: $THES_SYSTEM_DIR" >&5
 $as_echo "$THES_SYSTEM_DIR" >&6; }
   else
-  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  	{ $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
   	SYSTEM_DICTS=NO
   fi
@@ -5668,12 +4954,16 @@ fi
 
 
 if test $_os = "WINNT"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking Windows build environment sanity" >&5
+   { $as_echo "$as_me:$LINENO: checking Windows build environment sanity" >&5
 $as_echo_n "checking Windows build environment sanity... " >&6; }
                      if test -L $AWK -o -L `which awk` -o -L `which tar` -o -L `which gunzip` ; then
-         as_fn_error "$AWK, awk, tar or gunzip is a cygwin symlink!
+         { { $as_echo "$as_me:$LINENO: error: $AWK, awk, tar or gunzip is a cygwin symlink!
 Native windows programs cannot use cygwin symlinks. Remove the symbolic
-link, and copy the program to the name of the link." "$LINENO" 5
+link, and copy the program to the name of the link." >&5
+$as_echo "$as_me: error: $AWK, awk, tar or gunzip is a cygwin symlink!
+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; }; }
       fi
                   CC=`echo $CC | $SED "s/^guw.exe //"`
    CXX=`echo $CXX | $SED "s/^guw.exe //"`
@@ -5688,28 +4978,30 @@ link, and copy the program to the name of the link." "$LINENO" 5
          CXX="g++ -mno-cygwin"
       fi
    fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+   { $as_echo "$as_me:$LINENO: result: ok" >&5
 $as_echo "ok" >&6; }
 fi
 
 
 if test "$_os" = "WINNT" ; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cygwin gcc/g++" >&5
+   { $as_echo "$as_me:$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
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+      { $as_echo "$as_me:$LINENO: result: found" >&5
 $as_echo "found" >&6; }
    else
-      as_fn_error "cygwin gcc and g++ are needed, please install them." "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: cygwin gcc and g++ are needed, please install them." >&5
+$as_echo "$as_me: error: cygwin gcc and g++ are needed, please install them." >&2;}
+   { (exit 1); exit 1; }; }
    fi
 fi
 
 
 # Extract the first word of "bash", so it can be a program name with args.
 set dummy bash; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_SHELLPATH+set}" = set; then :
+if test "${ac_cv_path_SHELLPATH+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $SHELLPATH in
@@ -5722,14 +5014,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -5737,29 +5029,31 @@ esac
 fi
 SHELLPATH=$ac_cv_path_SHELLPATH
 if test -n "$SHELLPATH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHELLPATH" >&5
+  { $as_echo "$as_me:$LINENO: result: $SHELLPATH" >&5
 $as_echo "$SHELLPATH" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 if test -z "$SHELLPATH"; then
-   as_fn_error "bash not found in \$PATH" "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: bash not found in \$PATH" >&5
+$as_echo "$as_me: error: bash not found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
 else
    SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/bash$//p"`
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gcc home" >&5
+{ $as_echo "$as_me:$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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCC_HOME" >&5
+{ $as_echo "$as_me:$LINENO: result: $GCC_HOME" >&5
 $as_echo "$GCC_HOME" >&6; }
 
 
@@ -5781,9 +5075,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if test "${ac_cv_prog_CC+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -5794,24 +5088,24 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5821,9 +5115,9 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$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 :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -5834,24 +5128,24 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5860,7 +5154,7 @@ fi
   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:$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
@@ -5874,9 +5168,9 @@ 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.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if test "${ac_cv_prog_CC+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -5887,24 +5181,24 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5914,9 +5208,9 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if test "${ac_cv_prog_CC+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -5928,18 +5222,18 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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
@@ -5958,10 +5252,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5973,9 +5267,9 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if test "${ac_cv_prog_CC+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -5986,24 +5280,24 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6017,9 +5311,9 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$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 :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -6030,24 +5324,24 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6060,7 +5354,7 @@ done
   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:$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
@@ -6071,37 +5365,57 @@ fi
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+test -z "$CC" && { { $as_echo "$as_me:$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; }
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+$as_echo "$as_me:$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"
+{ (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
 
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -6117,8 +5431,8 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
@@ -6134,17 +5448,17 @@ do
 done
 rm -f $ac_rmfiles
 
-if { { ac_try="$ac_link_default"
+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_try_echo="\"\$as_me:$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 :
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
@@ -6161,7 +5475,7 @@ do
 	# certainly right.
 	break;;
     *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	fi
@@ -6180,42 +5494,84 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
 else
   ac_file=''
 fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
+
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+if test -z "$ac_file"; then
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:$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; }; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: C compiler cannot create executables
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
 fi
-{ $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; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
+
 ac_exeext=$ac_cv_exeext
 
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+# If not cross compiling, check that we can run a simple program.
+if test "$cross_compiling" != yes; then
+  if { ac_try='./$ac_file'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
 $as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
+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_try_echo="\"\$as_me:$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; }; then :
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -6230,83 +5586,32 @@ for ac_file in conftest.exe conftest conftest.*; do
   esac
 done
 else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:$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; }
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
 fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+
+rm -f conftest$ac_cv_exeext
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
 $as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-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="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
-  { { 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; }
-  if { ac_try='./conftest$ac_cv_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
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+{ $as_echo "$as_me:$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 :
+if test "${ac_cv_objext+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -6318,17 +5623,17 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
+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_try_echo="\"\$as_me:$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 :
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
@@ -6341,23 +5646,31 @@ else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:$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; }
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
 fi
+
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
 $as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -6371,16 +5684,37 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  ac_compiler_gnu=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_compiler_gnu=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
 $as_echo "$ac_cv_c_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GCC=yes
@@ -6389,16 +5723,20 @@ else
 fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+{ $as_echo "$as_me:$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 :
+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
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -6409,11 +5747,35 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	CFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -6424,12 +5786,36 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
 else
-  ac_c_werror_flag=$ac_save_c_werror_flag
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -6440,17 +5826,42 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_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 "$as_me:$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
@@ -6467,14 +5878,18 @@ else
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if test "${ac_cv_prog_cc_c89+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
@@ -6531,9 +5946,32 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
+  rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
@@ -6544,19 +5982,17 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
 $as_echo "none needed" >&6; } ;;
   xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
 $as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+    { $as_echo "$as_me:$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 :
 
-fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -6572,9 +6008,9 @@ if test "$COMPATH" = "." ; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_COMPATH+set}" = set; then :
+if test "${ac_cv_path_COMPATH+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $COMPATH in
@@ -6587,14 +6023,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -6602,10 +6038,10 @@ esac
 fi
 COMPATH=$ac_cv_path_COMPATH
 if test -n "$COMPATH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPATH" >&5
+  { $as_echo "$as_me:$LINENO: result: $COMPATH" >&5
 $as_echo "$COMPATH" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6619,18 +6055,22 @@ COMPATH=`echo $COMPATH | $SED "s@/[Bb][Ii][Nn]\\\$@@"`;
 echo $COMPATH
 GCCVER=20995
 if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking the GNU gcc compiler version" >&5
+    { $as_echo "$as_me:$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 }'`
    GCCVER=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
 
    if test "$_gcc_major" -lt "3"; then
-      as_fn_error "found version \"$_gcc_version\", use version 3+ of the gcc compiler" "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: found version \"$_gcc_version\", use version 3+ of the gcc compiler" >&5
+$as_echo "$as_me: error: found version \"$_gcc_version\", use version 3+ of the gcc compiler" >&2;}
+   { (exit 1); exit 1; }; }
    else
       if test "$GCCVER" -eq "030203"; then
 	    if test "$ENABLE_SYMBOLS" = "SMALL"; then
-           as_fn_error "version \"$_gcc_version\" gives internal error with small." "$LINENO" 5
+           { { $as_echo "$as_me:$LINENO: error: version \"$_gcc_version\" gives internal error with small." >&5
+$as_echo "$as_me: error: version \"$_gcc_version\" gives internal error with small." >&2;}
+   { (exit 1); exit 1; }; }
 	    fi
       fi
    fi
@@ -6643,22 +6083,26 @@ $as_echo_n "checking the GNU gcc compiler version... " >&6; }
          fi
       fi
       if test "$GCCVER" -ge "040100" ; then
-         as_fn_error "You need to use the gcc-4.0 compiler (gcc $_gcc_version won't work with the MacOSX10.4u.sdk) - set CC accordingly" "$LINENO" 5
+         { { $as_echo "$as_me:$LINENO: error: You need to use the gcc-4.0 compiler (gcc $_gcc_version won't work with the MacOSX10.4u.sdk) - set CC accordingly" >&5
+$as_echo "$as_me: error: You need to use the gcc-4.0 compiler (gcc $_gcc_version won't work with the MacOSX10.4u.sdk) - set CC accordingly" >&2;}
+   { (exit 1); exit 1; }; }
       else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: implicitly using CC=$CC" >&5
+         { $as_echo "$as_me:$LINENO: result: implicitly using CC=$CC" >&5
 $as_echo "implicitly using CC=$CC" >&6; }
       fi
    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (gcc $_gcc_version)" >&5
+      { $as_echo "$as_me:$LINENO: result: checked (gcc $_gcc_version)" >&5
 $as_echo "checked (gcc $_gcc_version)" >&6; }
    fi
    if test "$_os" = "SunOS"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking gcc linker" >&5
+      { $as_echo "$as_me:$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
-          as_fn_error "failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris" "$LINENO" 5
+          { { $as_echo "$as_me:$LINENO: error: failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris" >&5
+$as_echo "$as_me: error: failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris" >&2;}
+   { (exit 1); exit 1; }; }
       fi
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (GNU ld)" >&5
+      { $as_echo "$as_me:$LINENO: result: ok (GNU ld)" >&5
 $as_echo "ok (GNU ld)" >&6; }
    fi
 fi
@@ -6666,12 +6110,16 @@ fi
 
 HAVE_LD_BSYMBOLIC_FUNCTIONS=
 if test "$GCC" = "yes"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Bsymbolic-functions linker support " >&5
+   { $as_echo "$as_me:$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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
    #include <stdio.h>
@@ -6686,59 +6134,86 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   HAVE_LD_BSYMBOLIC_FUNCTIONS=TRUE
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
    if test "z$HAVE_LD_BSYMBOLIC_FUNCTIONS" = "zTRUE"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: found " >&5
+     { $as_echo "$as_me:$LINENO: result: found " >&5
 $as_echo "found " >&6; }
    else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found " >&5
+     { $as_echo "$as_me:$LINENO: result: not found " >&5
 $as_echo "not found " >&6; }
    fi
    LDFLAGS=$bsymbolic_functions_ldflags_save
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable pch feature" >&5
+{ $as_echo "$as_me:$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"
-	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+	   { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
    elif test "$GCC" = "yes" -a "$GCCVER" -gt "030400"; then
 	   ENABLE_PCH="TRUE"
-	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+	   { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
    else
 	   ENABLE_PCH=""
-	   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Precompiled header not yet supported for your platform/compiler" >&5
+	   { $as_echo "$as_me:$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=""
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable hid list feature" >&5
+{ $as_echo "$as_me:$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=""
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 else
    NO_HIDS="TRUE"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU make" >&5
+{ $as_echo "$as_me:$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
@@ -6747,35 +6222,39 @@ for a in "$MAKE" $GNUMAKE make gmake gnumake; do
            break
       fi
 done
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUMAKE" >&5
+{ $as_echo "$as_me:$LINENO: result: $GNUMAKE" >&5
 $as_echo "$GNUMAKE" >&6; }
 if test -z "$GNUMAKE"; then
-    as_fn_error "not found. install GNU make." "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: not found. install GNU make." >&5
+$as_echo "$as_me: error: not found. install GNU make." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the GNU make version" >&5
+{ $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUMAKE $_make_version" >&5
+   { $as_echo "$as_me:$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
-		   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUMAKE $_make_version" >&5
+		   { $as_echo "$as_me:$LINENO: result: $GNUMAKE $_make_version" >&5
 $as_echo "$GNUMAKE $_make_version" >&6; }
        else
-           { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: failed ($GNUMAKE $_make_version need 3.79.0+)" >&5
+           { $as_echo "$as_me:$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
-       as_fn_error "failed ($GNUMAKE $_make_version need 3.79.1+)" "$LINENO" 5
+       { { $as_echo "$as_me:$LINENO: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&5
+$as_echo "$as_me: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&2;}
+   { (exit 1); exit 1; }; }
    fi
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU tar" >&5
+{ $as_echo "$as_me:$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
@@ -6784,10 +6263,12 @@ for a in $GNUTAR gtar gnutar tar; do
            break
       fi
 done
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUTAR" >&5
+{ $as_echo "$as_me:$LINENO: result: $GNUTAR" >&5
 $as_echo "$GNUTAR" >&6; }
 if test -z "$GNUTAR"; then
-    as_fn_error "not found. install GNU tar." "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: not found. install GNU tar." >&5
+$as_echo "$as_me: error: not found. install GNU tar." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
@@ -6798,9 +6279,9 @@ if test "$_os" = "SunOS"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path__cc+set}" = set; then :
+if test "${ac_cv_path__cc+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $_cc in
@@ -6813,14 +6294,14 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path__cc="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -6828,10 +6309,10 @@ esac
 fi
 _cc=$ac_cv_path__cc
 if test -n "$_cc"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_cc" >&5
+  { $as_echo "$as_me:$LINENO: result: $_cc" >&5
 $as_echo "$_cc" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6840,19 +6321,23 @@ fi
 done
 
       COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking the SunStudio C/C++ compiler version" >&5
+      { $as_echo "$as_me:$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
-         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
+         { { $as_echo "$as_me:$LINENO: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&5
+$as_echo "$as_me: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&2;}
+   { (exit 1); exit 1; }; }
       else
          _sunstudio_minor=`echo $_sunstudio_version | $AWK -F. '{ if ($2 == 5) print "true"; else if ($2 == 7) print "true"; else if ($2 == 8) print "true"; else if ($2 == 9) print "true"; else print "false" }'`
          if test "$_sunstudio_minor" = "false"; then
-            as_fn_error "found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" "$LINENO" 5
+            { { $as_echo "$as_me:$LINENO: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&5
+$as_echo "$as_me: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&2;}
+   { (exit 1); exit 1; }; }
          else
-                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
+                        { $as_echo "$as_me:$LINENO: result: checked" >&5
 $as_echo "checked" >&6; }
          fi
       fi
@@ -6860,11 +6345,15 @@ $as_echo "checked" >&6; }
 fi
 
 if test "$GCC" = "yes"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --hash-style=both linker support " >&5
+   { $as_echo "$as_me:$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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
    #include <stdio.h>
@@ -6879,18 +6368,43 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   HAVE_LD_HASH_STYLE=TRUE
 else
-  HAVE_LD_HASH_STYLE=FALSE
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	HAVE_LD_HASH_STYLE=FALSE
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
    if test "z$HAVE_LD_HASH_STYLE" = "zTRUE"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: found " >&5
+     { $as_echo "$as_me:$LINENO: result: found " >&5
 $as_echo "found " >&6; }
    else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found " >&5
+     { $as_echo "$as_me:$LINENO: result: not found " >&5
 $as_echo "not found " >&6; }
    fi
    LDFLAGS=$hash_style_ldflags_save
@@ -6903,9 +6417,9 @@ if test "$_os" = "OSF1"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path__cc+set}" = set; then :
+if test "${ac_cv_path__cc+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $_cc in
@@ -6918,14 +6432,14 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path__cc="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -6933,10 +6447,10 @@ esac
 fi
 _cc=$ac_cv_path__cc
 if test -n "$_cc"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_cc" >&5
+  { $as_echo "$as_me:$LINENO: result: $_cc" >&5
 $as_echo "$_cc" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6945,16 +6459,18 @@ fi
 done
 
       COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ******* $_cc , $COMPATH" >&5
+      { $as_echo "$as_me:$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 "$as_me:$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
-         as_fn_error "found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" "$LINENO" 5
+         { { $as_echo "$as_me:$LINENO: error: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&5
+$as_echo "$as_me: error: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&2;}
+   { (exit 1); exit 1; }; }
       else
-                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
+                  { $as_echo "$as_me:$LINENO: result: checked" >&5
 $as_echo "checked" >&6; }
       fi
    fi
@@ -6963,9 +6479,9 @@ fi
 if test -z "$with_perl_home"; then
    # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PERL+set}" = set; then :
+if test "${ac_cv_path_PERL+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PERL in
@@ -6978,14 +6494,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -6993,10 +6509,10 @@ esac
 fi
 PERL=$ac_cv_path_PERL
 if test -n "$PERL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
+  { $as_echo "$as_me:$LINENO: result: $PERL" >&5
 $as_echo "$PERL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7009,37 +6525,45 @@ else
    if test -x "$_perl_path"; then
       PERL=$_perl_path
    else
-      as_fn_error "$_perl_path not found" "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: $_perl_path not found" >&5
+$as_echo "$as_me: error: $_perl_path not found" >&2;}
+   { (exit 1); exit 1; }; }
    fi
 fi
 
 if test "$PERL"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking the Perl version" >&5
+   { $as_echo "$as_me:$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
-      as_fn_error "found Perl version \"$_perl_version\", use version 5 of Perl" "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: found Perl version \"$_perl_version\", use version 5 of Perl" >&5
+$as_echo "$as_me: error: found Perl version \"$_perl_version\", use version 5 of Perl" >&2;}
+   { (exit 1); exit 1; }; }
    fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (perl $_perl_version)" >&5
+   { $as_echo "$as_me:$LINENO: result: checked (perl $_perl_version)" >&5
 $as_echo "checked (perl $_perl_version)" >&6; }
 else
-   as_fn_error "Perl not found, install version 5 of Perl" "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: Perl not found, install version 5 of Perl" >&5
+$as_echo "$as_me: error: Perl not found, install version 5 of Perl" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for required Perl modules" >&5
+{ $as_echo "$as_me:$LINENO: checking for required Perl modules" >&5
 $as_echo_n "checking for required Perl modules... " >&6; }
 if `$PERL -e 'use Archive::Zip;'`; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: all modules found" >&5
+	{ $as_echo "$as_me:$LINENO: result: all modules found" >&5
 $as_echo "all modules found" >&6; }
 else
-	as_fn_error "Failed to find some modules" "$LINENO" 5
+	{ { $as_echo "$as_me:$LINENO: error: Failed to find some modules" >&5
+$as_echo "$as_me: error: Failed to find some modules" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 if test "$_os" = "WINNT"; then
 	if test "$WITH_MINGWIN" != "yes"; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for friendly registry keys" >&5
+		{ $as_echo "$as_me:$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
@@ -7050,7 +6574,7 @@ $as_echo_n "checking for friendly registry keys... " >&6; }
 		else
 			with_cl_home=`cygpath -u "$with_cl_home"`
 		fi
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+		{ $as_echo "$as_me:$LINENO: result: done" >&5
 $as_echo "done" >&6; }
 
 										if test -n "$with_mspdb_path";then
@@ -7072,9 +6596,9 @@ $as_echo "done" >&6; }
 		if test -z "$MSPDB_PATH";then
 						# Extract the first word of "mspdb80.dll", so it can be a program name with args.
 set dummy mspdb80.dll; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSPDB_PATH+set}" = set; then :
+if test "${ac_cv_path_MSPDB_PATH+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $MSPDB_PATH in
@@ -7087,14 +6611,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -7102,19 +6626,19 @@ esac
 fi
 MSPDB_PATH=$ac_cv_path_MSPDB_PATH
 if test -n "$MSPDB_PATH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSPDB_PATH" >&5
+  { $as_echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5
 $as_echo "$MSPDB_PATH" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSPDB_PATH+set}" = set; then :
+if test "${ac_cv_path_MSPDB_PATH+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $MSPDB_PATH in
@@ -7127,14 +6651,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -7142,10 +6666,10 @@ esac
 fi
 MSPDB_PATH=$ac_cv_path_MSPDB_PATH
 if test -n "$MSPDB_PATH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSPDB_PATH" >&5
+  { $as_echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5
 $as_echo "$MSPDB_PATH" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7154,22 +6678,24 @@ fi
 		fi
 
 		if test -z "$MSPDB_PATH"; then
-			as_fn_error "You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path" "$LINENO" 5
+			{ { $as_echo "$as_me:$LINENO: error: You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path" >&5
+$as_echo "$as_me: error: You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path" >&2;}
+   { (exit 1); exit 1; }; }
 		fi
 		MSPDB_PATH=`cygpath -d "$MSPDB_PATH"`
 		MSPDB_PATH=`cygpath -u "$MSPDB_PATH"`
 				PATH="$MSPDB_PATH:$PATH"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the Microsoft C/C++ Compiler" >&5
+		{ $as_echo "$as_me:$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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CC+set}" = set; then :
+if test "${ac_cv_path_CC+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $CC in
@@ -7182,14 +6708,14 @@ 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
+  for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_CC="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -7197,10 +6723,10 @@ esac
 fi
 CC=$ac_cv_path_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7211,11 +6737,11 @@ fi
 			CC=`cygpath -d "$CC"`
 			CC=`cygpath -u "$CC"`
 			# Remove /cl.exe from CC case insensitive
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found ($CC)" >&5
+			{ $as_echo "$as_me:$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"`
-						{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the Version of Microsoft C/C++ Compiler" >&5
+						{ $as_echo "$as_me:$LINENO: checking the Version of Microsoft C/C++ Compiler" >&5
 $as_echo_n "checking the Version of Microsoft C/C++ Compiler... " >&6; }
 			CCNUMVER=`$CC 2>&1 | $AWK "/Microsoft/ && /..\\...\\...../ {
 							x = match( \\\$0, /..\\...\\...../ )
@@ -7225,34 +6751,38 @@ $as_echo_n "checking the Version of Microsoft C/C++ Compiler... " >&6; }
 								printf (\"%04d\",vertoken[i] )
 							}
 							}"`
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found Compiler version $CCNUMVER." >&5
+			{ $as_echo "$as_me:$LINENO: result: found Compiler version $CCNUMVER." >&5
 $as_echo "found Compiler version $CCNUMVER." >&6; }
 			if test "$CCNUMVER" -ge "001500000000"; then
 				COMEX=12
 				MSVSVER=2008
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found .NET 2008 / VS 9.0." >&5
+				{ $as_echo "$as_me:$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
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found .NET 2005." >&5
+				{ $as_echo "$as_me:$LINENO: result: found .NET 2005." >&5
 $as_echo "found .NET 2005." >&6; }
 			elif test "$CCNUMVER" -ge "001300102240"; then
 				COMEX=10
 				MSVSVER=2003
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found .NET 2003." >&5
+				{ $as_echo "$as_me:$LINENO: result: found .NET 2003." >&5
 $as_echo "found .NET 2003." >&6; }
 			else
-				as_fn_error "Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler." "$LINENO" 5
+				{ { $as_echo "$as_me:$LINENO: error: Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler." >&5
+$as_echo "$as_me: error: Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler." >&2;}
+   { (exit 1); exit 1; }; }
 			fi
 		else
-			as_fn_error "Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe." "$LINENO" 5
+			{ { $as_echo "$as_me:$LINENO: error: Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe." >&5
+$as_echo "$as_me: error: Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe." >&2;}
+   { (exit 1); exit 1; }; }
 		fi
 	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the Mingwin32 C++ Compiler" >&5
+		{ $as_echo "$as_me:$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
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found." >&5
+			{ $as_echo "$as_me:$LINENO: result: found." >&5
 $as_echo "found." >&6; }
 			if $CC -dumpspecs | grep -q "mno-cygwin"; then
 				USE_MINGW="cygwin"
@@ -7260,7 +6790,9 @@ $as_echo "found." >&6; }
 				USE_MINGW="pure-mingw"
 			fi
 		else
-			as_fn_error "Mingwin32 C++ Compiler not found." "$LINENO" 5
+			{ { $as_echo "$as_me:$LINENO: error: Mingwin32 C++ Compiler not found." >&5
+$as_echo "$as_me: error: Mingwin32 C++ Compiler not found." >&2;}
+   { (exit 1); exit 1; }; }
 		fi
 	fi
 fi
@@ -7272,9 +6804,9 @@ if test "$_os" = "WINNT"; then
 if test "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then
 		# Extract the first word of "midl.exe", so it can be a program name with args.
 set dummy midl.exe; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MIDL_PATH+set}" = set; then :
+if test "${ac_cv_path_MIDL_PATH+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $MIDL_PATH in
@@ -7287,14 +6819,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -7302,10 +6834,10 @@ esac
 fi
 MIDL_PATH=$ac_cv_path_MIDL_PATH
 if test -n "$MIDL_PATH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MIDL_PATH" >&5
+  { $as_echo "$as_me:$LINENO: result: $MIDL_PATH" >&5
 $as_echo "$MIDL_PATH" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7335,7 +6867,9 @@ fi
 		fi
 	fi
 	if test ! -x "$MIDL_PATH/midl.exe"; then
-		as_fn_error "midl.exe not found. Make sure it's in the path or use --with-midl-path" "$LINENO" 5
+		{ { $as_echo "$as_me:$LINENO: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&5
+$as_echo "$as_me: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&2;}
+   { (exit 1); exit 1; }; }
 	fi
 	# Convert to posix path with 8.3 filename restrictions ( No spaces )
 	MIDL_PATH=`cygpath -d "$MIDL_PATH"`
@@ -7343,9 +6877,9 @@ fi
 
 		# Extract the first word of "csc.exe", so it can be a program name with args.
 set dummy csc.exe; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CSC_PATH+set}" = set; then :
+if test "${ac_cv_path_CSC_PATH+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $CSC_PATH in
@@ -7358,14 +6892,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -7373,10 +6907,10 @@ esac
 fi
 CSC_PATH=$ac_cv_path_CSC_PATH
 if test -n "$CSC_PATH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CSC_PATH" >&5
+  { $as_echo "$as_me:$LINENO: result: $CSC_PATH" >&5
 $as_echo "$CSC_PATH" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7396,13 +6930,15 @@ fi
 	   fi
 	fi
 	if test ! -x "$CSC_PATH/csc.exe"; then
-		as_fn_error "csc.exe not found. Make sure it's in the path or use --with-csc-path" "$LINENO" 5
+		{ { $as_echo "$as_me:$LINENO: error: csc.exe not found. Make sure it's in the path or use --with-csc-path" >&5
+$as_echo "$as_me: error: csc.exe not found. Make sure it's in the path or use --with-csc-path" >&2;}
+   { (exit 1); exit 1; }; }
 	fi
 	# Convert to posix path with 8.3 filename restrictions ( No spaces )
 	CSC_PATH=`cygpath -d "$CSC_PATH"`
 	CSC_PATH=`cygpath -u "$CSC_PATH"`
 
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking .NET Framework" >&5
+               { $as_echo "$as_me:$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"`
@@ -7425,9 +6961,11 @@ $as_echo_n "checking .NET Framework... " >&6; }
           fi
 	    fi
 	    if test ! -f "$FRAME_HOME/lib/mscoree.lib"; then
-		as_fn_error "mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home" "$LINENO" 5
+		{ { $as_echo "$as_me:$LINENO: error: mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home" >&5
+$as_echo "$as_me: error: mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home" >&2;}
+   { (exit 1); exit 1; }; }
 	    fi
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+	    { $as_echo "$as_me:$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"`
@@ -7444,14 +6982,14 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+{ $as_echo "$as_me:$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 :
+  if test "${ac_cv_prog_CPP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -7466,7 +7004,11 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -7475,34 +7017,78 @@ do
 #endif
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Broken: fails on valid input.
 continue
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
 done
 # 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
 
@@ -7514,7 +7100,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
 $as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -7525,7 +7111,11 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -7534,40 +7124,87 @@ do
 #endif
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Broken: fails on valid input.
 continue
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
+if $ac_preproc_ok; then
+  :
 else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:$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; }
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
 fi
 
 ac_ext=c
@@ -7577,12 +7214,16 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+{ $as_echo "$as_me:$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 :
+if test "${ac_cv_header_stdc+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -7597,23 +7238,48 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  ac_cv_header_stdc=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_header_stdc=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
+  $EGREP "memchr" >/dev/null 2>&1; then
+  :
 else
   ac_cv_header_stdc=no
 fi
@@ -7623,14 +7289,18 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
+  $EGREP "free" >/dev/null 2>&1; then
+  :
 else
   ac_cv_header_stdc=no
 fi
@@ -7640,10 +7310,14 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes; then
   :
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ctype.h>
 #include <stdlib.h>
@@ -7670,22 +7344,51 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
 else
-  ac_cv_header_stdc=no
+  $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
+
+( exit $ac_status )
+ac_cv_header_stdc=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
 $as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
 
 fi
 
@@ -7706,9 +7409,9 @@ if test -z "$CXX"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
+if test "${ac_cv_prog_CXX+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
@@ -7719,24 +7422,24 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
 $as_echo "$CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7750,9 +7453,9 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$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 :
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
@@ -7763,24 +7466,24 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
 $as_echo "$ac_ct_CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7793,7 +7496,7 @@ done
   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:$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
@@ -7804,36 +7507,53 @@ fi
   fi
 fi
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+$as_echo "$as_me:$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"
+{ (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -7847,16 +7567,37 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  ac_compiler_gnu=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_compiler_gnu=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
 $as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GXX=yes
@@ -7865,16 +7606,20 @@ else
 fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+{ $as_echo "$as_me:$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 :
+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
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -7885,11 +7630,35 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  CXXFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	CXXFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -7900,12 +7669,36 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
 else
-  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 	 CXXFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -7916,17 +7709,42 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 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 "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
 $as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
@@ -7954,10 +7772,10 @@ ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+{ $as_echo "$as_me:$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 :
+  if test "${ac_cv_prog_CXXCPP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CXXCPP needs to be expanded
@@ -7972,7 +7790,11 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -7981,34 +7803,78 @@ do
 #endif
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Broken: fails on valid input.
 continue
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
 done
 # 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
 
@@ -8020,7 +7886,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
 $as_echo "$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -8031,7 +7897,11 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -8040,40 +7910,87 @@ do
 #endif
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Broken: fails on valid input.
 continue
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
+if $ac_preproc_ok; then
+  :
 else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:$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; }
+{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
 fi
 
 ac_ext=c
@@ -8091,14 +8008,14 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+{ $as_echo "$as_me:$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 :
+  if test "${ac_cv_prog_CPP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -8113,7 +8030,11 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -8122,34 +8043,78 @@ do
 #endif
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Broken: fails on valid input.
 continue
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
 done
 # 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
 
@@ -8161,7 +8126,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
 $as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -8172,7 +8137,11 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -8181,40 +8150,87 @@ do
 #endif
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Broken: fails on valid input.
 continue
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
+if $ac_preproc_ok; then
+  :
 else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:$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; }
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
 fi
 
 ac_ext=c
@@ -8227,14 +8243,69 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 fi
 
 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
+
+
+
+
+
+
+
+
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  eval "$as_ac_Header=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -8248,27 +8319,352 @@ done
 # 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 "$as_me:$LINENO: checking size of long" >&5
 $as_echo_n "checking size of long... " >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then :
+if test "${ac_cv_sizeof_long+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+  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 int) (sizeof (long))) >= 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_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 int) (sizeof (long))) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid; break
+else
+  $as_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 core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  $as_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.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_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 int) (sizeof (long))) >= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=$ac_mid; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_hi=`expr '(' $ac_mid ')' - 1`
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	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
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_long=$ac_lo;;
+'') if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (long)
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
+   else
+     ac_cv_sizeof_long=0
+   fi ;;
+esac
+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
+static long int longval () { return (long int) (sizeof (long)); }
+static unsigned long int ulongval () { return (long int) (sizeof (long)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if (((long int) (sizeof (long))) < 0)
+    {
+      long int i = longval ();
+      if (i != ((long int) (sizeof (long))))
+	return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != ((long int) (sizeof (long))))
+	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
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sizeof_long=`cat conftest.val`
 else
-  if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (long)
-See \`config.log' for more details." "$LINENO" 5; }; }
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (long)
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
    else
      ac_cv_sizeof_long=0
    fi
 fi
-
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+rm -f conftest.val
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
 $as_echo "$ac_cv_sizeof_long" >&6; }
 
 
@@ -8280,14 +8676,19 @@ _ACEOF
 
 SIZEOF_LONG=$ac_cv_sizeof_long
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+
+ { $as_echo "$as_me:$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 :
+if test "${ac_cv_c_bigendian+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_bigendian=unknown
     # See if we're dealing with a universal compiler.
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #ifndef __APPLE_CC__
 	       not a universal capable compiler
@@ -8295,34 +8696,46 @@ else
 	     typedef int dummy;
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
 	# Check for potential -arch flags.  It is not universal unless
-	# there are 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
+	# there are some -arch flags.  Note that *ppc* also matches
+	# ppc64.  This check is also rather less than ideal.
+	case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in  #(
+	  *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
+	esac
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     if test $ac_cv_c_bigendian = unknown; then
       # See if sys/param.h defines the BYTE_ORDER macro.
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
 	     #include <sys/param.h>
@@ -8340,9 +8753,30 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   # It does; now see whether it defined to BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
 		#include <sys/param.h>
@@ -8358,18 +8792,49 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_c_bigendian=yes
 else
-  ac_cv_c_bigendian=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_c_bigendian=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     fi
     if test $ac_cv_c_bigendian = unknown; then
       # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <limits.h>
 
@@ -8384,9 +8849,30 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   # It does; now see whether it defined to _BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <limits.h>
 
@@ -8401,20 +8887,51 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_c_bigendian=yes
 else
-  ac_cv_c_bigendian=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_c_bigendian=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 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 :
+      if test "$cross_compiling" = yes; then
   # Try to guess by grepping values from an object file.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 short int ascii_mm[] =
 		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
@@ -8440,7 +8957,24 @@ return use_ascii (foo) == use_ebcdic (foo);
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
 	      ac_cv_c_bigendian=yes
 	    fi
@@ -8452,10 +8986,20 @@ if ac_fn_c_try_compile "$LINENO"; then :
 		ac_cv_c_bigendian=unknown
 	      fi
 	    fi
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -8475,48 +9019,82 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_c_bigendian=no
 else
-  ac_cv_c_bigendian=yes
+  $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
+
+( exit $ac_status )
+ac_cv_c_bigendian=yes
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+
     fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
 $as_echo "$ac_cv_c_bigendian" >&6; }
  case $ac_cv_c_bigendian in #(
    yes)
-     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+     cat >>confdefs.h <<\_ACEOF
+#define WORDS_BIGENDIAN 1
+_ACEOF
 ;; #(
    no)
       ;; #(
    universal)
 
-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define AC_APPLE_UNIVERSAL_BUILD 1
+_ACEOF
 
      ;; #(
    *)
-     as_fn_error "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+     { { $as_echo "$as_me:$LINENO: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+$as_echo "$as_me: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+   { (exit 1); exit 1; }; } ;;
  esac
 
 WORDS_BIGENDIAN=$ac_cv_c_bigendian
 
 
 # Check whether --enable-largefile was given.
-if test "${enable_largefile+set}" = set; then :
+if test "${enable_largefile+set}" = set; then
   enableval=$enable_largefile;
 fi
 
 if test "$enable_largefile" != no; then
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+  { $as_echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
 $as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-if test "${ac_cv_sys_largefile_CC+set}" = set; then :
+if test "${ac_cv_sys_largefile_CC+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_cv_sys_largefile_CC=no
@@ -8525,7 +9103,11 @@ else
        while :; do
 	 # IRIX 6.2 and later do not support large files by default,
 	 # so use the C compiler's -n32 option if that helps.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -8544,14 +9126,60 @@ main ()
   return 0;
 }
 _ACEOF
-	 if ac_fn_c_try_compile "$LINENO"; then :
+	 rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext
 	 CC="$CC -n32"
-	 if ac_fn_c_try_compile "$LINENO"; then :
+	 rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_sys_largefile_CC=' -n32'; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext
 	 break
        done
@@ -8559,19 +9187,23 @@ rm -f core conftest.err conftest.$ac_objext
        rm -f conftest.$ac_ext
     fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+{ $as_echo "$as_me:$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
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  { $as_echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
+if test "${ac_cv_sys_file_offset_bits+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -8590,11 +9222,38 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_sys_file_offset_bits=no; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -8614,15 +9273,38 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_sys_file_offset_bits=64; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   ac_cv_sys_file_offset_bits=unknown
   break
 done
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
 $as_echo "$ac_cv_sys_file_offset_bits" >&6; }
 case $ac_cv_sys_file_offset_bits in #(
   no | unknown) ;;
@@ -8634,13 +9316,17 @@ _ACEOF
 esac
 rm -rf conftest*
   if test $ac_cv_sys_file_offset_bits = unknown; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+    { $as_echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
 $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if test "${ac_cv_sys_large_files+set}" = set; then :
+if test "${ac_cv_sys_large_files+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -8659,11 +9345,38 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_sys_large_files=no; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -8683,15 +9396,38 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_sys_large_files=1; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   ac_cv_sys_large_files=unknown
   break
 done
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
 $as_echo "$ac_cv_sys_large_files" >&6; }
 case $ac_cv_sys_large_files in #(
   no | unknown) ;;
@@ -8713,41 +9449,43 @@ if test -n "$ac_cv_sys_large_files" && test "$ac_cv_sys_large_files" != "no"; th
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to disable vba feature" >&5
+{ $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
    ENABLE_VBA=NO
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
    ENABLE_VBA=YES
 fi
 
 
 if test "$ENABLE_VBA" = "YES"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to package the vba compatibility api" >&5
+   { $as_echo "$as_me:$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
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: uno extension" >&5
+         { $as_echo "$as_me:$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:$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
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: build into installset" >&5
+            { $as_echo "$as_me:$LINENO: result: build into installset" >&5
 $as_echo "build into installset" >&6; }
          else
-            as_fn_error "unknown packaging method" "$LINENO" 5
+            { { $as_echo "$as_me:$LINENO: error: unknown packaging method" >&5
+$as_echo "$as_me: error: unknown packaging method" >&2;}
+   { (exit 1); exit 1; }; }
          fi
       fi
 
    else
       VBA_EXTENSION=NO
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: defaulting to build into installset" >&5
+      { $as_echo "$as_me:$LINENO: result: defaulting to build into installset" >&5
 $as_echo "defaulting to build into installset" >&6; }
    fi
 else
@@ -8758,45 +9496,306 @@ fi
 
 
 if test "$test_cups" = "yes" -a "$ENABLE_CUPS" = "TRUE" ; then
-    ac_fn_c_check_header_mongrel "$LINENO" "cups/cups.h" "ac_cv_header_cups_cups_h" "$ac_includes_default"
-if test "x$ac_cv_header_cups_cups_h" = x""yes; then :
+    if test "${ac_cv_header_cups_cups_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for cups/cups.h" >&5
+$as_echo_n "checking for cups/cups.h... " >&6; }
+if test "${ac_cv_header_cups_cups_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5
+$as_echo "$ac_cv_header_cups_cups_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking cups/cups.h usability" >&5
+$as_echo_n "checking cups/cups.h usability... " >&6; }
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking cups/cups.h presence" >&5
+$as_echo_n "checking cups/cups.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <cups/cups.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
 else
-  as_fn_error "cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?" "$LINENO" 5
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: cups/cups.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: cups/cups.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: cups/cups.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: cups/cups.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: cups/cups.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for cups/cups.h" >&5
+$as_echo_n "checking for cups/cups.h... " >&6; }
+if test "${ac_cv_header_cups_cups_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_cups_cups_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5
+$as_echo "$ac_cv_header_cups_cups_h" >&6; }
+
+fi
+if test "x$ac_cv_header_cups_cups_h" = x""yes; then
+  :
+else
+  { { $as_echo "$as_me:$LINENO: error: cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?" >&5
+$as_echo "$as_me: error: cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
 fi
 
 if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "GNU"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable pam support" >&5
+  { $as_echo "$as_me:$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
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+    { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
     PAM=YES
-    ac_fn_c_check_header_mongrel "$LINENO" "security/pam_appl.h" "ac_cv_header_security_pam_appl_h" "$ac_includes_default"
-if test "x$ac_cv_header_security_pam_appl_h" = x""yes; then :
+    if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
+$as_echo_n "checking for security/pam_appl.h... " >&6; }
+if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5
+$as_echo "$ac_cv_header_security_pam_appl_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking security/pam_appl.h usability" >&5
+$as_echo_n "checking security/pam_appl.h usability... " >&6; }
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking security/pam_appl.h presence" >&5
+$as_echo_n "checking security/pam_appl.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <security/pam_appl.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: security/pam_appl.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: security/pam_appl.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: security/pam_appl.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: security/pam_appl.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: security/pam_appl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
+$as_echo_n "checking for security/pam_appl.h... " >&6; }
+if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  as_fn_error "pam_appl.h could not be found. libpam-dev or pam-devel missing?" "$LINENO" 5
+  ac_cv_header_security_pam_appl_h=$ac_header_preproc
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5
+$as_echo "$ac_cv_header_security_pam_appl_h" >&6; }
 
+fi
+if test "x$ac_cv_header_security_pam_appl_h" = x""yes; then
+  :
+else
+  { { $as_echo "$as_me:$LINENO: error: pam_appl.h could not be found. libpam-dev or pam-devel missing?" >&5
+$as_echo "$as_me: error: pam_appl.h could not be found. libpam-dev or pam-devel missing?" >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to link to libpam" >&5
+
+    { $as_echo "$as_me:$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
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+      { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
       PAM_LINK=YES
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5
+
+{ $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -8814,18 +9813,43 @@ return pam_start ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_pam_pam_start=yes
 else
-  ac_cv_lib_pam_pam_start=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_pam_pam_start=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_start" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5
 $as_echo "$ac_cv_lib_pam_pam_start" >&6; }
-if test "x$ac_cv_lib_pam_pam_start" = x""yes; then :
+if test "x$ac_cv_lib_pam_pam_start" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBPAM 1
 _ACEOF
@@ -8833,16 +9857,18 @@ _ACEOF
   LIBS="-lpam $LIBS"
 
 else
-  as_fn_error "libpam not found or functional" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: libpam not found or functional" >&5
+$as_echo "$as_me: error: libpam not found or functional" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
     else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, dynamically open it" >&5
+      { $as_echo "$as_me:$LINENO: result: no, dynamically open it" >&5
 $as_echo "no, dynamically open it" >&6; }
       PAM_LINK=NO
     fi
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+    { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
     PAM=NO
     PAM_LINK=NO
@@ -8854,10 +9880,10 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how many arguments getspnam_r() takes" >&5
+    { $as_echo "$as_me:$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 :
+    if test "${ac_cv_func_which_getspnam_r+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
@@ -8875,7 +9901,11 @@ ac_cv_func_which_getspnam_r=unknown
 # netdb.h is not declaring the function, and the compiler is thereby
 # assuming an implicit prototype. In which case, we're out of luck.
 #
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 	    #include <sys/types.h>
@@ -8892,9 +9922,32 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_func_which_getspnam_r=no
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 #
@@ -8903,7 +9956,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test "$ac_cv_func_which_getspnam_r" = "unknown"; then
 
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 	    #include <sys/types.h>
@@ -8922,9 +9979,32 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_func_which_getspnam_r=five
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
@@ -8935,7 +10015,11 @@ fi
 
 if test "$ac_cv_func_which_getspnam_r" = "unknown"; then
 
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 	    #include <sys/types.h>
@@ -8954,9 +10038,32 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_func_which_getspnam_r=four
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
@@ -8968,28 +10075,30 @@ fi
 
 case "$ac_cv_func_which_getspnam_r" in
     five)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: five" >&5
+    { $as_echo "$as_me:$LINENO: result: five" >&5
 $as_echo "five" >&6; }
     NEW_SHADOW_API=YES
     ;;
 
     four)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: four" >&5
+    { $as_echo "$as_me:$LINENO: result: four" >&5
 $as_echo "four" >&6; }
     ;;
 
     no)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot find function declaration in shadow.h" >&5
+    { $as_echo "$as_me:$LINENO: result: cannot find function declaration in shadow.h" >&5
 $as_echo "cannot find function declaration in shadow.h" >&6; }
     ;;
 
     unknown)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: can't tell" >&5
+    { $as_echo "$as_me:$LINENO: result: can't tell" >&5
 $as_echo "can't tell" >&6; }
     ;;
 
     *)
-    as_fn_error "internal error" "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: internal error" >&5
+$as_echo "$as_me: error: internal error" >&2;}
+   { (exit 1); exit 1; }; }
     ;;
 esac
 
@@ -9008,20 +10117,25 @@ fi
 
 
 if test "$_os" = "Linux"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to link to libcrypt" >&5
+    { $as_echo "$as_me:$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
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
         CRYPT_LINK=YES
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
+
+{ $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -9039,18 +10153,43 @@ return crypt ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_crypt_crypt=yes
 else
-  ac_cv_lib_crypt_crypt=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_crypt_crypt=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
 $as_echo "$ac_cv_lib_crypt_crypt" >&6; }
-if test "x$ac_cv_lib_crypt_crypt" = x""yes; then :
+if test "x$ac_cv_lib_crypt_crypt" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBCRYPT 1
 _ACEOF
@@ -9058,11 +10197,13 @@ _ACEOF
   LIBS="-lcrypt $LIBS"
 
 else
-  as_fn_error "libcrypt not found or functional" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: libcrypt not found or functional" >&5
+$as_echo "$as_me: error: libcrypt not found or functional" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
     else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, dynamically open it" >&5
+        { $as_echo "$as_me:$LINENO: result: no, dynamically open it" >&5
 $as_echo "no, dynamically open it" >&6; }
         CRYPT_LINK=NO
     fi
@@ -9096,9 +10237,9 @@ if test -z "$CXX"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
+if test "${ac_cv_prog_CXX+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
@@ -9109,24 +10250,24 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
 $as_echo "$CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -9140,9 +10281,9 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$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 :
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
@@ -9153,24 +10294,24 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
 $as_echo "$ac_ct_CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -9183,7 +10324,7 @@ done
   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:$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
@@ -9194,36 +10335,53 @@ fi
   fi
 fi
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+$as_echo "$as_me:$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"
+{ (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -9237,16 +10395,37 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  ac_compiler_gnu=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_compiler_gnu=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
 $as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GXX=yes
@@ -9255,16 +10434,20 @@ else
 fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+{ $as_echo "$as_me:$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 :
+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
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -9275,11 +10458,35 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  CXXFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	CXXFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -9290,12 +10497,36 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
 else
-  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 	 CXXFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -9306,17 +10537,42 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 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 "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
 $as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
@@ -9342,7 +10598,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 fi
 
 if test "$GXX" = "yes"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking the GNU C++ compiler version" >&5
+   { $as_echo "$as_me:$LINENO: checking the GNU C++ compiler version" >&5
 $as_echo_n "checking the GNU C++ compiler version... " >&6; }
 
    _gpp_version=`$CXX -dumpversion`
@@ -9357,26 +10613,35 @@ $as_echo_n "checking the GNU C++ compiler version... " >&6; }
          fi
       fi
       if test "$_gpp_majmin" -ge "401" ; then
-         as_fn_error "You need to use the g++-4.0 compiler (g++ $_gpp_version won't work with the MacOSX10.4u.sdk) - set CXX accordingly" "$LINENO" 5
+         { { $as_echo "$as_me:$LINENO: error: You need to use the g++-4.0 compiler (g++ $_gpp_version won't work with the MacOSX10.4u.sdk) - set CXX accordingly" >&5
+$as_echo "$as_me: error: You need to use the g++-4.0 compiler (g++ $_gpp_version won't work with the MacOSX10.4u.sdk) - set CXX accordingly" >&2;}
+   { (exit 1); exit 1; }; }
       else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: implicitly using CXX=$CXX" >&5
+         { $as_echo "$as_me:$LINENO: result: implicitly using CXX=$CXX" >&5
 $as_echo "implicitly using CXX=$CXX" >&6; }
       fi
    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (g++ $_gpp_version)" >&5
+      { $as_echo "$as_me:$LINENO: result: checked (g++ $_gpp_version)" >&5
 $as_echo "checked (g++ $_gpp_version)" >&6; }
    fi
 
    if test "$_gpp_majmin" = "304"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX has the enum bug" >&5
+      { $as_echo "$as_me:$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
+if test "$cross_compiling" = yes; then
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_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
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 extern "C" void abort (void);
@@ -9401,23 +10666,52 @@ main (void)
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  as_fn_error "your version of the GNU C++ compile has a bug which prevents OpenOffice.org from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details." "$LINENO" 5
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  { { $as_echo "$as_me:$LINENO: error: your version of the GNU C++ compile has a bug which prevents OpenOffice.org from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details." >&5
+$as_echo "$as_me: error: your version of the GNU C++ compile has a bug which prevents OpenOffice.org from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details." >&2;}
+   { (exit 1); exit 1; }; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  $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
+
+( exit $ac_status )
+{ $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+
    fi
 fi
 
 # Removed the special FreeBSD treatment. The problem was that with_gxx_include_path
 # often contains an i386 which is expanded as a macro. Solved in stlport.
 if test "$GXX" = "yes"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for g++ include path" >&5
+   { $as_echo "$as_me:$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`
@@ -9436,17 +10730,17 @@ $as_echo_n "checking for g++ include path... " >&6; }
 fi
 if test -z "$with_gxx_include_path"; then
    with_gxx_include_path="NO_GXX_INCLUDE"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no g++ includes" >&5
+   { $as_echo "$as_me:$LINENO: result: no g++ includes" >&5
 $as_echo "no g++ includes" >&6; }
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_gxx_include_path" >&5
+   { $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mingwin runtime include path" >&5
+   { $as_echo "$as_me:$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>
@@ -9465,15 +10759,15 @@ _ACEOF
    fi
    if test -z "$_mingw_lib_include_path"; then
       _mingw_lib_include_path="NO_LIB_INCLUDE"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no mingwin runtime includes" >&5
+      { $as_echo "$as_me:$LINENO: result: no mingwin runtime includes" >&5
 $as_echo "no mingwin runtime includes" >&6; }
    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_mingw_lib_include_path" >&5
+      { $as_echo "$as_me:$LINENO: result: $_mingw_lib_include_path" >&5
 $as_echo "$_mingw_lib_include_path" >&6; }
    fi
   MINGW_LIB_INCLUDE_PATH="$_mingw_lib_include_path"
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mingwin c++ backward include path" >&5
+   { $as_echo "$as_me:$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>
@@ -9483,56 +10777,56 @@ _ACEOF
    if test -n "$_mingw_backward_include_path"; then
       _mingw_backward_include_path=`cygpath -d $_mingw_backward_include_path`
       _mingw_backward_include_path=`cygpath -u $_mingw_backward_include_path`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_mingw_backward_include_path" >&5
+      { $as_echo "$as_me:$LINENO: result: $_mingw_backward_include_path" >&5
 $as_echo "$_mingw_backward_include_path" >&6; }
    else
       _mingw_backward_include_path="NO_BACKWARD_INCLUDE"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no mingwin c++ backward includes" >&5
+      { $as_echo "$as_me:$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`
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use dynamic libgcc" >&5
+  { $as_echo "$as_me:$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
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic libgcc name" >&5
+    { $as_echo "$as_me:$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
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: use $MINGW_GCCDLL" >&5
+        { $as_echo "$as_me:$LINENO: result: use $MINGW_GCCDLL" >&5
 $as_echo "use $MINGW_GCCDLL" >&6; }
     else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
     fi
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+    { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
   fi
   if test -e "$MINGW_CLIB_DIR/libgcc_eh.a"; then
       MINGW_GCCLIB_EH=YES
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use dynamic libstdc++" >&5
+  { $as_echo "$as_me:$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
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic libstdc++ name" >&5
+    { $as_echo "$as_me:$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
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: use $MINGW_GXXDLL" >&5
+        { $as_echo "$as_me:$LINENO: result: use $MINGW_GXXDLL" >&5
 $as_echo "use $MINGW_GXXDLL" >&6; }
     else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
     fi
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+    { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
   fi
   MINGW_CLIB_DIR=`cygpath $MINGW_CLIB_DIR`
@@ -9546,34 +10840,34 @@ fi
 
 if test "$_os" = "SunOS"; then
       if test "$CC" = "cc"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking SunStudio C++ Compiler" >&5
+   { $as_echo "$as_me:$LINENO: checking SunStudio C++ Compiler" >&5
 $as_echo_n "checking SunStudio C++ Compiler... " >&6; }
       if test "$CXX" != "CC"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SunStudio C++ was not found" >&5
+         { $as_echo "$as_me:$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
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
+         { $as_echo "$as_me:$LINENO: result: checked" >&5
 $as_echo "checked" >&6; }
       fi
    fi
 fi
 if test "$_os" = "OSF1"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking Compaq C++ compiler version" >&5
+   { $as_echo "$as_me:$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
-      { $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:$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
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
+            { $as_echo "$as_me:$LINENO: result: checked" >&5
 $as_echo "checked" >&6; }
    fi
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking exception type" >&5
+{ $as_echo "$as_me:$LINENO: checking exception type" >&5
 $as_echo_n "checking exception type... " >&6; }
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -9583,7 +10877,11 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 if test "$WITH_MINGWIN" = "yes"; then
 
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <iostream>
 
@@ -9598,17 +10896,42 @@ _Unwind_SjLj_RaiseException()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   exceptions_type="sjlj"
 else
-  exceptions_type="dwarf2"
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	exceptions_type="dwarf2"
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $exceptions_type" >&5
+{ $as_echo "$as_me:$LINENO: result: $exceptions_type" >&5
 $as_echo "$exceptions_type" >&6; }
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -9622,7 +10945,7 @@ EXCEPTIONS="$exceptions_type"
 if test "$_os" = "SunOS"; then
    _temp=`showrev -p | $AWK -F" " '{ print $2 }'`
    if test "$_os_release" = "7"; then
-                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for patch 106327-06 or greater" >&5
+                        { $as_echo "$as_me:$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"
@@ -9637,14 +10960,14 @@ $as_echo_n "checking for patch 106327-06 or greater... " >&6; }
         fi
       done
       if test "$_patch" = "found"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+         { $as_echo "$as_me:$LINENO: result: found" >&5
 $as_echo "found" >&6; }
       else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&5
+         { $as_echo "$as_me:$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
-                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for patch 106950-11 or greater" >&5
+                        { $as_echo "$as_me:$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"
@@ -9659,16 +10982,16 @@ $as_echo_n "checking for patch 106950-11 or greater... " >&6; }
          fi
       done
       if test "$_patch" = "found"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+         { $as_echo "$as_me:$LINENO: result: found" >&5
 $as_echo "found" >&6; }
       else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&5
+         { $as_echo "$as_me:$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
-                                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for patch 105591-09 or greater" >&5
+                                    { $as_echo "$as_me:$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"
@@ -9683,14 +11006,14 @@ $as_echo_n "checking for patch 105591-09 or greater... " >&6; }
            fi
          done
          if test "$_patch" = "found"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+            { $as_echo "$as_me:$LINENO: result: found" >&5
 $as_echo "found" >&6; }
          else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&5
+            { $as_echo "$as_me:$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
-                                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for patch 107733-08 or greater" >&5
+                                    { $as_echo "$as_me:$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"
@@ -9705,10 +11028,10 @@ $as_echo_n "checking for patch 107733-08 or greater... " >&6; }
            fi
          done
          if test "$_patch" = "found"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+            { $as_echo "$as_me:$LINENO: result: found" >&5
 $as_echo "found" >&6; }
          else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&5
+            { $as_echo "$as_me:$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
@@ -9716,7 +11039,7 @@ $as_echo "$as_me: WARNING: patch 107733-06 not found, please install linker patc
    fi
 fi
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking what the default STL should be" >&5
+   { $as_echo "$as_me:$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
@@ -9738,99 +11061,133 @@ $as_echo_n "checking what the default STL should be... " >&6; }
       DEFAULT_TO_STLPORT="yes"
    fi
    if test "$DEFAULT_TO_STLPORT" = "yes"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: stlport" >&5
+      { $as_echo "$as_me:$LINENO: result: stlport" >&5
 $as_echo "stlport" >&6; }
    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: system" >&5
+      { $as_echo "$as_me:$LINENO: result: system" >&5
 $as_echo "system" >&6; }
    fi
    if test "$WITH_STLPORT" = "auto"; then
       WITH_STLPORT=$DEFAULT_TO_STLPORT
    fi
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for STL providing headers" >&5
+   { $as_echo "$as_me:$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
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: using internal stlport." >&5
+      { $as_echo "$as_me:$LINENO: result: using internal stlport." >&5
 $as_echo "using internal stlport." >&6; }
       if test "$DEFAULT_TO_STLPORT" != "yes"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using stlport. Warning, breaks your ABI compatability!" >&5
+         { $as_echo "$as_me:$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
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: using system STL" >&5
+      { $as_echo "$as_me:$LINENO: result: using system STL" >&5
 $as_echo "using system STL" >&6; }
       USE_SYSTEM_STL="YES"
       if test "$DEFAULT_TO_STLPORT" != "no"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using system STL. Warning, breaks your ABI compatability!" >&5
+         { $as_echo "$as_me:$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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+         cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $STLPORT4/stlport/hash_map
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked." >&5
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  { $as_echo "$as_me:$LINENO: result: checked." >&5
 $as_echo "checked." >&6; }
 else
-  as_fn_error "STLport headers not found." "$LINENO" 5
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  { { $as_echo "$as_me:$LINENO: error: STLport headers not found." >&5
+$as_echo "$as_me: error: STLport headers not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
+
 rm -f conftest.err conftest.$ac_ext
       else
                   if test -f "$STLPORT4/stlport/hash_map"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked." >&5
+            { $as_echo "$as_me:$LINENO: result: checked." >&5
 $as_echo "checked." >&6; }
          else
-            as_fn_error "STLport headers not found." "$LINENO" 5
+            { { $as_echo "$as_me:$LINENO: error: STLport headers not found." >&5
+$as_echo "$as_me: error: STLport headers not found." >&2;}
+   { (exit 1); exit 1; }; }
          fi
       fi
       if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for STLport libraries" >&5
+         { $as_echo "$as_me:$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
-			      { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
+			      { $as_echo "$as_me:$LINENO: result: checked" >&5
 $as_echo "checked" >&6; }
 		      elif test -f "$STLPORT4/lib/libstlport.so"; then
-			      { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
+			      { $as_echo "$as_me:$LINENO: result: checked" >&5
 $as_echo "checked" >&6; }
 			      STLPORT_VER=500
 		      else
-			      as_fn_error "STLport libraries not found" "$LINENO" 5
+			      { { $as_echo "$as_me:$LINENO: error: STLport libraries not found" >&5
+$as_echo "$as_me: error: STLport libraries not found" >&2;}
+   { (exit 1); exit 1; }; }
 		      fi
 	      elif test "$_os" = "Darwin"; then
 		      if test -f "$STLPORT4/lib/libstlport_gcc.dylib"; then
-			      { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
+			      { $as_echo "$as_me:$LINENO: result: checked" >&5
 $as_echo "checked" >&6; }
 		      elif test -f "$STLPORT4/lib/libstlport.dylib"; then
-			      { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
+			      { $as_echo "$as_me:$LINENO: result: checked" >&5
 $as_echo "checked" >&6; }
 			      STLPORT_VER=500
 		      else
-			      as_fn_error "STLport libraries not found" "$LINENO" 5
+			      { { $as_echo "$as_me:$LINENO: error: STLport libraries not found" >&5
+$as_echo "$as_me: error: STLport libraries not found" >&2;}
+   { (exit 1); exit 1; }; }
 		      fi
 		   else
 			   if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
-				   { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
+				   { $as_echo "$as_me:$LINENO: result: checked" >&5
 $as_echo "checked" >&6; }
 			   elif test -f "$STLPORT4/lib/libstlport.so"; then
-				   { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
+				   { $as_echo "$as_me:$LINENO: result: checked" >&5
 $as_echo "checked" >&6; }
 				   STLPORT_VER=500
 			   else
-				   as_fn_error "STLport libraries not found" "$LINENO" 5
+				   { { $as_echo "$as_me:$LINENO: error: STLport libraries not found" >&5
+$as_echo "$as_me: error: STLport libraries not found" >&2;}
+   { (exit 1); exit 1; }; }
 			   fi
 		   fi
 	   fi
       if test "$DEFAULT_TO_STLPORT" != "yes"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using stlport. Warning, breaks your ABI compatability!" >&5
+         { $as_echo "$as_me:$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
@@ -9847,11 +11204,15 @@ fi
 
 
 if test "$GCC" = "yes"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -fvisibility=hidden" >&5
+   { $as_echo "$as_me:$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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -9862,17 +11223,44 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
    HAVE_GCC_VISIBILITY_FEATURE=TRUE
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
    CFLAGS=$save_CFLAGS
    if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+      { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+      { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
    fi
 fi
@@ -9880,28 +11268,28 @@ fi
 # ===================================================================
 # use --ccache-skip?
 # ===================================================================
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are allowed and able to use --ccache-skip" >&5
+{ $as_echo "$as_me:$LINENO: checking whether we are allowed and able to use --ccache-skip" >&5
 $as_echo_n "checking whether we are allowed and able to use --ccache-skip... " >&6; }
 if test "$_os" != "Darwin" ; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: only used on Mac currently, skipping" >&5
+   { $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - diabled explicitly" >&5
+   { $as_echo "$as_me:$LINENO: result: no - diabled explicitly" >&5
 $as_echo "no - diabled explicitly" >&6; }
 elif test "$enable_ccache_skip" = "yes" ; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - enabled explicitly, skipping checks" >&5
+   { $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: probing..." >&5
+   { $as_echo "$as_me:$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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CCACHE+set}" = set; then :
+if test "${ac_cv_path_CCACHE+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $CCACHE in
@@ -9914,14 +11302,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -9930,26 +11318,26 @@ esac
 fi
 CCACHE=$ac_cv_path_CCACHE
 if test -n "$CCACHE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CCACHE" >&5
+  { $as_echo "$as_me:$LINENO: result: $CCACHE" >&5
 $as_echo "$CCACHE" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
    if test "$CCACHE" = "not_found" ; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: not enabling --ccache-skip (ccache not found)" >&5
+      { $as_echo "$as_me:$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
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether version of ccache is suitable" >&5
+      { $as_echo "$as_me:$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
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+         { $as_echo "$as_me:$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 "$as_me:$LINENO: checking whether ccache is actually used for the build" >&5
 $as_echo_n "checking whether ccache is actually used for the build... " >&6; }
          ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -9959,7 +11347,11 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
          save_CXXFLAGS=$CXXFLAGS
          CXXFLAGS="$CXXFLAGS --ccache-skip -O2"
-                  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+                  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -9970,19 +11362,40 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   use_ccache=yes
 else
-  use_ccache=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	use_ccache=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
          if test $use_ccache = yes ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, will enable --ccache-skip" >&5
+            { $as_echo "$as_me:$LINENO: result: yes, will enable --ccache-skip" >&5
 $as_echo "yes, will enable --ccache-skip" >&6; }
             USE_CCACHE=YES
 
          else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, will not enable --ccache-skip" >&5
+            { $as_echo "$as_me:$LINENO: result: no, will not enable --ccache-skip" >&5
 $as_echo "no, will not enable --ccache-skip" >&6; }
          fi
          CXXFLAGS=$save_CXXFLAGS
@@ -9993,18 +11406,20 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
       else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         { $as_echo "$as_me:$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:$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
-   as_fn_error "invalid option to --enable-ccache-skip. Valid values are \"auto\", \"yes\" and \"no\"" "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: invalid option to --enable-ccache-skip. Valid values are \"auto\", \"yes\" and \"no\"" >&5
+$as_echo "$as_me: error: invalid option to --enable-ccache-skip. Valid values are \"auto\", \"yes\" and \"no\"" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 if test "$USE_SYSTEM_STL" = "YES"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if hash_map will be in __gnu_cxx namespace" >&5
+   { $as_echo "$as_me:$LINENO: checking if hash_map will be in __gnu_cxx namespace" >&5
 $as_echo_n "checking if hash_map will be in __gnu_cxx namespace... " >&6; }
    ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -10013,7 +11428,11 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ext/hash_map>
 using namespace __gnu_cxx;
@@ -10026,41 +11445,68 @@ hash_map<int, int> t; return 0;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_cxx_have_ext_hash_map=yes
 else
-  ac_cv_cxx_have_ext_hash_map=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_cxx_have_ext_hash_map=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
    if test "$ac_cv_cxx_have_ext_hash_map" = "no"; then
-      as_fn_error "Can't find hash_map. Try with --with-stlport" "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: Can't find hash_map. Try with --with-stlport" >&5
+$as_echo "$as_me: error: Can't find hash_map. Try with --with-stlport" >&2;}
+   { (exit 1); exit 1; }; }
    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_have_ext_hash_map" >&5
+      { $as_echo "$as_me:$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
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if STL headers are visibility safe" >&5
+      { $as_echo "$as_me:$LINENO: checking if STL headers are visibility safe" >&5
 $as_echo_n "checking if STL headers are visibility safe... " >&6; }
 
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <string>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "visibility push" >/dev/null 2>&1; then :
+  $EGREP "visibility push" >/dev/null 2>&1; then
   stlvisok=yes
 else
   stlvisok=no
 fi
 rm -f conftest*
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $stlvisok" >&5
+      { $as_echo "$as_me:$LINENO: result: $stlvisok" >&5
 $as_echo "$stlvisok" >&6; }
       if test "$stlvisok" = "no"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your gcc STL headers are not visibility safe. Disabling visibility" >&5
+         { $as_echo "$as_me:$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
@@ -10071,9 +11517,13 @@ $as_echo "$as_me: WARNING: Your gcc STL headers are not visibility safe. Disabli
       sharedlink_ldflags_save=$LDFLAGS
       LDFLAGS="$LDFLAGS -fvisibility-inlines-hidden -fpic -shared"
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gcc is -fvisibility-inlines-hidden safe with STL headers" >&5
+      { $as_echo "$as_me:$LINENO: checking if gcc is -fvisibility-inlines-hidden safe with STL headers" >&5
 $as_echo_n "checking if gcc is -fvisibility-inlines-hidden safe with STL headers... " >&6; }
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sstream>
 using namespace std;
@@ -10086,18 +11536,43 @@ istringstream strm( "test" ); return 0;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   $EGREP -q  unresolvable conftest.err;
       if test $? -eq 0; then gccvisok=no; else gccvisok=yes; fi
 else
-  gccvisok=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	gccvisok=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gccvisok" >&5
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+      { $as_echo "$as_me:$LINENO: result: $gccvisok" >&5
 $as_echo "$gccvisok" >&6; }
       if test "$gccvisok" = "no"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >&5
+         { $as_echo "$as_me:$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
@@ -10107,7 +11582,7 @@ $as_echo "$as_me: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Dis
    fi
 
    if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)" >&5
+      { $as_echo "$as_me:$LINENO: checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)" >&5
 $as_echo_n "checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)... " >&6; }
       cat >visibility.cxx <<_ACEOF
 #pragma GCC visibility push(hidden)
@@ -10136,10 +11611,10 @@ _ACEOF
       fi
       rm -f visibility.s
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gccvisbroken" >&5
+      { $as_echo "$as_me:$LINENO: result: $gccvisbroken" >&5
 $as_echo "$gccvisbroken" >&6; }
       if test "$gccvisbroken" = "yes"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your gcc is not -fvisibility=hidden safe. Disabling visibility" >&5
+         { $as_echo "$as_me:$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
@@ -10156,18 +11631,109 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which memory allocator to use" >&5
+{ $as_echo "$as_me:$LINENO: checking which memory allocator to use" >&5
 $as_echo_n "checking which memory allocator to use... " >&6; }
 if test "$with_alloc" = "system"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: system" >&5
+    { $as_echo "$as_me:$LINENO: result: system" >&5
 $as_echo "system" >&6; }
     ALLOC="SYS_ALLOC";
-    for ac_func in malloc realloc calloc free
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+
+
+
+
+for ac_func in malloc realloc calloc free
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+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 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 $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
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -10177,19 +11743,26 @@ done
 
 fi
 if test "$with_alloc" = "tcmalloc"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: tcmalloc" >&5
+    { $as_echo "$as_me:$LINENO: result: tcmalloc" >&5
 $as_echo "tcmalloc" >&6; }
     if ! echo $build_cpu | grep -E 'i[3456]86' 2>/dev/null >/dev/null; then
-        as_fn_error "tcmalloc only available/usable on ix86" "$LINENO" 5
+        { { $as_echo "$as_me:$LINENO: error: tcmalloc only available/usable on ix86" >&5
+$as_echo "$as_me: error: tcmalloc only available/usable on ix86" >&2;}
+   { (exit 1); exit 1; }; }
     fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for malloc in -ltcmalloc" >&5
+
+{ $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -10207,18 +11780,43 @@ return malloc ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_tcmalloc_malloc=yes
 else
-  ac_cv_lib_tcmalloc_malloc=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_tcmalloc_malloc=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tcmalloc_malloc" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tcmalloc_malloc" >&5
 $as_echo "$ac_cv_lib_tcmalloc_malloc" >&6; }
-if test "x$ac_cv_lib_tcmalloc_malloc" = x""yes; then :
+if test "x$ac_cv_lib_tcmalloc_malloc" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBTCMALLOC 1
 _ACEOF
@@ -10226,43 +11824,45 @@ _ACEOF
   LIBS="-ltcmalloc $LIBS"
 
 else
-  as_fn_error "tcmalloc not found or functional. Install the Google Profiling Tools" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: tcmalloc not found or functional. Install the Google Profiling Tools" >&5
+$as_echo "$as_me: error: tcmalloc not found or functional. Install the Google Profiling Tools" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
     ALLOC="TCMALLOC";
 fi
 if test "$with_alloc" = "internal" -o -z "$with_alloc"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+   { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
 fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to add custom build version" >&5
+{ $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, $BUILD_VER_STRING" >&5
+   { $as_echo "$as_me:$LINENO: result: yes, $BUILD_VER_STRING" >&5
 $as_echo "yes, $BUILD_VER_STRING" >&6; }
 else
    BUILD_VER_STRING=
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with Java support" >&5
+{ $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
    SOLAR_JAVA="TRUE"
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
    SOLAR_JAVA=""
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: building without java will mean some features will not be available" >&5
+   { $as_echo "$as_me:$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
@@ -10290,9 +11890,9 @@ if test "$SOLAR_JAVA" != ""; then
    if test -z "$with_jdk_home"; then
       # Extract the first word of "$WITH_JAVA", so it can be a program name with args.
 set dummy $WITH_JAVA; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_JAVAINTERPRETER+set}" = set; then :
+if test "${ac_cv_path_JAVAINTERPRETER+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $JAVAINTERPRETER in
@@ -10305,14 +11905,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -10320,10 +11920,10 @@ esac
 fi
 JAVAINTERPRETER=$ac_cv_path_JAVAINTERPRETER
 if test -n "$JAVAINTERPRETER"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAINTERPRETER" >&5
+  { $as_echo "$as_me:$LINENO: result: $JAVAINTERPRETER" >&5
 $as_echo "$JAVAINTERPRETER" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -10333,7 +11933,9 @@ fi
             if test -x "$_java_path"; then
          JAVAINTERPRETER=$_java_path
       else
-         as_fn_error "$_java_path not found set with_jdk_home" "$LINENO" 5
+         { { $as_echo "$as_me:$LINENO: error: $_java_path not found set with_jdk_home" >&5
+$as_echo "$as_me: error: $_java_path not found set with_jdk_home" >&2;}
+   { (exit 1); exit 1; }; }
       fi
    fi
    if test "$_os" = "WINNT"; then
@@ -10343,14 +11945,14 @@ fi
       JAVAINTERPRETER=`cygpath -d "$JAVAINTERPRETER"`
       JAVAINTERPRETER=`cygpath -u "$JAVAINTERPRETER"`
    elif test "$_os" = "Darwin"; then
-                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to pass -d32 to Java interpreter" >&5
+                        { $as_echo "$as_me:$LINENO: checking whether to pass -d32 to Java interpreter" >&5
 $as_echo_n "checking whether to pass -d32 to Java interpreter... " >&6; }
       if "$JAVAINTERPRETER" -d32 >&5 2>&5; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+         { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
          JAVAIFLAGS=-d32
       else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
       fi
    fi
@@ -10358,11 +11960,13 @@ fi
 
 if test "$SOLAR_JAVA" != ""; then
    _gij_longver=0
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking the installed JDK" >&5
+   { $as_echo "$as_me:$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
-         as_fn_error "No valid check available. Please check the block for your desired java in configure.in" "$LINENO" 5
+         { { $as_echo "$as_me:$LINENO: error: No valid check available. Please check the block for your desired java in configure.in" >&5
+$as_echo "$as_me: error: No valid check available. Please check the block for your desired java in configure.in" >&2;}
+   { (exit 1); exit 1; }; }
 #        dnl Kaffe specific tests
 #        KAFFE_VER=`$JAVAINTERPRETER -version 2>&1 | $EGREP "  Version:" | $SED -r "s/.*  Version: ([[0-9\.]]*).*/\1/"`
 #        if test -z "$KAFFE_VER"; then
@@ -10382,13 +11986,15 @@ $as_echo_n "checking the installed JDK... " >&6; }
 #        JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"`
       elif test `$JAVAINTERPRETER --version 2>&1 | grep -c "GNU libgcj"` -gt 0; then
         JDK=gcj
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (gcj)" >&5
+        { $as_echo "$as_me:$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
-         as_fn_error "No valid check available. Please check the block for your desired java in configure.in" "$LINENO" 5
+         { { $as_echo "$as_me:$LINENO: error: No valid check available. Please check the block for your desired java in configure.in" >&5
+$as_echo "$as_me: error: No valid check available. Please check the block for your desired java in configure.in" >&2;}
+   { (exit 1); exit 1; }; }
 #        JDK=bea
 #
 #        dnl BEA JDK specific tests
@@ -10418,15 +12024,20 @@ $as_echo "checked (gcj)" >&6; }
         _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
 
         if test "$_jdk_ver" -lt 10500; then
-             as_fn_error "IBM JDK is too old, you need at least 1.5" "$LINENO" 5
+             { { $as_echo "$as_me:$LINENO: error: IBM JDK is too old, you need at least 1.5" >&5
+$as_echo "$as_me: error: IBM JDK is too old, you need at least 1.5" >&2;}
+   { (exit 1); exit 1; }; }
         fi
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (IBM JDK $_jdk)" >&5
+        { $as_echo "$as_me:$LINENO: result: checked (IBM JDK $_jdk)" >&5
 $as_echo "checked (IBM JDK $_jdk)" >&6; }
 
         if test "$with_jdk_home" = ""; then
-             as_fn_error "In order to successfully build OpenOffice.org using the IBM JDK,
-you must use the \"--with-jdk-home\" configure option explicitly" "$LINENO" 5
+             { { $as_echo "$as_me:$LINENO: error: In order to successfully build OpenOffice.org using the IBM JDK,
+you must use the \"--with-jdk-home\" configure option explicitly" >&5
+$as_echo "$as_me: error: In order to successfully build OpenOffice.org using the IBM JDK,
+you must use the \"--with-jdk-home\" configure option explicitly" >&2;}
+   { (exit 1); exit 1; }; }
         fi
 
         JAVA_HOME=$with_jdk_home
@@ -10438,9 +12049,11 @@ you must use the \"--with-jdk-home\" configure option explicitly" "$LINENO" 5
         _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
 
         if test "$_jdk_ver" -lt 10500; then
-             as_fn_error "JDK is too old, you need at least 1.5" "$LINENO" 5
+             { { $as_echo "$as_me:$LINENO: error: JDK is too old, you need at least 1.5" >&5
+$as_echo "$as_me: error: JDK is too old, you need at least 1.5" >&2;}
+   { (exit 1); exit 1; }; }
         fi
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (JDK $_jdk)" >&5
+        { $as_echo "$as_me:$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
@@ -10451,7 +12064,9 @@ $as_echo "checked (JDK $_jdk)" >&6; }
         fi
       fi
    else
-      as_fn_error "JAVA not found. You need at least jdk-1.5, or gcj-4" "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: JAVA not found. You need at least jdk-1.5, or gcj-4" >&5
+$as_echo "$as_me: error: JAVA not found. You need at least jdk-1.5, or gcj-4" >&2;}
+   { (exit 1); exit 1; }; }
    fi
 else
       JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME
@@ -10471,9 +12086,9 @@ if test "$SOLAR_JAVA" != ""; then
     if test -z "$with_jdk_home"; then
         # Extract the first word of "$javacompiler", so it can be a program name with args.
 set dummy $javacompiler; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_JAVACOMPILER+set}" = set; then :
+if test "${ac_cv_path_JAVACOMPILER+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $JAVACOMPILER in
@@ -10486,14 +12101,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -10501,10 +12116,10 @@ esac
 fi
 JAVACOMPILER=$ac_cv_path_JAVACOMPILER
 if test -n "$JAVACOMPILER"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVACOMPILER" >&5
+  { $as_echo "$as_me:$LINENO: result: $JAVACOMPILER" >&5
 $as_echo "$JAVACOMPILER" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -10516,7 +12131,9 @@ fi
         fi
     fi
     if test -z "$JAVACOMPILER"; then
-      as_fn_error "$javacompiler not found set with_jdk_home" "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: $javacompiler not found set with_jdk_home" >&5
+$as_echo "$as_me: error: $javacompiler not found set with_jdk_home" >&2;}
+   { (exit 1); exit 1; }; }
     fi
     if test "$_os" = "WINNT"; then
        if test x`echo "$JAVACOMPILER" | grep -i '\.exe$'` = x; then
@@ -10532,10 +12149,10 @@ fi
     fi
 
     if test `$JAVACOMPILER -version 2>&1 | grep -c "Eclipse Java Compiler"` -gt 0; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking re-checking JDK" >&5
+        { $as_echo "$as_me:$LINENO: checking re-checking JDK" >&5
 $as_echo_n "checking re-checking JDK... " >&6; }
         JDK=gcj
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (ecj)" >&5
+        { $as_echo "$as_me:$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"
@@ -10555,9 +12172,9 @@ if test "$SOLAR_JAVA" != ""; then
     if test -z "$with_jdk_home"; then
         # Extract the first word of "javadoc", so it can be a program name with args.
 set dummy javadoc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_JAVADOC+set}" = set; then :
+if test "${ac_cv_path_JAVADOC+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $JAVADOC in
@@ -10570,14 +12187,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -10585,10 +12202,10 @@ esac
 fi
 JAVADOC=$ac_cv_path_JAVADOC
 if test -n "$JAVADOC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVADOC" >&5
+  { $as_echo "$as_me:$LINENO: result: $JAVADOC" >&5
 $as_echo "$JAVADOC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -10605,9 +12222,9 @@ fi
         else
             # Extract the first word of "javadoc", so it can be a program name with args.
 set dummy javadoc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_JAVADOC+set}" = set; then :
+if test "${ac_cv_path_JAVADOC+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $JAVADOC in
@@ -10620,14 +12237,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -10635,10 +12252,10 @@ esac
 fi
 JAVADOC=$ac_cv_path_JAVADOC
 if test -n "$JAVADOC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVADOC" >&5
+  { $as_echo "$as_me:$LINENO: result: $JAVADOC" >&5
 $as_echo "$JAVADOC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -10646,7 +12263,9 @@ fi
         fi
     fi
     if test -z "$JAVADOC"; then
-      as_fn_error "$_javadoc_path not found set with_jdk_home" "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: $_javadoc_path not found set with_jdk_home" >&5
+$as_echo "$as_me: error: $_javadoc_path not found set with_jdk_home" >&2;}
+   { (exit 1); exit 1; }; }
     fi
     if test "$_os" = "WINNT"; then
         if test x`echo "$JAVADOC" | grep -i '\.exe$'` = x; then
@@ -10678,33 +12297,37 @@ class findhome
     }
 }
 _ACEOF
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if javac works" >&5
+        { $as_echo "$as_me:$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\":${as_lineno-$LINENO}: \"$javac_cmd\""; } >&5
+        { (eval echo "$as_me:$LINENO: \"$javac_cmd\"") >&5
   (eval $javac_cmd) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
         if test $? = 0 && test -f ./findhome.class ; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: javac works" >&5
+          { $as_echo "$as_me:$LINENO: result: javac works" >&5
 $as_echo "javac works" >&6; }
         else
           echo "configure: javac test failed" >&5
           cat findhome.java >&5
-          as_fn_error "javac does not work - java projects will not build!" "$LINENO" 5
+          { { $as_echo "$as_me:$LINENO: error: javac does not work - java projects will not build!" >&5
+$as_echo "$as_me: error: javac does not work - java projects will not build!" >&2;}
+   { (exit 1); exit 1; }; }
         fi
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gij knows its java.home" >&5
+        { $as_echo "$as_me:$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
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVA_HOME" >&5
+          { $as_echo "$as_me:$LINENO: result: $JAVA_HOME" >&5
 $as_echo "$JAVA_HOME" >&6; }
         else
           echo "configure: java test failed" >&5
           cat findhome.java >&5
-          as_fn_error "gij does not know its java.home - use --with-jdk-home" "$LINENO" 5
+          { { $as_echo "$as_me:$LINENO: error: gij does not know its java.home - use --with-jdk-home" >&5
+$as_echo "$as_me: error: gij does not know its java.home - use --with-jdk-home" >&2;}
+   { (exit 1); exit 1; }; }
         fi
       else
         JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*$WITH_JAVA,,p"`
@@ -10726,9 +12349,9 @@ $as_echo "$JAVA_HOME" >&6; }
             JAVA_HOME=$(readlink $JAVACOMPILER)
          else
           # else warn
-          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&5
+          { $as_echo "$as_me:$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:$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
@@ -10751,11 +12374,11 @@ $as_echo "$as_me: WARNING: if this is the case, please inform the correct JAVA_H
          JAVA_HOME_OK="NO"
       fi
       if test "$JAVA_HOME_OK" = "NO"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >&5
+         { $as_echo "$as_me:$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:$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:$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
@@ -10769,7 +12392,7 @@ fi
 
 AWTLIB=
 if test "$SOLAR_JAVA" != ""; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jawt lib name" >&5
+   { $as_echo "$as_me:$LINENO: checking for jawt lib name" >&5
 $as_echo_n "checking for jawt lib name... " >&6; }
    if test "$JDK" = "gcj"; then
       save_CFLAGS=$CFLAGS
@@ -10777,22 +12400,154 @@ $as_echo_n "checking for jawt lib name... " >&6; }
       CFLAGS="$CFLAGS -I$JAVA_HOME/include"
       LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
       exec 6>/dev/null # no output
-      ac_fn_c_check_header_mongrel "$LINENO" "jni.h" "ac_cv_header_jni_h" "$ac_includes_default"
-if test "x$ac_cv_header_jni_h" = x""yes; then :
+      if test "${ac_cv_header_jni_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for jni.h" >&5
+$as_echo_n "checking for jni.h... " >&6; }
+if test "${ac_cv_header_jni_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5
+$as_echo "$ac_cv_header_jni_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking jni.h usability" >&5
+$as_echo_n "checking jni.h usability... " >&6; }
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking jni.h presence" >&5
+$as_echo_n "checking jni.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <jni.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: jni.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: jni.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: jni.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jni.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: jni.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jni.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: jni.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jni.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: jni.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jni.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: jni.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for jni.h" >&5
+$as_echo_n "checking for jni.h... " >&6; }
+if test "${ac_cv_header_jni_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_jni_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5
+$as_echo "$ac_cv_header_jni_h" >&6; }
 
+fi
+if test "x$ac_cv_header_jni_h" = x""yes; then
+  :
 else
-  as_fn_error "jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?" >&5
+$as_echo "$as_me: error: jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JAWT_GetAWT in -lgcjawt" >&5
+      { $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -10810,18 +12565,43 @@ return JAWT_GetAWT ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_gcjawt_JAWT_GetAWT=yes
 else
-  ac_cv_lib_gcjawt_JAWT_GetAWT=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_gcjawt_JAWT_GetAWT=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gcjawt_JAWT_GetAWT" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gcjawt_JAWT_GetAWT" >&5
 $as_echo "$ac_cv_lib_gcjawt_JAWT_GetAWT" >&6; }
-if test "x$ac_cv_lib_gcjawt_JAWT_GetAWT" = x""yes; then :
+if test "x$ac_cv_lib_gcjawt_JAWT_GetAWT" = x""yes; then
    AWTLIB="-lgcjawt -lgcj"
 fi
 
@@ -10840,22 +12620,154 @@ fi
       LD_LIBRARY_PATH=$JAVA_HOME/jre/bin:$JAVA_HOME/jre/bin/classic:$JAVA_HOME/jre/bin/xawt:$LD_LIBRARY_PATH
       export LD_LIBRARY_PATH
       exec 6>/dev/null # no output
-      ac_fn_c_check_header_mongrel "$LINENO" "jni.h" "ac_cv_header_jni_h" "$ac_includes_default"
-if test "x$ac_cv_header_jni_h" = x""yes; then :
+      if test "${ac_cv_header_jni_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for jni.h" >&5
+$as_echo_n "checking for jni.h... " >&6; }
+if test "${ac_cv_header_jni_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5
+$as_echo "$ac_cv_header_jni_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking jni.h usability" >&5
+$as_echo_n "checking jni.h usability... " >&6; }
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking jni.h presence" >&5
+$as_echo_n "checking jni.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <jni.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
 else
-  as_fn_error "jni.h could not be found." "$LINENO" 5
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
 fi
 
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JAWT_GetAWT in -ljawt" >&5
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: jni.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: jni.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: jni.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jni.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: jni.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jni.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: jni.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jni.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: jni.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jni.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: jni.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for jni.h" >&5
+$as_echo_n "checking for jni.h... " >&6; }
+if test "${ac_cv_header_jni_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_jni_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5
+$as_echo "$ac_cv_header_jni_h" >&6; }
+
+fi
+if test "x$ac_cv_header_jni_h" = x""yes; then
+  :
+else
+  { { $as_echo "$as_me:$LINENO: error: jni.h could not be found." >&5
+$as_echo "$as_me: error: jni.h could not be found." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+      { $as_echo "$as_me:$LINENO: checking for JAWT_GetAWT in -ljawt" >&5
 $as_echo_n "checking for JAWT_GetAWT in -ljawt... " >&6; }
-if test "${ac_cv_lib_jawt_JAWT_GetAWT+set}" = set; then :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -10873,31 +12785,60 @@ return JAWT_GetAWT ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_jawt_JAWT_GetAWT=yes
 else
-  ac_cv_lib_jawt_JAWT_GetAWT=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_jawt_JAWT_GetAWT=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jawt_JAWT_GetAWT" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jawt_JAWT_GetAWT" >&5
 $as_echo "$ac_cv_lib_jawt_JAWT_GetAWT" >&6; }
-if test "x$ac_cv_lib_jawt_JAWT_GetAWT" = x""yes; then :
+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"
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JAWT_GetAWT in -lmawt" >&5
+         { $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -10915,18 +12856,43 @@ return JAWT_GetAWT ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_mawt_JAWT_GetAWT=yes
 else
-  ac_cv_lib_mawt_JAWT_GetAWT=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_mawt_JAWT_GetAWT=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mawt_JAWT_GetAWT" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mawt_JAWT_GetAWT" >&5
 $as_echo "$ac_cv_lib_mawt_JAWT_GetAWT" >&6; }
-if test "x$ac_cv_lib_mawt_JAWT_GetAWT" = x""yes; then :
+if test "x$ac_cv_lib_mawt_JAWT_GetAWT" = x""yes; then
    AWTLIB="-L$JAVA_HOME/jre/bin/xawt -ljawt -lmawt"
 fi
 
@@ -10939,23 +12905,23 @@ fi
    if test -z "$AWTLIB"; then
       AWTLIB=-ljawt
    fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWTLIB" >&5
+   { $as_echo "$as_me:$LINENO: result: $AWTLIB" >&5
 $as_echo "$AWTLIB" >&6; }
 
 fi
 
 if test "$SOLAR_JAVA" != ""; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable gcj aot compilation" >&5
+  { $as_echo "$as_me:$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
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+     { $as_echo "$as_me:$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
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcjaot" >&5
+     { $as_echo "$as_me:$LINENO: result: $gcjaot" >&5
 $as_echo "$gcjaot" >&6; }
      if test -n "$with_jdk_home"; then
         _javac_path="$with_jdk_home/bin/$gcjaot"
@@ -10966,9 +12932,9 @@ $as_echo "$gcjaot" >&6; }
      if test -z "$JAVAAOTCOMPILER"; then
         # Extract the first word of "$gcjaot", so it can be a program name with args.
 set dummy $gcjaot; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_JAVAAOTCOMPILER+set}" = set; then :
+if test "${ac_cv_path_JAVAAOTCOMPILER+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $JAVAAOTCOMPILER in
@@ -10981,14 +12947,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -10996,21 +12962,21 @@ esac
 fi
 JAVAAOTCOMPILER=$ac_cv_path_JAVAAOTCOMPILER
 if test -n "$JAVAAOTCOMPILER"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAAOTCOMPILER" >&5
+  { $as_echo "$as_me:$LINENO: result: $JAVAAOTCOMPILER" >&5
 $as_echo "$JAVAAOTCOMPILER" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
      fi
      if test -z "$JAVAAOTCOMPILER"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $gcjaot not found, set with_jdk_home" >&5
+        { $as_echo "$as_me:$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
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
   fi
 fi
@@ -11028,9 +12994,9 @@ fi
 
 # Extract the first word of "dmake", so it can be a program name with args.
 set dummy dmake; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_DMAKE+set}" = set; then :
+if test "${ac_cv_path_DMAKE+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $DMAKE in
@@ -11043,14 +13009,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -11059,10 +13025,10 @@ esac
 fi
 DMAKE=$ac_cv_path_DMAKE
 if test -n "$DMAKE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DMAKE" >&5
+  { $as_echo "$as_me:$LINENO: result: $DMAKE" >&5
 $as_echo "$DMAKE" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -11071,7 +13037,7 @@ if test "$DMAKE" = "no"; then
     BUILD_DMAKE=YES
     echo "dmake will be built on ./bootstrap"
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the found dmake is the right dmake" >&5
+    { $as_echo "$as_me:$LINENO: checking whether the found dmake is the right dmake" >&5
 $as_echo_n "checking whether the found dmake is the right dmake... " >&6; }
     # we need to find out whether that dmake we found is "our" dmake
     # or the dmake from Sun's SunStudio Compiler which is something
@@ -11081,26 +13047,26 @@ $as_echo_n "checking whether the found dmake is the right dmake... " >&6; }
     $DMAKE -V 2>/dev/null | grep 'dmake .* Version .*' >/dev/null
     if test $? -eq 0; then
        BUILD_DMAKE=NO
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+       { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking the dmake version" >&5
+       { $as_echo "$as_me:$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
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK, >= 4.11" >&5
+	 { $as_echo "$as_me:$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
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK, >= 4.11" >&5
+	 { $as_echo "$as_me:$LINENO: result: OK, >= 4.11" >&5
 $as_echo "OK, >= 4.11" >&6; }
        else
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: too old. >= 4.11 is needed" >&5
+	 { $as_echo "$as_me:$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
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+       { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
        echo "dmake will be built on ./bootstrap"
        BUILD_DMAKE=YES
@@ -11108,10 +13074,10 @@ $as_echo "no" >&6; }
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable EPM for packing" >&5
+{ $as_echo "$as_me:$LINENO: checking whether to enable EPM for packing" >&5
 $as_echo_n "checking whether to enable EPM for packing... " >&6; }
 if test "$enable_epm" = "yes"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             if test "$_os" != "WINNT"; then
       if test -n "$with_epm"; then
@@ -11119,9 +13085,9 @@ $as_echo "yes" >&6; }
       else
          # Extract the first word of "epm", so it can be a program name with args.
 set dummy epm; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_EPM+set}" = set; then :
+if test "${ac_cv_path_EPM+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $EPM in
@@ -11134,14 +13100,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -11150,10 +13116,10 @@ esac
 fi
 EPM=$ac_cv_path_EPM
 if test -n "$EPM"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EPM" >&5
+  { $as_echo "$as_me:$LINENO: result: $EPM" >&5
 $as_echo "$EPM" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -11165,37 +13131,43 @@ fi
          BUILD_TYPE="$BUILD_TYPE EPM"
       else
          # Gentoo has some epm which is something different...
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the found epm is the right epm" >&5
+         { $as_echo "$as_me:$LINENO: checking whether the found epm is the right epm" >&5
 $as_echo_n "checking whether the found epm is the right epm... " >&6; }
          if $EPM | grep "ESP Package Manager" >/dev/null 2>/dev/null; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
          else
-            as_fn_error "no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm" "$LINENO" 5
+            { { $as_echo "$as_me:$LINENO: error: no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm" >&5
+$as_echo "$as_me: error: no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm" >&2;}
+   { (exit 1); exit 1; }; }
          fi
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking epm version" >&5
+         { $as_echo "$as_me:$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
-           { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK, >= 3.7" >&5
+           { $as_echo "$as_me:$LINENO: result: OK, >= 3.7" >&5
 $as_echo "OK, >= 3.7" >&6; }
            BUILD_EPM=NO
 	        if test "$_os" = "Darwin"; then
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking which PackageMaker EPM thinks to use" >&5
+               { $as_echo "$as_me:$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
-          		      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
+          		      { { $as_echo "$as_me:$LINENO: error: $_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&5
+$as_echo "$as_me: error: $_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&2;}
+   { (exit 1); exit 1; }; }
         	      elif test "$_pm" = "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"; then
-          		    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_pm, ok" >&5
+          		    { $as_echo "$as_me:$LINENO: result: $_pm, ok" >&5
 $as_echo "$_pm, ok" >&6; }
         	      else # we never should get here, but go safe
-			          as_fn_error "$_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" "$LINENO" 5
+			          { { $as_echo "$as_me:$LINENO: error: $_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&5
+$as_echo "$as_me: error: $_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&2;}
+   { (exit 1); exit 1; }; }
 		          fi
 	       fi
 	 else
-           { $as_echo "$as_me:${as_lineno-$LINENO}: result: too old. epm >= 3.7 is required." >&5
+           { $as_echo "$as_me:$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
@@ -11205,7 +13177,7 @@ $as_echo "too old. epm >= 3.7 is required." >&6; }
    fi
 
    # test which package format to use
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking which package format to use" >&5
+   { $as_echo "$as_me:$LINENO: checking which package format to use" >&5
 $as_echo_n "checking which package format to use... " >&6; }
 
    # defaults
@@ -11242,7 +13214,9 @@ $as_echo_n "checking which package format to use... " >&6; }
 	# we never should get here since we check the arciecture/os at the beginning,
 	# but go sure...
 	*)
-		as_fn_error "unknown system" "$LINENO" 5
+		{ { $as_echo "$as_me:$LINENO: error: unknown system" >&5
+$as_echo "$as_me: error: unknown system" >&2;}
+   { (exit 1); exit 1; }; }
    esac
    if test -n "$with_package_format"; then
 	for i in $with_package_format; do
@@ -11250,7 +13224,25 @@ $as_echo_n "checking which package format to use... " >&6; }
 			aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | portable | archive | dmg | installed | msi)
 			;;
 		*)
-			as_fn_error "unsupported format $i. Supported by EPM are:
+			{ { $as_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
+OOo additionally supports:
+archive - .tar.gz or .zip
+dmg - Mac OS X .dmg
+installed - installation tree
+msi - Windows .msi
+			" >&5
+$as_echo "$as_me: error: unsupported format $i. Supported by EPM are:
 aix - AIX software distribution
 bsd - FreeBSD, NetBSD, or OpenBSD software distribution
 depot or swinstall - HP-UX software distribution
@@ -11267,16 +13259,17 @@ archive - .tar.gz or .zip
 dmg - Mac OS X .dmg
 installed - installation tree
 msi - Windows .msi
-			" "$LINENO" 5
+			" >&2;}
+   { (exit 1); exit 1; }; }
 			;;
 		esac
 	done
 	PKGFORMAT="$with_package_format"
    fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGFORMAT" >&5
+   { $as_echo "$as_me:$LINENO: result: $PKGFORMAT" >&5
 $as_echo "$PKGFORMAT" >&6; }
    if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rpm" >&5
+      { $as_echo "$as_me:$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
@@ -11292,19 +13285,21 @@ $as_echo_n "checking for rpm... " >&6; }
          fi
        done
        if test -z "$RPM" ; then
-          as_fn_error "not found" "$LINENO" 5
+          { { $as_echo "$as_me:$LINENO: error: not found" >&5
+$as_echo "$as_me: error: not found" >&2;}
+   { (exit 1); exit 1; }; }
        else
 	  RPM_PATH=`which $RPM`
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RPM_PATH" >&5
+          { $as_echo "$as_me:$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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_DPKG+set}" = set; then :
+if test "${ac_cv_path_DPKG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $DPKG in
@@ -11317,14 +13312,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -11333,56 +13328,62 @@ esac
 fi
 DPKG=$ac_cv_path_DPKG
 if test -n "$DPKG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DPKG" >&5
+  { $as_echo "$as_me:$LINENO: result: $DPKG" >&5
 $as_echo "$DPKG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
       if test "$DPKG" = "no"; then
-         as_fn_error "dpkg needed for deb creation. Install dpkg." "$LINENO" 5
+         { { $as_echo "$as_me:$LINENO: error: dpkg needed for deb creation. Install dpkg." >&5
+$as_echo "$as_me: error: dpkg needed for deb creation. Install dpkg." >&2;}
+   { (exit 1); exit 1; }; }
       fi
    fi
    if echo "PKGFORMAT" | $EGREP osx 2>&1 >/dev/null; then
       if test "$_os" = "Darwin"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PackageMaker availability" >&5
+         { $as_echo "$as_me:$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
-            as_fn_error "not installed. Please install Apples Dev Tools" "$LINENO" 5
+            { { $as_echo "$as_me:$LINENO: error: not installed. Please install Apples Dev Tools" >&5
+$as_echo "$as_me: error: not installed. Please install Apples Dev Tools" >&2;}
+   { (exit 1); exit 1; }; }
          else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+            { $as_echo "$as_me:$LINENO: result: ok" >&5
 $as_echo "ok" >&6; }
          fi
       else
-         as_fn_error "PackageMaker needed to build OSX packages and you are not on OSX..." "$LINENO" 5
+         { { $as_echo "$as_me:$LINENO: error: PackageMaker needed to build OSX packages and you are not on OSX..." >&5
+$as_echo "$as_me: error: PackageMaker needed to build OSX packages and you are not on OSX..." >&2;}
+   { (exit 1); exit 1; }; }
        fi
    fi
    if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null || \
       echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
       	if test "$EPM" != "no" && test "$EPM" != "internal"; then
            if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether epm is patched for OOos needs" >&5
+               { $as_echo "$as_me:$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
-                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+                  { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
                else
-                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+                  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
                   if echo "$PKGFORMAT" | grep -q rpm; then
                       _pt="rpm"
-                      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: the rpms will need to be installed with --nodeps" >&5
+                      { $as_echo "$as_me:$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
-                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: the ${_pt}s will not be relocateable" >&5
+                  { $as_echo "$as_me:$LINENO: WARNING: the ${_pt}s will not be relocateable" >&5
 $as_echo "$as_me: WARNING: the ${_pt}s will not be relocateable" >&2;}
                   echo "the ${_pt}s will not be relocateable" >> warn
-                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: if you want to make sure installation without --nodeps and
+                  { $as_echo "$as_me:$LINENO: WARNING: if you want to make sure installation without --nodeps and
                   relocation will work, you need to patch your epm with the
                   patch in epm/epm-3.7.patch or build with
                   --with-epm=internal which will build a suitable epm" >&5
@@ -11397,9 +13398,9 @@ $as_echo "$as_me: WARNING: if you want to make sure installation without --nodep
    if echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
       # Extract the first word of "pkgmk", so it can be a program name with args.
 set dummy pkgmk; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKGMK+set}" = set; then :
+if test "${ac_cv_path_PKGMK+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKGMK in
@@ -11412,14 +13413,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -11428,16 +13429,18 @@ esac
 fi
 PKGMK=$ac_cv_path_PKGMK
 if test -n "$PKGMK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGMK" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKGMK" >&5
 $as_echo "$PKGMK" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
       if test "$PKGMK" = "no"; then
-         as_fn_error "pkgmk needed for Solaris pkg creation. Install it." "$LINENO" 5
+         { { $as_echo "$as_me:$LINENO: error: pkgmk needed for Solaris pkg creation. Install it." >&5
+$as_echo "$as_me: error: pkgmk needed for Solaris pkg creation. Install it." >&2;}
+   { (exit 1); exit 1; }; }
       fi
    fi
 
@@ -11446,7 +13449,7 @@ fi
 
 
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
    EPM=NO
 fi
@@ -11454,9 +13457,9 @@ fi
 
 # Extract the first word of "gperf", so it can be a program name with args.
 set dummy gperf; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GPERF+set}" = set; then :
+if test "${ac_cv_path_GPERF+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $GPERF in
@@ -11469,14 +13472,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -11484,33 +13487,37 @@ esac
 fi
 GPERF=$ac_cv_path_GPERF
 if test -n "$GPERF"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPERF" >&5
+  { $as_echo "$as_me:$LINENO: result: $GPERF" >&5
 $as_echo "$GPERF" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 if test -z "$GPERF"; then
-	as_fn_error "gperf not found but needed. Install it." "$LINENO" 5
+	{ { $as_echo "$as_me:$LINENO: error: gperf not found but needed. Install it." >&5
+$as_echo "$as_me: error: gperf not found but needed. Install it." >&2;}
+   { (exit 1); exit 1; }; }
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gperf version" >&5
+{ $as_echo "$as_me:$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
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
+	{ $as_echo "$as_me:$LINENO: result: OK" >&5
 $as_echo "OK" >&6; }
 else
-	as_fn_error "too old, you need at least 3.0.0" "$LINENO" 5
+	{ { $as_echo "$as_me:$LINENO: error: too old, you need at least 3.0.0" >&5
+$as_echo "$as_me: error: too old, you need at least 3.0.0" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the ODK" >&5
+{ $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
    if test "$WITH_JAVA" != "no"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for external/unowinreg/unowinreg.dll" >&5
+   { $as_echo "$as_me:$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
@@ -11518,25 +13525,30 @@ $as_echo_n "checking for external/unowinreg/unowinreg.dll... " >&6; }
       HAVE_UNOWINREG_DLL=yes
    fi
    if test "$HAVE_UNOWINREG_DLL" = "yes"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+      { $as_echo "$as_me:$LINENO: result: found" >&5
 $as_echo "found" >&6; }
       BUILD_UNOWINREG=NO
    else
       if test "$_os" = "WINNT"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found, will be built" >&5
+         { $as_echo "$as_me:$LINENO: result: not found, will be built" >&5
 $as_echo "not found, will be built" >&6; }
       else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: not found, will be cross-built using mingw32" >&5
+         { $as_echo "$as_me:$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
-         as_fn_error "for rebuilding unowinreg.dll you need the mingw32 C++ compiler.
+         { { $as_echo "$as_me:$LINENO: error: for rebuilding unowinreg.dll you need the mingw32 C++ compiler.
+         Specify mingw32 g++ executable name with --with-mingwin.
+         Or use prebuilt one from http://tools.openoffice.org/unowinreg_prebuild/680/ and
+         put it into external/unowinreg" >&5
+$as_echo "$as_me: error: for rebuilding unowinreg.dll you need the mingw32 C++ compiler.
          Specify mingw32 g++ executable name with --with-mingwin.
          Or use prebuilt one from http://tools.openoffice.org/unowinreg_prebuild/680/ and
-         put it into external/unowinreg" "$LINENO" 5
+         put it into external/unowinreg" >&2;}
+   { (exit 1); exit 1; }; }
       fi
       if echo "$WITH_MINGWIN" | $EGREP -q "/"; then
          if ! test -x "$WITH_MINGWIN"; then MINGWCXX=false; else MINGWCXX=`basename $WITH_MINGWIN`; fi
@@ -11544,9 +13556,9 @@ $as_echo "$as_me: WARNING: not found, will be cross-built using mingw32" >&2;}
          if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}$WITH_MINGWIN", so it can be a program name with args.
 set dummy ${ac_tool_prefix}$WITH_MINGWIN; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_MINGWCXX+set}" = set; then :
+if test "${ac_cv_prog_MINGWCXX+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$MINGWCXX"; then
@@ -11557,24 +13569,24 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MINGWCXX" >&5
+  { $as_echo "$as_me:$LINENO: result: $MINGWCXX" >&5
 $as_echo "$MINGWCXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -11584,9 +13596,9 @@ if test -z "$ac_cv_prog_MINGWCXX"; then
   ac_ct_MINGWCXX=$MINGWCXX
   # Extract the first word of "$WITH_MINGWIN", so it can be a program name with args.
 set dummy $WITH_MINGWIN; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$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 :
+if test "${ac_cv_prog_ac_ct_MINGWCXX+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_MINGWCXX"; then
@@ -11597,24 +13609,24 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_MINGWCXX=$ac_cv_prog_ac_ct_MINGWCXX
 if test -n "$ac_ct_MINGWCXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MINGWCXX" >&5
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_MINGWCXX" >&5
 $as_echo "$ac_ct_MINGWCXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -11623,7 +13635,7 @@ fi
   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:$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
@@ -11635,14 +13647,18 @@ fi
 
       fi
       if test "$MINGWCXX" = "false"; then
-         as_fn_error "specified MinGW32 C++ cross-compiler not found. Install it or correct name." "$LINENO" 5
+         { { $as_echo "$as_me:$LINENO: error: specified MinGW32 C++ cross-compiler not found. Install it or correct name." >&5
+$as_echo "$as_me: error: specified MinGW32 C++ cross-compiler not found. Install it or correct name." >&2;}
+   { (exit 1); exit 1; }; }
       fi
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the MinGW32 cross C++ compiler" >&5
+      { $as_echo "$as_me:$LINENO: checking whether we are using the MinGW32 cross C++ compiler" >&5
 $as_echo_n "checking whether we are using the MinGW32 cross C++ compiler... " >&6; }
       if ! echo "`$MINGWCXX -dumpmachine`" | grep -q mingw32; then
-         as_fn_error "no" "$LINENO" 5
+         { { $as_echo "$as_me:$LINENO: error: no" >&5
+$as_echo "$as_me: error: no" >&2;}
+   { (exit 1); exit 1; }; }
       else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+         { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
       fi
       if echo "$WITH_MINGWIN" | $EGREP -q "/"; then
@@ -11651,9 +13667,9 @@ $as_echo "yes" >&6; }
          if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/`", so it can be a program name with args.
 set dummy ${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/`; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_MINGWSTRIP+set}" = set; then :
+if test "${ac_cv_prog_MINGWSTRIP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$MINGWSTRIP"; then
@@ -11664,24 +13680,24 @@ 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
+  for ac_exec_ext in '' $ac_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/`"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MINGWSTRIP" >&5
+  { $as_echo "$as_me:$LINENO: result: $MINGWSTRIP" >&5
 $as_echo "$MINGWSTRIP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -11691,9 +13707,9 @@ if test -z "$ac_cv_prog_MINGWSTRIP"; then
   ac_ct_MINGWSTRIP=$MINGWSTRIP
   # Extract the first word of "`echo $WITH_MINGWIN | $SED -e s/g++/strip/`", so it can be a program name with args.
 set dummy `echo $WITH_MINGWIN | $SED -e s/g++/strip/`; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$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 :
+if test "${ac_cv_prog_ac_ct_MINGWSTRIP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_MINGWSTRIP"; then
@@ -11704,24 +13720,24 @@ 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
+  for ac_exec_ext in '' $ac_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/`"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_MINGWSTRIP=$ac_cv_prog_ac_ct_MINGWSTRIP
 if test -n "$ac_ct_MINGWSTRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MINGWSTRIP" >&5
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_MINGWSTRIP" >&5
 $as_echo "$ac_ct_MINGWSTRIP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -11730,7 +13746,7 @@ fi
   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:$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
@@ -11742,7 +13758,9 @@ fi
 
       fi
       if test "$MINGWSTRIP" = "false"; then
-         as_fn_error "MinGW32 binutils needed. Install them." "$LINENO" 5
+         { { $as_echo "$as_me:$LINENO: error: MinGW32 binutils needed. Install them." >&5
+$as_echo "$as_me: error: MinGW32 binutils needed. Install them." >&2;}
+   { (exit 1); exit 1; }; }
       fi
       ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -11762,14 +13780,19 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
       # do not make sense here (and 'd make the check fail)
       save_LIBS=$LIBS
       LIBS=""
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lkernel32" >&5
+
+{ $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 
@@ -11781,18 +13804,43 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_kernel32_main=yes
 else
-  ac_cv_lib_kernel32_main=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_kernel32_main=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kernel32_main" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kernel32_main" >&5
 $as_echo "$ac_cv_lib_kernel32_main" >&6; }
-if test "x$ac_cv_lib_kernel32_main" = x""yes; then :
+if test "x$ac_cv_lib_kernel32_main" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBKERNEL32 1
 _ACEOF
@@ -11802,14 +13850,19 @@ _ACEOF
 fi
 ac_cv_lib_kernel32=ac_cv_lib_kernel32_main
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ladvapi32" >&5
+
+{ $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 
@@ -11821,18 +13874,43 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_advapi32_main=yes
 else
-  ac_cv_lib_advapi32_main=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_advapi32_main=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_advapi32_main" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_advapi32_main" >&5
 $as_echo "$ac_cv_lib_advapi32_main" >&6; }
-if test "x$ac_cv_lib_advapi32_main" = x""yes; then :
+if test "x$ac_cv_lib_advapi32_main" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBADVAPI32 1
 _ACEOF
@@ -11842,11 +13920,139 @@ _ACEOF
 fi
 ac_cv_lib_advapi32=ac_cv_lib_advapi32_main
 
-      ac_fn_cxx_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default"
-if test "x$ac_cv_header_windows_h" = x""yes; then :
+      if test "${ac_cv_header_windows_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for windows.h" >&5
+$as_echo_n "checking for windows.h... " >&6; }
+if test "${ac_cv_header_windows_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5
+$as_echo "$ac_cv_header_windows_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking windows.h usability" >&5
+$as_echo_n "checking windows.h usability... " >&6; }
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking windows.h presence" >&5
+$as_echo_n "checking windows.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <windows.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
 else
-  as_fn_error "windows.h missing" "$LINENO" 5
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: windows.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: windows.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: windows.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: windows.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: windows.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: windows.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: windows.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: windows.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: windows.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: windows.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: windows.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: windows.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: windows.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: windows.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for windows.h" >&5
+$as_echo_n "checking for windows.h... " >&6; }
+if test "${ac_cv_header_windows_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_windows_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5
+$as_echo "$ac_cv_header_windows_h" >&6; }
+
+fi
+if test "x$ac_cv_header_windows_h" = x""yes; then
+  :
+else
+  { { $as_echo "$as_me:$LINENO: error: windows.h missing" >&5
+$as_echo "$as_me: error: windows.h missing" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
@@ -11865,7 +14071,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
    fi
    BUILD_TYPE="$BUILD_TYPE ODK"
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
    BUILD_UNOWINREG=NO
 fi
@@ -11877,27 +14083,27 @@ if test "$_os" = "Linux" -a -z "$with_system_stdlibs" -a -z "$with_system_libs";
   if test -n "$checkforstdlibproblems"; then
     if test -f /etc/rpm/macros.prelink; then
       with_system_stdlibs=yes
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&5
+      { $as_echo "$as_me:$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
-      { $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:$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
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to provide libstdc++/libgcc_s in the installset" >&5
+{ $as_echo "$as_me:$LINENO: checking whether to provide libstdc++/libgcc_s in the installset" >&5
 $as_echo_n "checking whether to provide libstdc++/libgcc_s in the installset... " >&6; }
 if test -n "$with_system_stdlibs" -o -n "$with_system_libs" && \
    test "$with_system_stdlibs" != "no"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
    SYSTEM_STDLIBS=YES
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
    SYSTEM_STDLIBS=NO
 fi
@@ -11906,29 +14112,161 @@ fi
 if test "$_os" = "Darwin" && test "$with_system_zlib" != "no"; then
    with_system_zlib=yes
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which zlib to use" >&5
+{ $as_echo "$as_me:$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
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+    { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
     SYSTEM_ZLIB=YES
-    ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_zlib_h" = x""yes; then :
+    if test "${ac_cv_header_zlib_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for zlib.h" >&5
+$as_echo_n "checking for zlib.h... " >&6; }
+if test "${ac_cv_header_zlib_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+$as_echo "$ac_cv_header_zlib_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking zlib.h usability" >&5
+$as_echo_n "checking zlib.h usability... " >&6; }
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking zlib.h presence" >&5
+$as_echo_n "checking zlib.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <zlib.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: zlib.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for zlib.h" >&5
+$as_echo_n "checking for zlib.h... " >&6; }
+if test "${ac_cv_header_zlib_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_zlib_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+$as_echo "$ac_cv_header_zlib_h" >&6; }
+
+fi
+if test "x$ac_cv_header_zlib_h" = x""yes; then
+  :
 else
-  as_fn_error "zlib.h not found. install zlib" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: zlib.h not found. install zlib" >&5
+$as_echo "$as_me: error: zlib.h not found. install zlib" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5
+    { $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -11946,54 +14284,213 @@ return deflate ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_z_deflate=yes
 else
-  ac_cv_lib_z_deflate=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_z_deflate=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflate" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5
 $as_echo "$ac_cv_lib_z_deflate" >&6; }
-if test "x$ac_cv_lib_z_deflate" = x""yes; then :
+if test "x$ac_cv_lib_z_deflate" = x""yes; then
    ZLIB=-lz
 else
-  as_fn_error "zlib not found or functional" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: zlib not found or functional" >&5
+$as_echo "$as_me: error: zlib not found or functional" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+    { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
     SYSTEM_ZLIB=NO
     BUILD_TYPE="$BUILD_TYPE ZLIB"
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which jpeg to use" >&5
+{ $as_echo "$as_me:$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
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+    { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
     SYSTEM_JPEG=YES
-    ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default"
-if test "x$ac_cv_header_jpeglib_h" = x""yes; then :
+    if test "${ac_cv_header_jpeglib_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for jpeglib.h" >&5
+$as_echo_n "checking for jpeglib.h... " >&6; }
+if test "${ac_cv_header_jpeglib_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
+$as_echo "$ac_cv_header_jpeglib_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking jpeglib.h usability" >&5
+$as_echo_n "checking jpeglib.h usability... " >&6; }
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking jpeglib.h presence" >&5
+$as_echo_n "checking jpeglib.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <jpeglib.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: jpeglib.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: jpeglib.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: jpeglib.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: jpeglib.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: jpeglib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&2;}
 
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for jpeglib.h" >&5
+$as_echo_n "checking for jpeglib.h... " >&6; }
+if test "${ac_cv_header_jpeglib_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  as_fn_error "jpeg.h not found. install libjpeg" "$LINENO" 5
+  ac_cv_header_jpeglib_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
+$as_echo "$ac_cv_header_jpeglib_h" >&6; }
+
+fi
+if test "x$ac_cv_header_jpeglib_h" = x""yes; then
+  :
+else
+  { { $as_echo "$as_me:$LINENO: error: jpeg.h not found. install libjpeg" >&5
+$as_echo "$as_me: error: jpeg.h not found. install libjpeg" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_resync_to_restart in -ljpeg" >&5
+    { $as_echo "$as_me:$LINENO: checking for jpeg_resync_to_restart in -ljpeg" >&5
 $as_echo_n "checking for jpeg_resync_to_restart in -ljpeg... " >&6; }
-if test "${ac_cv_lib_jpeg_jpeg_resync_to_restart+set}" = set; then :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -12011,55 +14508,213 @@ return jpeg_resync_to_restart ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_jpeg_jpeg_resync_to_restart=yes
 else
-  ac_cv_lib_jpeg_jpeg_resync_to_restart=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_jpeg_jpeg_resync_to_restart=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_resync_to_restart" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_resync_to_restart" >&5
 $as_echo "$ac_cv_lib_jpeg_jpeg_resync_to_restart" >&6; }
-if test "x$ac_cv_lib_jpeg_jpeg_resync_to_restart" = x""yes; then :
+if test "x$ac_cv_lib_jpeg_jpeg_resync_to_restart" = x""yes; then
    JPEG3RDLIB=-ljpeg
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking jpeg library not found or fuctional" >&5
+  { $as_echo "$as_me:$LINENO: checking jpeg library not found or fuctional" >&5
 $as_echo_n "checking jpeg library not found or fuctional... " >&6; }
 fi
 
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+    { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
     SYSTEM_JPEG=NO
     BUILD_TYPE="$BUILD_TYPE JPEG"
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which expat to use" >&5
+{ $as_echo "$as_me:$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
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+    { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
     SYSTEM_EXPAT=YES
-    ac_fn_c_check_header_mongrel "$LINENO" "expat.h" "ac_cv_header_expat_h" "$ac_includes_default"
-if test "x$ac_cv_header_expat_h" = x""yes; then :
+    if test "${ac_cv_header_expat_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for expat.h" >&5
+$as_echo_n "checking for expat.h... " >&6; }
+if test "${ac_cv_header_expat_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
+$as_echo "$ac_cv_header_expat_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking expat.h usability" >&5
+$as_echo_n "checking expat.h usability... " >&6; }
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking expat.h presence" >&5
+$as_echo_n "checking expat.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <expat.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: expat.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: expat.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: expat.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: expat.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: expat.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: expat.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: expat.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: expat.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: expat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: expat.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: expat.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for expat.h" >&5
+$as_echo_n "checking for expat.h... " >&6; }
+if test "${ac_cv_header_expat_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_expat_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
+$as_echo "$ac_cv_header_expat_h" >&6; }
+
+fi
+if test "x$ac_cv_header_expat_h" = x""yes; then
+  :
 else
-  as_fn_error "expat.h not found. install expat" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: expat.h not found. install expat" >&5
+$as_echo "$as_me: error: expat.h not found. install expat" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML_ParserCreate in -lexpat" >&5
+
+{ $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -12077,18 +14732,43 @@ return XML_ParserCreate ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_expat_XML_ParserCreate=yes
 else
-  ac_cv_lib_expat_XML_ParserCreate=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_expat_XML_ParserCreate=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
 $as_echo "$ac_cv_lib_expat_XML_ParserCreate" >&6; }
-if test "x$ac_cv_lib_expat_XML_ParserCreate" = x""yes; then :
+if test "x$ac_cv_lib_expat_XML_ParserCreate" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBEXPAT 1
 _ACEOF
@@ -12096,23 +14776,23 @@ _ACEOF
   LIBS="-lexpat $LIBS"
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: expat library not found or functional." >&5
+  { $as_echo "$as_me:$LINENO: result: expat library not found or functional." >&5
 $as_echo "expat library not found or functional." >&6; }
 fi
 
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+    { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
     SYSTEM_EXPAT=NO
     BUILD_TYPE="$BUILD_TYPE EXPAT"
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libwpd to use" >&5
+{ $as_echo "$as_me:$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
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+    { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
     SYSTEM_LIBWPD=YES
 
@@ -12121,9 +14801,9 @@ $as_echo "external" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -12136,14 +14816,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -12152,10 +14832,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -12170,24 +14850,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libwpd-0.8 " >&5
+        { $as_echo "$as_me:$LINENO: checking for libwpd-0.8 " >&5
 $as_echo_n "checking for libwpd-0.8 ... " >&6; }
 
         if $PKG_CONFIG --exists "libwpd-0.8 " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBWPD_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking LIBWPD_CFLAGS" >&5
 $as_echo_n "checking LIBWPD_CFLAGS... " >&6; }
             LIBWPD_CFLAGS=`$PKG_CONFIG --cflags "libwpd-0.8 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBWPD_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $LIBWPD_CFLAGS" >&5
 $as_echo "$LIBWPD_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBWPD_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking LIBWPD_LIBS" >&5
 $as_echo_n "checking LIBWPD_LIBS... " >&6; }
             LIBWPD_LIBS=`$PKG_CONFIG --libs "libwpd-0.8 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBWPD_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $LIBWPD_LIBS" >&5
 $as_echo "$LIBWPD_LIBS" >&6; }
         else
             LIBWPD_CFLAGS=""
@@ -12209,11 +14889,13 @@ $as_echo "$LIBWPD_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error "Library requirements (libwpd-0.8 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     { { $as_echo "$as_me:$LINENO: error: Library requirements (libwpd-0.8 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+$as_echo "$as_me: error: Library requirements (libwpd-0.8 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
   fi
 
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+    { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
     SYSTEM_LIBWPD=NO
     BUILD_TYPE="$BUILD_TYPE LIBWPD"
@@ -12222,11 +14904,11 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which cppunit to use" >&5
+{ $as_echo "$as_me:$LINENO: checking which cppunit to use" >&5
 $as_echo_n "checking which cppunit to use... " >&6; }
 if test -n "$with_system_cppunit" -o -n "$with_system_libs" && \
         test "$with_system_cppunit" != "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+    { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
     SYSTEM_CPPUNIT=YES
     # might work for earlier, too but go sure. We didn't have
@@ -12238,9 +14920,9 @@ $as_echo "external" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -12253,14 +14935,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -12269,10 +14951,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -12287,24 +14969,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cppunit >= 1.12.1 " >&5
+        { $as_echo "$as_me:$LINENO: checking for cppunit >= 1.12.1 " >&5
 $as_echo_n "checking for cppunit >= 1.12.1 ... " >&6; }
 
         if $PKG_CONFIG --exists "cppunit >= 1.12.1 " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking CPPUNIT_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking CPPUNIT_CFLAGS" >&5
 $as_echo_n "checking CPPUNIT_CFLAGS... " >&6; }
             CPPUNIT_CFLAGS=`$PKG_CONFIG --cflags "cppunit >= 1.12.1 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPPUNIT_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $CPPUNIT_CFLAGS" >&5
 $as_echo "$CPPUNIT_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking CPPUNIT_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking CPPUNIT_LIBS" >&5
 $as_echo_n "checking CPPUNIT_LIBS... " >&6; }
             CPPUNIT_LIBS=`$PKG_CONFIG --libs "cppunit >= 1.12.1 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPPUNIT_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $CPPUNIT_LIBS" >&5
 $as_echo "$CPPUNIT_LIBS" >&6; }
         else
             CPPUNIT_CFLAGS=""
@@ -12326,19 +15008,23 @@ $as_echo "$CPPUNIT_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error "Library requirements (cppunit >= 1.12.1 ) 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
+     { { $as_echo "$as_me:$LINENO: error: Library requirements (cppunit >= 1.12.1 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+$as_echo "$as_me: error: Library requirements (cppunit >= 1.12.1 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
   fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking STL compatibility" >&5
+    { $as_echo "$as_me:$LINENO: checking STL compatibility" >&5
 $as_echo_n "checking STL compatibility... " >&6; }
     if test "$WITH_STLPORT" != "no"; then
-	as_fn_error "to use system cppunit you need to use --without-stlport" "$LINENO" 5
+	{ { $as_echo "$as_me:$LINENO: error: to use system cppunit you need to use --without-stlport" >&5
+$as_echo "$as_me: error: to use system cppunit you need to use --without-stlport" >&2;}
+   { (exit 1); exit 1; }; }
     else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
+	{ $as_echo "$as_me:$LINENO: result: OK" >&5
 $as_echo "OK" >&6; }
     fi
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+    { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
     SYSTEM_CPPUNIT=NO
     BUILD_TYPE="$BUILD_TYPE CPPUNIT"
@@ -12348,7 +15034,7 @@ fi
 
 
 if test  "$test_freetype" = "yes"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether freetype is available" >&5
+   { $as_echo "$as_me:$LINENO: checking whether freetype is available" >&5
 $as_echo_n "checking whether freetype is available... " >&6; }
 
   succeeded=no
@@ -12356,9 +15042,9 @@ $as_echo_n "checking whether freetype is available... " >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -12371,14 +15057,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -12387,10 +15073,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -12405,24 +15091,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype2 >= 2.0 " >&5
+        { $as_echo "$as_me:$LINENO: checking for freetype2 >= 2.0 " >&5
 $as_echo_n "checking for freetype2 >= 2.0 ... " >&6; }
 
         if $PKG_CONFIG --exists "freetype2 >= 2.0 " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking FREETYPE_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking FREETYPE_CFLAGS" >&5
 $as_echo_n "checking FREETYPE_CFLAGS... " >&6; }
             FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2 >= 2.0 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $FREETYPE_CFLAGS" >&5
 $as_echo "$FREETYPE_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking FREETYPE_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking FREETYPE_LIBS" >&5
 $as_echo_n "checking FREETYPE_LIBS... " >&6; }
             FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2 >= 2.0 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $FREETYPE_LIBS" >&5
 $as_echo "$FREETYPE_LIBS" >&6; }
         else
             FREETYPE_CFLAGS=""
@@ -12444,7 +15130,9 @@ $as_echo "$FREETYPE_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error "Library requirements (freetype2 >= 2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     { { $as_echo "$as_me:$LINENO: error: Library requirements (freetype2 >= 2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+$as_echo "$as_me: error: Library requirements (freetype2 >= 2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
   fi
 
 fi
@@ -12457,14 +15145,18 @@ if test  "$test_freetype" = "yes"; then
     save_LIBS="$LIBS"
     CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
     LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_GlyphSlot_Embolden in -lfreetype" >&5
+    { $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -12482,18 +15174,43 @@ return FT_GlyphSlot_Embolden ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_freetype_FT_GlyphSlot_Embolden=yes
 else
-  ac_cv_lib_freetype_FT_GlyphSlot_Embolden=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_freetype_FT_GlyphSlot_Embolden=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_GlyphSlot_Embolden" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_freetype_FT_GlyphSlot_Embolden" >&5
 $as_echo "$ac_cv_lib_freetype_FT_GlyphSlot_Embolden" >&6; }
-if test "x$ac_cv_lib_freetype_FT_GlyphSlot_Embolden" = x""yes; then :
+if test "x$ac_cv_lib_freetype_FT_GlyphSlot_Embolden" = x""yes; then
   USE_FT_EMBOLDEN="YES"
 else
   USE_FT_EMBOLDEN="NO"
@@ -12526,25 +15243,25 @@ if test -n "$with_system_libxml" -o -n "$with_system_libs" && \
     fi
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libxslt to use" >&5
+{ $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+   { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
    SYSTEM_LIBXSLT=YES
 
    if test "$_os" = "Darwin"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXSLT_CFLAGS" >&5
+   { $as_echo "$as_me:$LINENO: checking LIBXSLT_CFLAGS" >&5
 $as_echo_n "checking LIBXSLT_CFLAGS... " >&6; }
    LIBXSLT_CFLAGS=`xslt-config --cflags`
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXSLT_CFLAGS" >&5
+   { $as_echo "$as_me:$LINENO: result: $LIBXSLT_CFLAGS" >&5
 $as_echo "$LIBXSLT_CFLAGS" >&6; }
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXSLT_LIBS" >&5
+   { $as_echo "$as_me:$LINENO: checking LIBXSLT_LIBS" >&5
 $as_echo_n "checking LIBXSLT_LIBS... " >&6; }
    LIBXSLT_LIBS=`xslt-config --libs`
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXSLT_LIBS" >&5
+   { $as_echo "$as_me:$LINENO: result: $LIBXSLT_LIBS" >&5
 $as_echo "$LIBXSLT_LIBS" >&6; }
 
 
@@ -12555,9 +15272,9 @@ $as_echo "$LIBXSLT_LIBS" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -12570,14 +15287,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -12586,10 +15303,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -12604,24 +15321,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxslt" >&5
+        { $as_echo "$as_me:$LINENO: checking for libxslt" >&5
 $as_echo_n "checking for libxslt... " >&6; }
 
         if $PKG_CONFIG --exists "libxslt" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXSLT_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking LIBXSLT_CFLAGS" >&5
 $as_echo_n "checking LIBXSLT_CFLAGS... " >&6; }
             LIBXSLT_CFLAGS=`$PKG_CONFIG --cflags "libxslt"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXSLT_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $LIBXSLT_CFLAGS" >&5
 $as_echo "$LIBXSLT_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXSLT_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking LIBXSLT_LIBS" >&5
 $as_echo_n "checking LIBXSLT_LIBS... " >&6; }
             LIBXSLT_LIBS=`$PKG_CONFIG --libs "libxslt"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXSLT_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $LIBXSLT_LIBS" >&5
 $as_echo "$LIBXSLT_LIBS" >&6; }
         else
             LIBXSLT_CFLAGS=""
@@ -12643,7 +15360,9 @@ $as_echo "$LIBXSLT_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error "Library requirements (libxslt) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     { { $as_echo "$as_me:$LINENO: error: Library requirements (libxslt) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+$as_echo "$as_me: error: Library requirements (libxslt) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
   fi
 
  fi
@@ -12651,9 +15370,9 @@ $as_echo "$LIBXSLT_LIBS" >&6; }
 
       # Extract the first word of "xsltproc", so it can be a program name with args.
 set dummy xsltproc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XSLTPROC+set}" = set; then :
+if test "${ac_cv_path_XSLTPROC+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $XSLTPROC in
@@ -12666,14 +15385,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -12682,19 +15401,21 @@ esac
 fi
 XSLTPROC=$ac_cv_path_XSLTPROC
 if test -n "$XSLTPROC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5
+  { $as_echo "$as_me:$LINENO: result: $XSLTPROC" >&5
 $as_echo "$XSLTPROC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
    if test "$XSLTPROC" = "no"; then
-      as_fn_error "xsltproc is required" "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: xsltproc is required" >&5
+$as_echo "$as_me: error: xsltproc is required" >&2;}
+   { (exit 1); exit 1; }; }
    fi
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+   { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
    SYSTEM_LIBXSLT=NO
    BUILD_TYPE="$BUILD_TYPE LIBXSLT"
@@ -12704,24 +15425,24 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libxml to use" >&5
+{ $as_echo "$as_me:$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
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+    { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
     SYSTEM_LIBXML=YES
     if test "$_os" = "Darwin"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXML_CFLAGS" >&5
+   { $as_echo "$as_me:$LINENO: checking LIBXML_CFLAGS" >&5
 $as_echo_n "checking LIBXML_CFLAGS... " >&6; }
    LIBXML_CFLAGS=`xml2-config --cflags`
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML_CFLAGS" >&5
+   { $as_echo "$as_me:$LINENO: result: $LIBXML_CFLAGS" >&5
 $as_echo "$LIBXML_CFLAGS" >&6; }
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXML_LIBS" >&5
+   { $as_echo "$as_me:$LINENO: checking LIBXML_LIBS" >&5
 $as_echo_n "checking LIBXML_LIBS... " >&6; }
    LIBXML_LIBS=`xml2-config --libs`
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML_LIBS" >&5
+   { $as_echo "$as_me:$LINENO: result: $LIBXML_LIBS" >&5
 $as_echo "$LIBXML_LIBS" >&6; }
 
 
@@ -12732,9 +15453,9 @@ $as_echo "$LIBXML_LIBS" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -12747,14 +15468,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -12763,10 +15484,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -12781,24 +15502,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.0" >&5
+        { $as_echo "$as_me:$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
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXML_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking LIBXML_CFLAGS" >&5
 $as_echo_n "checking LIBXML_CFLAGS... " >&6; }
             LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.0"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $LIBXML_CFLAGS" >&5
 $as_echo "$LIBXML_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXML_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking LIBXML_LIBS" >&5
 $as_echo_n "checking LIBXML_LIBS... " >&6; }
             LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.0"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $LIBXML_LIBS" >&5
 $as_echo "$LIBXML_LIBS" >&6; }
         else
             LIBXML_CFLAGS=""
@@ -12820,14 +15541,16 @@ $as_echo "$LIBXML_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error "Library requirements (libxml-2.0 >= 2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     { { $as_echo "$as_me:$LINENO: error: Library requirements (libxml-2.0 >= 2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+$as_echo "$as_me: error: Library requirements (libxml-2.0 >= 2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
   fi
 
  fi
 
     BUILD_TYPE="$BUILD_TYPE LIBXMLSEC"
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+    { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
     SYSTEM_LIBXML=NO
     BUILD_TYPE="$BUILD_TYPE LIBXML2 LIBXMLSEC"
@@ -12836,18 +15559,18 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which python to use" >&5
+{ $as_echo "$as_me:$LINENO: checking which python to use" >&5
 $as_echo_n "checking which python to use... " >&6; }
 if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then
    with_system_python=yes
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: compiling against MacOSX10.4u.sdk (python version 2.3)" >&5
+   { $as_echo "$as_me:$LINENO: result: compiling against MacOSX10.4u.sdk (python version 2.3)" >&5
 $as_echo "compiling against MacOSX10.4u.sdk (python version 2.3)" >&6; }
    PYTHON_CFLAGS="-I/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3"
    PYTHON_LIBS="-framework Python"
 elif test -n "$with_system_python" -o -n "$with_system_libs" && \
 	test "$with_system_python" != "no"; then
    with_system_python=yes
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+   { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
 
 
@@ -12855,7 +15578,7 @@ $as_echo "external" >&6; }
 
         if test -n "$PYTHON"; then
       # If the user set $PYTHON, use it and don't search something else.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.2" >&5
+      { $as_echo "$as_me:$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
@@ -12868,19 +15591,22 @@ sys.exit(sys.hexversion < minverhex)"
    ($PYTHON -c "$prog") >&5 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   (exit $ac_status); }; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  as_fn_error "too old" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: too old" >&5
+$as_echo "$as_me: error: too old" >&2;}
+   { (exit 1); exit 1; }; }
 fi
+
       am_display_PYTHON=$PYTHON
     else
       # Otherwise, try each interpreter until we find one that satisfies
       # VERSION.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.2" >&5
+      { $as_echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.2" >&5
 $as_echo_n "checking for a Python interpreter with version >= 2.2... " >&6; }
-if test "${am_cv_pathless_PYTHON+set}" = set; then :
+if test "${am_cv_pathless_PYTHON+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
@@ -12897,12 +15623,13 @@ sys.exit(sys.hexversion < minverhex)"
    ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then :
+   (exit $ac_status); }; then
   break
 fi
+
 	done
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5
+{ $as_echo "$as_me:$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
@@ -12910,9 +15637,9 @@ $as_echo "$am_cv_pathless_PYTHON" >&6; }
       else
         # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.
 set dummy $am_cv_pathless_PYTHON; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PYTHON+set}" = set; then :
+if test "${ac_cv_path_PYTHON+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PYTHON in
@@ -12925,14 +15652,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -12940,10 +15667,10 @@ esac
 fi
 PYTHON=$ac_cv_path_PYTHON
 if test -n "$PYTHON"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
+  { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5
 $as_echo "$PYTHON" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -12954,18 +15681,20 @@ fi
 
 
   if test "$PYTHON" = :; then
-      as_fn_error "no suitable Python interpreter found" "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5
+$as_echo "$as_me: error: no suitable Python interpreter found" >&2;}
+   { (exit 1); exit 1; }; }
   else
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
+  { $as_echo "$as_me:$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 :
+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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+{ $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5
 $as_echo "$am_cv_python_version" >&6; }
   PYTHON_VERSION=$am_cv_python_version
 
@@ -12977,29 +15706,29 @@ $as_echo "$am_cv_python_version" >&6; }
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
+  { $as_echo "$as_me:$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 :
+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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
+{ $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
 $as_echo "$am_cv_python_platform" >&6; }
   PYTHON_PLATFORM=$am_cv_python_platform
 
 
 
 
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
+                { $as_echo "$as_me:$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 :
+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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
+{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
 $as_echo "$am_cv_python_pythondir" >&6; }
   pythondir=$am_cv_python_pythondir
 
@@ -13008,15 +15737,15 @@ $as_echo "$am_cv_python_pythondir" >&6; }
   pkgpythondir=\${pythondir}/$PACKAGE
 
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
+            { $as_echo "$as_me:$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 :
+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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
+{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
 $as_echo "$am_cv_python_pyexecdir" >&6; }
   pyexecdir=$am_cv_python_pyexecdir
 
@@ -13039,11 +15768,139 @@ if test "$with_system_python" = "yes" ; then
    SYSTEM_PYTHON=YES
       save_CPPFLAGS="$CPPFLAGS"
    CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
-   ac_fn_c_check_header_mongrel "$LINENO" "Python.h" "ac_cv_header_Python_h" "$ac_includes_default"
-if test "x$ac_cv_header_Python_h" = x""yes; then :
+   if test "${ac_cv_header_Python_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for Python.h" >&5
+$as_echo_n "checking for Python.h... " >&6; }
+if test "${ac_cv_header_Python_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5
+$as_echo "$ac_cv_header_Python_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking Python.h usability" >&5
+$as_echo_n "checking Python.h usability... " >&6; }
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking Python.h presence" >&5
+$as_echo_n "checking Python.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <Python.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
 
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: Python.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: Python.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: Python.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: Python.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: Python.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: Python.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: Python.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: Python.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: Python.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: Python.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: Python.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: Python.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: Python.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: Python.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for Python.h" >&5
+$as_echo_n "checking for Python.h... " >&6; }
+if test "${ac_cv_header_Python_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_Python_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5
+$as_echo "$ac_cv_header_Python_h" >&6; }
+
+fi
+if test "x$ac_cv_header_Python_h" = x""yes; then
+  :
 else
-  as_fn_error "Python headers not found" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: Python headers not found" >&5
+$as_echo "$as_me: error: Python headers not found" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
@@ -13051,7 +15908,7 @@ fi
 else
    SYSTEM_PYTHON=NO
    BUILD_TYPE="$BUILD_TYPE PYTHON"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+   { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
    # Embedded python dies without Home set
    if test "z$HOME" = "z"; then
@@ -13061,9 +15918,9 @@ $as_echo "internal" >&6; }
    if test -z "$BZIP2"; then
 	# Extract the first word of "bzip2", so it can be a program name with args.
 set dummy bzip2; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_BZIP2+set}" = set; then :
+if test "${ac_cv_path_BZIP2+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $BZIP2 in
@@ -13076,14 +15933,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -13091,16 +15948,18 @@ esac
 fi
 BZIP2=$ac_cv_path_BZIP2
 if test -n "$BZIP2"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BZIP2" >&5
+  { $as_echo "$as_me:$LINENO: result: $BZIP2" >&5
 $as_echo "$BZIP2" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 	if test -z "$BZIP2"; then
-   		as_fn_error "the internal Python module has a .tar.bz2. You need bzip2" "$LINENO" 5
+   		{ { $as_echo "$as_me:$LINENO: error: the internal Python module has a .tar.bz2. You need bzip2" >&5
+$as_echo "$as_me: error: the internal Python module has a .tar.bz2. You need bzip2" >&2;}
+   { (exit 1); exit 1; }; }
    	fi
    fi
 fi
@@ -13110,27 +15969,115 @@ fi
 HOME=`echo $HOME | sed 's:\\\\:/:g'`
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which db to use" >&5
+{ $as_echo "$as_me:$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
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+    { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
-    ac_fn_c_check_header_compile "$LINENO" "db.h" "ac_cv_header_db_h" "
+    { $as_echo "$as_me:$LINENO: checking for db.h" >&5
+$as_echo_n "checking for db.h... " >&6; }
+if test "${ac_cv_header_db_h+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.  */
 
-"
-if test "x$ac_cv_header_db_h" = x""yes; then :
+
+
+#include <db.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_header_db_h=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_header_db_h=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
+$as_echo "$ac_cv_header_db_h" >&6; }
+if test "x$ac_cv_header_db_h" = x""yes; then
    DB_INCLUDES=/usr/include
 else
 
              CFLAGS=-I/usr/include/db4
-             ac_fn_c_check_header_compile "$LINENO" "db4/db.h" "ac_cv_header_db4_db_h" "+
-"
-if test "x$ac_cv_header_db4_db_h" = x""yes; then :
+             { $as_echo "$as_me:$LINENO: checking for db4/db.h" >&5
+$as_echo_n "checking for db4/db.h... " >&6; }
+if test "${ac_cv_header_db4_db_h+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.  */
++
+
+#include <db4/db.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_header_db4_db_h=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_header_db4_db_h=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_db4_db_h" >&5
+$as_echo "$ac_cv_header_db4_db_h" >&6; }
+if test "x$ac_cv_header_db4_db_h" = x""yes; then
    DB_INCLUDES=/usr/include/db4
 else
-   as_fn_error "no. install the db4 libraries" "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: no. install the db4 libraries" >&5
+$as_echo "$as_me: error: no. install the db4 libraries" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
@@ -13138,15 +16085,22 @@ fi
 fi
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether db is at least 4.1" >&5
+    { $as_echo "$as_me:$LINENO: checking whether db is at least 4.1" >&5
 $as_echo_n "checking whether db is at least 4.1... " >&6; }
-    if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+    if test "$cross_compiling" = yes; then
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_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
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <db.h>
@@ -13157,24 +16111,58 @@ int main(int argc, char **argv) {
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  as_fn_error "no. you need at least db 4.1" "$LINENO" 5
+  $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
+
+( exit $ac_status )
+{ { $as_echo "$as_me:$LINENO: error: no. you need at least db 4.1" >&5
+$as_echo "$as_me: error: no. you need at least db 4.1" >&2;}
+   { (exit 1); exit 1; }; }
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldb" >&5
+
+
+{ $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 
@@ -13186,18 +16174,43 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_db_main=yes
 else
-  ac_cv_lib_db_main=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_db_main=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_db_main" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_db_main" >&5
 $as_echo "$ac_cv_lib_db_main" >&6; }
-if test "x$ac_cv_lib_db_main" = x""yes; then :
+if test "x$ac_cv_lib_db_main" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBDB 1
 _ACEOF
@@ -13205,13 +16218,15 @@ _ACEOF
   LIBS="-ldb $LIBS"
 
 else
-  as_fn_error "db not installed or functional" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: db not installed or functional" >&5
+$as_echo "$as_me: error: db not installed or functional" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 ac_cv_lib_db=ac_cv_lib_db_main
 
     SCPDEFS="$SCPDEFS -DSYSTEM_DB"
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+    { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
     SYSTEM_DB=NO
     BUILD_TYPE="$BUILD_TYPE BERKELEYDB"
@@ -13221,52 +16236,58 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which lucene to use" >&5
+{ $as_echo "$as_me:$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
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+        { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
         SYSTEM_LUCENE=YES
         if test -z $LUCENE_CORE_JAR; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/lucene-core-2.3.jar" >&5
+          { $as_echo "$as_me:$LINENO: checking for /usr/share/java/lucene-core-2.3.jar" >&5
 $as_echo_n "checking for /usr/share/java/lucene-core-2.3.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_lucene_core_2_3_jar+set}" = set; then :
+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 &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/lucene-core-2.3.jar"; then
   ac_cv_file__usr_share_java_lucene_core_2_3_jar=yes
 else
   ac_cv_file__usr_share_java_lucene_core_2_3_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_lucene_core_2_3_jar" = x""yes; then :
+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
 
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/lucene.jar" >&5
+              { $as_echo "$as_me:$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 :
+if test "${ac_cv_file__usr_share_java_lucene_jar+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/lucene.jar"; then
   ac_cv_file__usr_share_java_lucene_jar=yes
 else
   ac_cv_file__usr_share_java_lucene_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_lucene_jar" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_lucene_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_lucene_jar" = x""yes; then :
+if test "x$ac_cv_file__usr_share_java_lucene_jar" = x""yes; then
    LUCENE_CORE_JAR=/usr/share/java/lucene.jar
 else
-   as_fn_error "lucene-core.jar replacement not found" "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: lucene-core.jar replacement not found" >&5
+$as_echo "$as_me: error: lucene-core.jar replacement not found" >&2;}
+   { (exit 1); exit 1; }; }
 
 fi
 
@@ -13276,70 +16297,82 @@ fi
 
         else
           as_ac_File=`$as_echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LUCENE_CORE_JAR" >&5
+{ $as_echo "$as_me:$LINENO: checking for $LUCENE_CORE_JAR" >&5
 $as_echo_n "checking for $LUCENE_CORE_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$LUCENE_CORE_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   if test "x$as_val" = x""yes; then :
-
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  :
 else
-  as_fn_error "lucene-core.jar not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: lucene-core.jar not found." >&5
+$as_echo "$as_me: error: lucene-core.jar not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
         fi
 
         if test -z $LUCENE_ANALYZERS_JAR; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/lucene-analyzers-2.3.jar" >&5
+          { $as_echo "$as_me:$LINENO: checking for /usr/share/java/lucene-analyzers-2.3.jar" >&5
 $as_echo_n "checking for /usr/share/java/lucene-analyzers-2.3.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar+set}" = set; then :
+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 &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/lucene-analyzers-2.3.jar"; then
   ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar=yes
 else
   ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" = x""yes; then :
+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
 
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar" >&5
+              { $as_echo "$as_me:$LINENO: checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar" >&5
 $as_echo_n "checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar+set}" = set; then :
+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 &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/lucene-contrib/lucene-analyzers.jar"; then
   ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar=yes
 else
   ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" = x""yes; then :
+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
-   as_fn_error "lucene-analyzers.jar replacement not found." "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: lucene-analyzers.jar replacement not found." >&5
+$as_echo "$as_me: error: lucene-analyzers.jar replacement not found." >&2;}
+   { (exit 1); exit 1; }; }
 
 fi
 
@@ -13349,32 +16382,38 @@ fi
 
         else
           as_ac_File=`$as_echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LUCENE_CORE_JAR" >&5
+{ $as_echo "$as_me:$LINENO: checking for $LUCENE_CORE_JAR" >&5
 $as_echo_n "checking for $LUCENE_CORE_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$LUCENE_CORE_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   if test "x$as_val" = x""yes; then :
-
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  :
 else
-   as_fn_error "lucene-analyzers.jar not found." "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: lucene-analyzers.jar not found." >&5
+$as_echo "$as_me: error: lucene-analyzers.jar not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
         fi
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+    { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
     SYSTEM_LUCENE=NO
     BUILD_TYPE="$BUILD_TYPE LUCENE"
@@ -13383,41 +16422,43 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the MySQL Connector extension" >&5
+{ $as_echo "$as_me:$LINENO: checking whether to build the MySQL Connector extension" >&5
 $as_echo_n "checking whether to build the MySQL Connector extension... " >&6; }
 if test -n "$enable_mysql_connector" -a "$enable_mysql_connector" != "no"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
   ENABLE_MYSQLC=YES
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysqlc module" >&5
+  { $as_echo "$as_me:$LINENO: checking for mysqlc module" >&5
 $as_echo_n "checking for mysqlc module... " >&6; }
   if test -d mysqlc; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
+   { $as_echo "$as_me:$LINENO: result: OK" >&5
 $as_echo "OK" >&6; }
   else
-   as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5
+$as_echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;}
+   { (exit 1); exit 1; }; }
   fi
   BUILD_TYPE="$BUILD_TYPE MYSQLC"
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
   ENABLE_MYSQLC=NO
 fi
 
 
 if test "$ENABLE_MYSQLC" = "YES"; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql pre-requisites" >&5
+{ $as_echo "$as_me:$LINENO: checking for mysql pre-requisites" >&5
 $as_echo_n "checking for mysql pre-requisites... " >&6; }
 if test -n "$with_system_mysql" -o -n "$with_system_libs" && \
        test "$with_system_mysql" != "no" && test "$with_system_libs" != "no"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: external MySQL" >&5
+	{ $as_echo "$as_me:$LINENO: result: external MySQL" >&5
 $as_echo "external MySQL" >&6; }
 	SYSTEM_MYSQL=YES
 	# Extract the first word of "mysql_config", so it can be a program name with args.
 set dummy mysql_config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MYSQLCONFIG+set}" = set; then :
+if test "${ac_cv_path_MYSQLCONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $MYSQLCONFIG in
@@ -13430,14 +16471,14 @@ 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
+  for ac_exec_ext in '' $ac_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_MYSQLCONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -13445,35 +16486,37 @@ esac
 fi
 MYSQLCONFIG=$ac_cv_path_MYSQLCONFIG
 if test -n "$MYSQLCONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQLCONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $MYSQLCONFIG" >&5
 $as_echo "$MYSQLCONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking MySQL version" >&5
+	{ $as_echo "$as_me:$LINENO: checking MySQL version" >&5
 $as_echo_n "checking MySQL version... " >&6; }
 	MYSQL_VERSION=`$MYSQLCONFIG --version`
 	MYSQL_MAJOR=`$MYSQLCONFIG --version | cut -d"." -f1`
 	if test "$MYSQL_MAJOR" -ge "5"; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
+		{ $as_echo "$as_me:$LINENO: result: OK" >&5
 $as_echo "OK" >&6; }
 	else
-		as_fn_error "too old, use 5.0.x or 5.1.x" "$LINENO" 5
+		{ { $as_echo "$as_me:$LINENO: error: too old, use 5.0.x or 5.1.x" >&5
+$as_echo "$as_me: error: too old, use 5.0.x or 5.1.x" >&2;}
+   { (exit 1); exit 1; }; }
 	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQL Client library" >&5
+	{ $as_echo "$as_me:$LINENO: checking for MySQL Client library" >&5
 $as_echo_n "checking for MySQL Client library... " >&6; }
 	MYSQL_INC=`$MYSQLCONFIG --include`
 	MYSQL_LIB=`$MYSQLCONFIG --libs`
 	MYSQL_DEFINES=`$MYSQLCONFIG --cflags | sed -e s,$MYSQL_INC,,`
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: includes $MYSQL_INC, libraries $MYSQL_LIB" >&5
+	{ $as_echo "$as_me:$LINENO: result: includes $MYSQL_INC, libraries $MYSQL_LIB" >&5
 $as_echo "includes $MYSQL_INC, libraries $MYSQL_LIB" >&6; }
 else
     SYSTEM_MYSQL=NO
     if test -n "$with_libmysql_path"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: external Connector/C (libmysql)" >&5
+        { $as_echo "$as_me:$LINENO: result: external Connector/C (libmysql)" >&5
 $as_echo "external Connector/C (libmysql)" >&6; }
         LIBMYSQL=libmysql.so
         if test "$_os" = "Darwin"; then
@@ -13481,17 +16524,21 @@ $as_echo "external Connector/C (libmysql)" >&6; }
         elif test "$_os" = "WINNT"; then
             LIBMYSQL=libmysql.dll
         fi
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBMYSQL" >&5
+        { $as_echo "$as_me:$LINENO: checking for $LIBMYSQL" >&5
 $as_echo_n "checking for $LIBMYSQL... " >&6; }
         if test -e "$with_libmysql_path/lib/$LIBMYSQL"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: found." >&5
+            { $as_echo "$as_me:$LINENO: result: found." >&5
 $as_echo "found." >&6; }
             LIBMYSQL_PATH=$with_libmysql_path
         else
-            as_fn_error "not found. Please specify proper path in --with-libmysql-path." "$LINENO" 5
+            { { $as_echo "$as_me:$LINENO: error: not found. Please specify proper path in --with-libmysql-path." >&5
+$as_echo "$as_me: error: not found. Please specify proper path in --with-libmysql-path." >&2;}
+   { (exit 1); exit 1; }; }
         fi
     else
-        as_fn_error "not given. Please specify either --with-system-mysql or --with-libmysql-path" "$LINENO" 5
+        { { $as_echo "$as_me:$LINENO: error: not given. Please specify either --with-system-mysql or --with-libmysql-path" >&5
+$as_echo "$as_me: error: not given. Please specify either --with-system-mysql or --with-libmysql-path" >&2;}
+   { (exit 1); exit 1; }; }
     fi
 fi
 
@@ -13508,11 +16555,11 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 # FIXME!
 # who thought this too-generic cppconn dir was a good idea?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking MySQL Connector/C++" >&5
+{ $as_echo "$as_me:$LINENO: checking MySQL Connector/C++" >&5
 $as_echo_n "checking MySQL Connector/C++... " >&6; }
 if test -n "$with_system_mysql_cppconn" -o -n "$with_system_libs" && \
 		test "$with_system_mysql_cppconn" != "no" && test "$with_system_libs" != "no"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+	{ $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
 	SYSTEM_MYSQL_CPPCONN=YES
         ac_ext=cpp
@@ -13521,22 +16568,155 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-	ac_fn_cxx_check_header_mongrel "$LINENO" "mysql_driver.h" "ac_cv_header_mysql_driver_h" "$ac_includes_default"
-if test "x$ac_cv_header_mysql_driver_h" = x""yes; then :
+	if test "${ac_cv_header_mysql_driver_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for mysql_driver.h" >&5
+$as_echo_n "checking for mysql_driver.h... " >&6; }
+if test "${ac_cv_header_mysql_driver_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mysql_driver_h" >&5
+$as_echo "$ac_cv_header_mysql_driver_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking mysql_driver.h usability" >&5
+$as_echo_n "checking mysql_driver.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <mysql_driver.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking mysql_driver.h presence" >&5
+$as_echo_n "checking mysql_driver.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <mysql_driver.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: mysql_driver.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: mysql_driver.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: mysql_driver.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: mysql_driver.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: mysql_driver.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: mysql_driver.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: mysql_driver.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: mysql_driver.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: mysql_driver.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: mysql_driver.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: mysql_driver.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: mysql_driver.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: mysql_driver.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: mysql_driver.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: mysql_driver.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: mysql_driver.h: in the future, the compiler will take precedence" >&2;}
 
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for mysql_driver.h" >&5
+$as_echo_n "checking for mysql_driver.h... " >&6; }
+if test "${ac_cv_header_mysql_driver_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_mysql_driver_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mysql_driver_h" >&5
+$as_echo "$ac_cv_header_mysql_driver_h" >&6; }
+
+fi
+if test "x$ac_cv_header_mysql_driver_h" = x""yes; then
+  :
 else
-  as_fn_error "mysql_driver.h not found. install MySQL C++ Connectivity" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: mysql_driver.h not found. install MySQL C++ Connectivity" >&5
+$as_echo "$as_me: error: mysql_driver.h not found. install MySQL C++ Connectivity" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lmysqlcppconn" >&5
+
+{ $as_echo "$as_me:$LINENO: checking for main in -lmysqlcppconn" >&5
 $as_echo_n "checking for main in -lmysqlcppconn... " >&6; }
-if test "${ac_cv_lib_mysqlcppconn_main+set}" = set; then :
+if test "${ac_cv_lib_mysqlcppconn_main+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmysqlcppconn  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 
@@ -13548,18 +16728,43 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_mysqlcppconn_main=yes
 else
-  ac_cv_lib_mysqlcppconn_main=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_mysqlcppconn_main=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mysqlcppconn_main" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlcppconn_main" >&5
 $as_echo "$ac_cv_lib_mysqlcppconn_main" >&6; }
-if test "x$ac_cv_lib_mysqlcppconn_main" = x""yes; then :
+if test "x$ac_cv_lib_mysqlcppconn_main" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBMYSQLCPPCONN 1
 _ACEOF
@@ -13567,18 +16772,27 @@ _ACEOF
   LIBS="-lmysqlcppconn $LIBS"
 
 else
-  as_fn_error "MySQL C++ Connectivity lib not found or functional" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: MySQL C++ Connectivity lib not found or functional" >&5
+$as_echo "$as_me: error: MySQL C++ Connectivity lib not found or functional" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking version" >&5
+   { $as_echo "$as_me:$LINENO: checking version" >&5
 $as_echo_n "checking version... " >&6; }
-      if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+      if test "$cross_compiling" = yes; then
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_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
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <mysql_driver.h>
@@ -13595,16 +16809,45 @@ int main(int argc, char **argv) {
 }
 
 _ACEOF
-if ac_fn_cxx_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  { $as_echo "$as_me:$LINENO: result: OK" >&5
 $as_echo "OK" >&6; }
 else
-  as_fn_error "not suitable, we need >= 1.0.6" "$LINENO" 5
+  $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
+
+( exit $ac_status )
+{ { $as_echo "$as_me:$LINENO: error: not suitable, we need >= 1.0.6" >&5
+$as_echo "$as_me: error: not suitable, we need >= 1.0.6" >&2;}
+   { (exit 1); exit 1; }; }
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+
         ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -13613,15 +16856,17 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+	{ $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysqlcppconn module" >&5
+        { $as_echo "$as_me:$LINENO: checking for mysqlcppconn module" >&5
 $as_echo_n "checking for mysqlcppconn module... " >&6; }
         if test -d mysqlcppconn; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
+          { $as_echo "$as_me:$LINENO: result: OK" >&5
 $as_echo "OK" >&6; }
         else
-          as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
+          { { $as_echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5
+$as_echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;}
+   { (exit 1); exit 1; }; }
         fi
 	BUILD_TYPE="$BUILD_TYPE MYSQLCPPCONN"
 	SYSTEM_MYSQL_CPPCONN=NO
@@ -13635,41 +16880,47 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which hsqldb to use" >&5
+{ $as_echo "$as_me:$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
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+        { $as_echo "$as_me:$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=`$as_echo "ac_cv_file_$HSQLDB_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $HSQLDB_JAR" >&5
+{ $as_echo "$as_me:$LINENO: checking for $HSQLDB_JAR" >&5
 $as_echo_n "checking for $HSQLDB_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$HSQLDB_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   if test "x$as_val" = x""yes; then :
-
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  :
 else
-  as_fn_error "hsqldb.jar not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: hsqldb.jar not found." >&5
+$as_echo "$as_me: error: hsqldb.jar not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether hsqldb is >= 1.8.0.9" >&5
+        { $as_echo "$as_me:$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;
@@ -13693,13 +16944,15 @@ $as_echo_n "checking whether hsqldb is >= 1.8.0.9... " >&6; }
 	    } else {
 	        exit 1;
             }'; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
          else
-            as_fn_error "no, hsqldb >= 1.8.0.9 is needed" "$LINENO" 5
+            { { $as_echo "$as_me:$LINENO: error: no, hsqldb >= 1.8.0.9 is needed" >&5
+$as_echo "$as_me: error: no, hsqldb >= 1.8.0.9 is needed" >&2;}
+   { (exit 1); exit 1; }; }
          fi
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+    { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
     SYSTEM_HSQLDB=NO
     BUILD_TYPE="$BUILD_TYPE HSQLDB"
@@ -13707,42 +16960,48 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which beanshell to use" >&5
+{ $as_echo "$as_me:$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
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+        { $as_echo "$as_me:$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=`$as_echo "ac_cv_file_$BSH_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $BSH_JAR" >&5
+{ $as_echo "$as_me:$LINENO: checking for $BSH_JAR" >&5
 $as_echo_n "checking for $BSH_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$BSH_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   if test "x$as_val" = x""yes; then :
-
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  :
 else
-  as_fn_error "bsh.jar not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: bsh.jar not found." >&5
+$as_echo "$as_me: error: bsh.jar not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+    { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
     SYSTEM_BSH=NO
     BUILD_TYPE="$BUILD_TYPE BSH"
@@ -13751,70 +17010,78 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which saxon to use" >&5
+{ $as_echo "$as_me:$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
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+        { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
         SYSTEM_SAXON=YES
         if test -z $SAXON_JAR; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/saxon9.jar" >&5
+          { $as_echo "$as_me:$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 :
+if test "${ac_cv_file__usr_share_java_saxon9_jar+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/saxon9.jar"; then
   ac_cv_file__usr_share_java_saxon9_jar=yes
 else
   ac_cv_file__usr_share_java_saxon9_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_saxon9_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_saxon9_jar" = x""yes; then :
+if test "x$ac_cv_file__usr_share_java_saxon9_jar" = x""yes; then
    SAXON_JAR=/usr/share/java/saxon9.jar
 else
 
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/saxon.jar" >&5
+              { $as_echo "$as_me:$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 :
+if test "${ac_cv_file__usr_share_java_saxon_jar+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/saxon.jar"; then
   ac_cv_file__usr_share_java_saxon_jar=yes
 else
   ac_cv_file__usr_share_java_saxon_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_saxon_jar" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_saxon_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_saxon_jar" = x""yes; then :
+if test "x$ac_cv_file__usr_share_java_saxon_jar" = x""yes; then
    SAXON_JAR=/usr/share/java/saxon.jar
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/saxon9.jar" >&5
+   { $as_echo "$as_me:$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 :
+if test "${ac_cv_file__usr_share_java_saxon9_jar+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/saxon9.jar"; then
   ac_cv_file__usr_share_java_saxon9_jar=yes
 else
   ac_cv_file__usr_share_java_saxon9_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_saxon9_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_saxon9_jar" = x""yes; then :
+if test "x$ac_cv_file__usr_share_java_saxon9_jar" = x""yes; then
    SAXON_JAR=/usr/share/java/saxon9.jar
 else
-   as_fn_error "saxon.jar replacement not found" "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: saxon.jar replacement not found" >&5
+$as_echo "$as_me: error: saxon.jar replacement not found" >&2;}
+   { (exit 1); exit 1; }; }
 
 fi
 
@@ -13828,60 +17095,72 @@ fi
 
         else
           as_ac_File=`$as_echo "ac_cv_file_$SAXON_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SAXON_JAR" >&5
+{ $as_echo "$as_me:$LINENO: checking for $SAXON_JAR" >&5
 $as_echo_n "checking for $SAXON_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$SAXON_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   if test "x$as_val" = x""yes; then :
-
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  :
 else
-  as_fn_error "saxon.jar replacement not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: saxon.jar replacement not found." >&5
+$as_echo "$as_me: error: saxon.jar replacement not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
         fi
         if test -n "$SERIALIZER_JAR"; then
           as_ac_File=`$as_echo "ac_cv_file_$SERIALIZER_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SERIALIZER_JAR" >&5
+{ $as_echo "$as_me:$LINENO: checking for $SERIALIZER_JAR" >&5
 $as_echo_n "checking for $SERIALIZER_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$SERIALIZER_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   if test "x$as_val" = x""yes; then :
-
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  :
 else
-  as_fn_error "serializer.jar not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: serializer.jar not found." >&5
+$as_echo "$as_me: error: serializer.jar not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
         fi
 
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if saxon works" >&5
+        { $as_echo "$as_me:$LINENO: checking if saxon works" >&5
 $as_echo_n "checking if saxon works... " >&6; }
         cat > saxontest.java <<_ACEOF
 import javax.xml.transform.TransformerFactory;
@@ -13923,35 +17202,39 @@ _ACEOF
 
 _ACEOF
         javac_cmd="$JAVACOMPILER -cp $SAXON_JAR saxontest.java 1>&2"
-        { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$javac_cmd\""; } >&5
+        { (eval echo "$as_me:$LINENO: \"$javac_cmd\"") >&5
   (eval $javac_cmd) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
         if test $? = 0 && test -f ./saxontest.class ; then
             java_cmd="$JAVAINTERPRETER -cp $SAXON_JAR:. saxontest saxontest.xsl 1>&2"
-            { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$java_cmd\""; } >&5
+            { (eval echo "$as_me:$LINENO: \"$java_cmd\"") >&5
   (eval $java_cmd) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
             if test $? = 0; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+              { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             else
               cat saxontest.java >&5
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+              { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
-              as_fn_error "Non-functional saxon jar, e.g. crippled saxon-he instead of saxonb" "$LINENO" 5
+              { { $as_echo "$as_me:$LINENO: error: Non-functional saxon jar, e.g. crippled saxon-he instead of saxonb" >&5
+$as_echo "$as_me: error: Non-functional saxon jar, e.g. crippled saxon-he instead of saxonb" >&2;}
+   { (exit 1); exit 1; }; }
             fi
         else
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+          { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
           cat saxontest.java >&5
-          as_fn_error "saxontest could not be compiled, non-functional saxon jar" "$LINENO" 5
+          { { $as_echo "$as_me:$LINENO: error: saxontest could not be compiled, non-functional saxon jar" >&5
+$as_echo "$as_me: error: saxontest could not be compiled, non-functional saxon jar" >&2;}
+   { (exit 1); exit 1; }; }
         fi
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+    { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
     SYSTEM_SAXON=NO
     NEED_SAXON=TRUE
@@ -13966,19 +17249,19 @@ fi
 if test "$_os" = "Darwin" && test "$with_system_curl" != "no"; then
    with_system_curl=yes
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which curl to use" >&5
+{ $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+   { $as_echo "$as_me:$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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CURLCONFIG+set}" = set; then :
+if test "${ac_cv_path_CURLCONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $CURLCONFIG in
@@ -13991,14 +17274,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -14006,33 +17289,37 @@ esac
 fi
 CURLCONFIG=$ac_cv_path_CURLCONFIG
 if test -n "$CURLCONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURLCONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $CURLCONFIG" >&5
 $as_echo "$CURLCONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
    if test -z "$CURLCONFIG"; then
-      as_fn_error "install curl to run this script" "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: install curl to run this script" >&5
+$as_echo "$as_me: error: install curl to run this script" >&2;}
+   { (exit 1); exit 1; }; }
    fi
 
    # check curl version
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether curl is >= 7.13.1" >&5
+   { $as_echo "$as_me:$LINENO: checking whether curl is >= 7.13.1" >&5
 $as_echo_n "checking whether curl is >= 7.13.1... " >&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 "13" -a \
 	"`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $3 }'`" -gt "1"; then
-      as_fn_error "no, you need at least curl 7.13,1" "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: no, you need at least curl 7.13,1" >&5
+$as_echo "$as_me: error: no, you need at least curl 7.13,1" >&2;}
+   { (exit 1); exit 1; }; }
    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+      { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
    fi
    CURL_LIBS=`$CURLCONFIG --libs`
    CURL_CFLAGS=`$CURLCONFIG --cflags`
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+   { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
    SYSTEM_CURL=NO
    BUILD_TYPE="$BUILD_TYPE CURL"
@@ -14041,11 +17328,11 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which boost to use" >&5
+{ $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+   { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
    SYSTEM_BOOST=YES
    ac_ext=cpp
@@ -14054,36 +17341,424 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   ac_fn_cxx_check_header_mongrel "$LINENO" "boost/shared_ptr.hpp" "ac_cv_header_boost_shared_ptr_hpp" "$ac_includes_default"
-if test "x$ac_cv_header_boost_shared_ptr_hpp" = x""yes; then :
+   if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5
+$as_echo_n "checking for boost/shared_ptr.hpp... " >&6; }
+if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5
+$as_echo "$ac_cv_header_boost_shared_ptr_hpp" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking boost/shared_ptr.hpp usability" >&5
+$as_echo_n "checking boost/shared_ptr.hpp usability... " >&6; }
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking boost/shared_ptr.hpp presence" >&5
+$as_echo_n "checking boost/shared_ptr.hpp presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <boost/shared_ptr.hpp>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: boost/shared_ptr.hpp:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: boost/shared_ptr.hpp:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5
+$as_echo_n "checking for boost/shared_ptr.hpp... " >&6; }
+if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_boost_shared_ptr_hpp=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5
+$as_echo "$ac_cv_header_boost_shared_ptr_hpp" >&6; }
+
+fi
+if test "x$ac_cv_header_boost_shared_ptr_hpp" = x""yes; then
+  :
+else
+  { { $as_echo "$as_me:$LINENO: error: boost/shared_ptr.hpp not found. install boost" >&5
+$as_echo "$as_me: error: boost/shared_ptr.hpp not found. install boost" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+   if test "${ac_cv_header_boost_spirit_include_classic_core_hpp+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for boost/spirit/include/classic_core.hpp" >&5
+$as_echo_n "checking for boost/spirit/include/classic_core.hpp... " >&6; }
+if test "${ac_cv_header_boost_spirit_include_classic_core_hpp+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_include_classic_core_hpp" >&5
+$as_echo "$ac_cv_header_boost_spirit_include_classic_core_hpp" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking boost/spirit/include/classic_core.hpp usability" >&5
+$as_echo_n "checking boost/spirit/include/classic_core.hpp usability... " >&6; }
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking boost/spirit/include/classic_core.hpp presence" >&5
+$as_echo_n "checking boost/spirit/include/classic_core.hpp presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <boost/spirit/include/classic_core.hpp>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
 
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for boost/spirit/include/classic_core.hpp" >&5
+$as_echo_n "checking for boost/spirit/include/classic_core.hpp... " >&6; }
+if test "${ac_cv_header_boost_spirit_include_classic_core_hpp+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  as_fn_error "boost/shared_ptr.hpp not found. install boost" "$LINENO" 5
+  ac_cv_header_boost_spirit_include_classic_core_hpp=$ac_header_preproc
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_include_classic_core_hpp" >&5
+$as_echo "$ac_cv_header_boost_spirit_include_classic_core_hpp" >&6; }
+
+fi
+if test "x$ac_cv_header_boost_spirit_include_classic_core_hpp" = x""yes; then
+  :
+else
+  { { $as_echo "$as_me:$LINENO: error: boost/spirit/include/classic_core.hpp not found. install boost >= 1.38" >&5
+$as_echo "$as_me: error: boost/spirit/include/classic_core.hpp not found. install boost >= 1.38" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+   if test "${ac_cv_header_boost_function_hpp+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for boost/function.hpp" >&5
+$as_echo_n "checking for boost/function.hpp... " >&6; }
+if test "${ac_cv_header_boost_function_hpp+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_function_hpp" >&5
+$as_echo "$ac_cv_header_boost_function_hpp" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking boost/function.hpp usability" >&5
+$as_echo_n "checking boost/function.hpp usability... " >&6; }
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_header_compiler=no
+fi
 
-   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 :
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking boost/function.hpp presence" >&5
+$as_echo_n "checking boost/function.hpp presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <boost/function.hpp>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
 else
-  as_fn_error "boost/spirit/include/classic_core.hpp not found. install boost >= 1.38" "$LINENO" 5
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
 fi
 
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: boost/function.hpp: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: boost/function.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: boost/function.hpp: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: boost/function.hpp: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: boost/function.hpp: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: boost/function.hpp: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: boost/function.hpp:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: boost/function.hpp:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: boost/function.hpp: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: boost/function.hpp: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: boost/function.hpp:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: boost/function.hpp:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: boost/function.hpp: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: boost/function.hpp: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: boost/function.hpp: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: boost/function.hpp: in the future, the compiler will take precedence" >&2;}
 
-   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 :
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for boost/function.hpp" >&5
+$as_echo_n "checking for boost/function.hpp... " >&6; }
+if test "${ac_cv_header_boost_function_hpp+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_boost_function_hpp=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_function_hpp" >&5
+$as_echo "$ac_cv_header_boost_function_hpp" >&6; }
 
+fi
+if test "x$ac_cv_header_boost_function_hpp" = x""yes; then
+  :
 else
-  as_fn_error "boost/function.hpp not found. install boost" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: boost/function.hpp not found. install boost" >&5
+$as_echo "$as_me: error: boost/function.hpp not found. install boost" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
 
    save_CXXFLAGS=$CXXFLAGS
    CXXFLAGS="$CXXFLAGS -fno-exceptions"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether boost/function.hpp compiles with -fno-exceptions" >&5
+   { $as_echo "$as_me:$LINENO: checking whether boost/function.hpp compiles with -fno-exceptions" >&5
 $as_echo_n "checking whether boost/function.hpp compiles with -fno-exceptions... " >&6; }
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <boost/function.hpp>
 
@@ -14095,17 +17770,40 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_cxx_boost_no_exceptons_broken=no
 else
-  ac_cv_cxx_boost_no_exceptons_broken=yes
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_cxx_boost_no_exceptons_broken=yes
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
    if test "$ac_cv_cxx_boost_no_exceptons_broken" = "yes"; then
-	as_fn_error "no, see https://bugzilla.redhat.com/show_bug.cgi?id=477131" "$LINENO" 5
+	{ { $as_echo "$as_me:$LINENO: error: no, see https://bugzilla.redhat.com/show_bug.cgi?id=477131" >&5
+$as_echo "$as_me: error: no, see https://bugzilla.redhat.com/show_bug.cgi?id=477131" >&2;}
+   { (exit 1); exit 1; }; }
    else
-  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+  	{ $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
    fi
    CXXFLAGS=$save_CXXFLAGS
@@ -14116,18 +17814,18 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+   { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
    BUILD_TYPE="$BUILD_TYPE BOOST"
    SYSTEM_BOOST=NO
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which vigra to use" >&5
+{ $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+   { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
    SYSTEM_VIGRA=YES
    ac_ext=cpp
@@ -14136,11 +17834,139 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   ac_fn_cxx_check_header_mongrel "$LINENO" "vigra/copyimage.hxx" "ac_cv_header_vigra_copyimage_hxx" "$ac_includes_default"
-if test "x$ac_cv_header_vigra_copyimage_hxx" = x""yes; then :
+   if test "${ac_cv_header_vigra_copyimage_hxx+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for vigra/copyimage.hxx" >&5
+$as_echo_n "checking for vigra/copyimage.hxx... " >&6; }
+if test "${ac_cv_header_vigra_copyimage_hxx+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_vigra_copyimage_hxx" >&5
+$as_echo "$ac_cv_header_vigra_copyimage_hxx" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking vigra/copyimage.hxx usability" >&5
+$as_echo_n "checking vigra/copyimage.hxx usability... " >&6; }
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking vigra/copyimage.hxx presence" >&5
+$as_echo_n "checking vigra/copyimage.hxx presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <vigra/copyimage.hxx>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: vigra/copyimage.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: vigra/copyimage.hxx: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: vigra/copyimage.hxx: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: vigra/copyimage.hxx:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: vigra/copyimage.hxx: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: vigra/copyimage.hxx:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: vigra/copyimage.hxx: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: vigra/copyimage.hxx: in the future, the compiler will take precedence" >&2;}
 
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for vigra/copyimage.hxx" >&5
+$as_echo_n "checking for vigra/copyimage.hxx... " >&6; }
+if test "${ac_cv_header_vigra_copyimage_hxx+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_vigra_copyimage_hxx=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_vigra_copyimage_hxx" >&5
+$as_echo "$ac_cv_header_vigra_copyimage_hxx" >&6; }
+
+fi
+if test "x$ac_cv_header_vigra_copyimage_hxx" = x""yes; then
+  :
 else
-  as_fn_error "vigra/copyimage.hxx not found. install vigra" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: vigra/copyimage.hxx not found. install vigra" >&5
+$as_echo "$as_me: error: vigra/copyimage.hxx not found. install vigra" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
@@ -14151,121 +17977,390 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+   { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
    BUILD_TYPE="$BUILD_TYPE VIGRA"
    SYSTEM_VIGRA=NO
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which odbc headers to use" >&5
+{ $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+   { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
    SYSTEM_ODBC_HEADERS=YES
 
-   ac_fn_c_check_header_mongrel "$LINENO" "sqlext.h" "ac_cv_header_sqlext_h" "$ac_includes_default"
-if test "x$ac_cv_header_sqlext_h" = x""yes; then :
+   if test "${ac_cv_header_sqlext_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for sqlext.h" >&5
+$as_echo_n "checking for sqlext.h... " >&6; }
+if test "${ac_cv_header_sqlext_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sqlext_h" >&5
+$as_echo "$ac_cv_header_sqlext_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking sqlext.h usability" >&5
+$as_echo_n "checking sqlext.h usability... " >&6; }
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking sqlext.h presence" >&5
+$as_echo_n "checking sqlext.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sqlext.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: sqlext.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: sqlext.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sqlext.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: sqlext.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: sqlext.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: sqlext.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sqlext.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: sqlext.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sqlext.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: sqlext.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sqlext.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: sqlext.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sqlext.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: sqlext.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sqlext.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: sqlext.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for sqlext.h" >&5
+$as_echo_n "checking for sqlext.h... " >&6; }
+if test "${ac_cv_header_sqlext_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_sqlext_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sqlext_h" >&5
+$as_echo "$ac_cv_header_sqlext_h" >&6; }
 
+fi
+if test "x$ac_cv_header_sqlext_h" = x""yes; then
+  :
 else
-  as_fn_error "odbc not found. install odbc" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: odbc not found. install odbc" >&5
+$as_echo "$as_me: error: odbc not found. install odbc" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+   { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
    SYSTEM_ODBC_HEADERS=NO
    BUILD_TYPE="$BUILD_TYPE UNIXODBC"
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable build of Mozilla/Mozilla NSS-using components" >&5
+{ $as_echo "$as_me:$LINENO: checking whether to enable build of Mozilla/Mozilla NSS-using components" >&5
 $as_echo_n "checking whether to enable build of Mozilla/Mozilla NSS-using components... " >&6; }
 if test "$enable_mozilla" = "no"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
    WITH_MOZILLA=NO
    ENABLE_NSS_MODULE=NO
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
    WITH_MOZILLA=YES
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Mozilla addressbook connectivity" >&5
+{ $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 elif test "$with_system_mozilla" = "yes"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, not possible with system-mozilla" >&5
+   { $as_echo "$as_me:$LINENO: result: no, not possible with system-mozilla" >&5
 $as_echo "no, not possible with system-mozilla" >&6; }
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build XML Security support" >&5
+{ $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, since Mozilla (NSS) disabled but needed" >&5
+   { $as_echo "$as_me:$LINENO: result: no, since Mozilla (NSS) disabled but needed" >&5
 $as_echo "no, since Mozilla (NSS) disabled but needed" >&6; }
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build LDAP configuration backend" >&5
+{ $as_echo "$as_me:$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
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+      { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
       WITH_LDAP=YES
    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no. Either Mozilla or OpenLDAP needed" >&5
+      { $as_echo "$as_me:$LINENO: result: no. Either Mozilla or OpenLDAP needed" >&5
 $as_echo "no. Either Mozilla or OpenLDAP needed" >&6; }
       WITH_LDAP=NO
    fi
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
    WITH_LDAP=NO
 fi
 
 if test "$WITH_LDAP" = "YES"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking which LDAP SDK to use" >&5
+            { $as_echo "$as_me:$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
-  	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: OpenLDAP" >&5
+  	   { $as_echo "$as_me:$LINENO: result: OpenLDAP" >&5
 $as_echo "OpenLDAP" >&6; }
 	   WITH_OPENLDAP=YES
-	   for ac_header in ldap.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "ldap.h" "ac_cv_header_ldap_h" "$ac_includes_default"
-if test "x$ac_cv_header_ldap_h" = x""yes; then :
+
+for ac_header in ldap.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* 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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LDAP_H 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  as_fn_error "ldap.h not found. install openldap libs" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: ldap.h not found. install openldap libs" >&5
+$as_echo "$as_me: error: ldap.h not found. install openldap libs" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 done
 
-	   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_simple_bind_s in -lldap" >&5
+
+{ $as_echo "$as_me:$LINENO: checking for ldap_simple_bind_s in -lldap" >&5
 $as_echo_n "checking for ldap_simple_bind_s in -lldap... " >&6; }
-if test "${ac_cv_lib_ldap_ldap_simple_bind_s+set}" = set; then :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -14283,18 +18378,43 @@ return ldap_simple_bind_s ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_ldap_ldap_simple_bind_s=yes
 else
-  ac_cv_lib_ldap_ldap_simple_bind_s=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_ldap_ldap_simple_bind_s=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_simple_bind_s" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_simple_bind_s" >&5
 $as_echo "$ac_cv_lib_ldap_ldap_simple_bind_s" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_simple_bind_s" = x""yes; then :
+if test "x$ac_cv_lib_ldap_ldap_simple_bind_s" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBLDAP 1
 _ACEOF
@@ -14302,19 +18422,26 @@ _ACEOF
   LIBS="-lldap $LIBS"
 
 else
-  as_fn_error "openldap lib not found or functional" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: openldap lib not found or functional" >&5
+$as_echo "$as_me: error: openldap lib not found or functional" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 	   # rumours say that OpenLDAP doesn't have that function. I looked and
 	   # it has it. Test for it to be sure
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_set_option in -lldap" >&5
+
+{ $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -14332,18 +18459,43 @@ return ldap_set_option ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_ldap_ldap_set_option=yes
 else
-  ac_cv_lib_ldap_ldap_set_option=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_ldap_ldap_set_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_set_option" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_set_option" >&5
 $as_echo "$ac_cv_lib_ldap_ldap_set_option" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_set_option" = x""yes; then :
+if test "x$ac_cv_lib_ldap_ldap_set_option" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBLDAP 1
 _ACEOF
@@ -14351,11 +18503,13 @@ _ACEOF
   LIBS="-lldap $LIBS"
 
 else
-  as_fn_error "openldap lib not found or functional" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: openldap lib not found or functional" >&5
+$as_echo "$as_me: error: openldap lib not found or functional" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
    else
-	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: Netscape/Mozilla" >&5
+	   { $as_echo "$as_me:$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
@@ -14365,15 +18519,15 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which mozilla to use" >&5
+{ $as_echo "$as_me:$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
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+    { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
     SYSTEM_MOZILLA=YES
     ENABLE_NSS_MODULE=NO
     enable_nss_module=no
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking which Mozilla flavour to use" >&5
+    { $as_echo "$as_me:$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
@@ -14389,7 +18543,7 @@ $as_echo_n "checking which Mozilla flavour to use... " >&6; }
       MOZ_FLAVOUR=libxul
     fi
     tmp=`echo $MOZ_FLAVOUR | $PERL -e 'print ucfirst(<STDIN>);'`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tmp" >&5
+    { $as_echo "$as_me:$LINENO: result: $tmp" >&5
 $as_echo "$tmp" >&6; }
 
 
@@ -14398,9 +18552,9 @@ $as_echo "$tmp" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -14413,14 +18567,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -14429,10 +18583,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -14447,24 +18601,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nss" >&5
+        { $as_echo "$as_me:$LINENO: checking for nss" >&5
 $as_echo_n "checking for nss... " >&6; }
 
         if $PKG_CONFIG --exists "nss" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSS_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking MOZ_NSS_CFLAGS" >&5
 $as_echo_n "checking MOZ_NSS_CFLAGS... " >&6; }
             MOZ_NSS_CFLAGS=`$PKG_CONFIG --cflags "nss"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSS_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $MOZ_NSS_CFLAGS" >&5
 $as_echo "$MOZ_NSS_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSS_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking MOZ_NSS_LIBS" >&5
 $as_echo_n "checking MOZ_NSS_LIBS... " >&6; }
             MOZ_NSS_LIBS=`$PKG_CONFIG --libs "nss"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSS_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $MOZ_NSS_LIBS" >&5
 $as_echo "$MOZ_NSS_LIBS" >&6; }
         else
             MOZ_NSS_CFLAGS=""
@@ -14496,9 +18650,9 @@ $as_echo "$MOZ_NSS_LIBS" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -14511,14 +18665,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -14527,10 +18681,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -14545,24 +18699,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $MOZ_FLAVOUR-nss " >&5
+        { $as_echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nss " >&5
 $as_echo_n "checking for $MOZ_FLAVOUR-nss ... " >&6; }
 
         if $PKG_CONFIG --exists "$MOZ_FLAVOUR-nss " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSS_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking MOZ_NSS_CFLAGS" >&5
 $as_echo_n "checking MOZ_NSS_CFLAGS... " >&6; }
             MOZ_NSS_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nss "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSS_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $MOZ_NSS_CFLAGS" >&5
 $as_echo "$MOZ_NSS_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSS_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking MOZ_NSS_LIBS" >&5
 $as_echo_n "checking MOZ_NSS_LIBS... " >&6; }
             MOZ_NSS_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nss "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSS_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $MOZ_NSS_LIBS" >&5
 $as_echo "$MOZ_NSS_LIBS" >&6; }
         else
             MOZ_NSS_CFLAGS=""
@@ -14584,7 +18738,9 @@ $as_echo "$MOZ_NSS_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error "Library requirements ($MOZ_FLAVOUR-nss ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     { { $as_echo "$as_me:$LINENO: error: Library requirements ($MOZ_FLAVOUR-nss ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+$as_echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nss ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
   fi
 
     else
@@ -14599,9 +18755,9 @@ $as_echo "$MOZ_NSS_LIBS" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -14614,14 +18770,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -14630,10 +18786,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -14648,24 +18804,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nspr " >&5
+        { $as_echo "$as_me:$LINENO: checking for nspr " >&5
 $as_echo_n "checking for nspr ... " >&6; }
 
         if $PKG_CONFIG --exists "nspr " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSPR_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking MOZ_NSPR_CFLAGS" >&5
 $as_echo_n "checking MOZ_NSPR_CFLAGS... " >&6; }
             MOZ_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSPR_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $MOZ_NSPR_CFLAGS" >&5
 $as_echo "$MOZ_NSPR_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSPR_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking MOZ_NSPR_LIBS" >&5
 $as_echo_n "checking MOZ_NSPR_LIBS... " >&6; }
             MOZ_NSPR_LIBS=`$PKG_CONFIG --libs "nspr "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSPR_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $MOZ_NSPR_LIBS" >&5
 $as_echo "$MOZ_NSPR_LIBS" >&6; }
         else
             MOZ_NSPR_CFLAGS=""
@@ -14687,7 +18843,9 @@ $as_echo "$MOZ_NSPR_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error "Library requirements (nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     { { $as_echo "$as_me:$LINENO: error: Library requirements (nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+$as_echo "$as_me: error: Library requirements (nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
   fi
 
       NSPR_LIB="-L`$PKG_CONFIG --variable=libdir nspr`"
@@ -14699,9 +18857,9 @@ $as_echo "$MOZ_NSPR_LIBS" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -14714,14 +18872,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -14730,10 +18888,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -14748,24 +18906,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $MOZ_FLAVOUR-nspr " >&5
+        { $as_echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nspr " >&5
 $as_echo_n "checking for $MOZ_FLAVOUR-nspr ... " >&6; }
 
         if $PKG_CONFIG --exists "$MOZ_FLAVOUR-nspr " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSPR_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking MOZ_NSPR_CFLAGS" >&5
 $as_echo_n "checking MOZ_NSPR_CFLAGS... " >&6; }
             MOZ_NSPR_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nspr "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSPR_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $MOZ_NSPR_CFLAGS" >&5
 $as_echo "$MOZ_NSPR_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSPR_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking MOZ_NSPR_LIBS" >&5
 $as_echo_n "checking MOZ_NSPR_LIBS... " >&6; }
             MOZ_NSPR_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nspr "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSPR_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $MOZ_NSPR_LIBS" >&5
 $as_echo "$MOZ_NSPR_LIBS" >&6; }
         else
             MOZ_NSPR_CFLAGS=""
@@ -14787,7 +18945,9 @@ $as_echo "$MOZ_NSPR_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error "Library requirements ($MOZ_FLAVOUR-nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     { { $as_echo "$as_me:$LINENO: error: Library requirements ($MOZ_FLAVOUR-nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+$as_echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
   fi
 
     fi
@@ -14799,9 +18959,9 @@ $as_echo "$MOZ_NSPR_LIBS" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -14814,14 +18974,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -14830,10 +18990,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -14848,24 +19008,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $MOZ_FLAVOUR-xpcom" >&5
+        { $as_echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-xpcom" >&5
 $as_echo_n "checking for $MOZ_FLAVOUR-xpcom... " >&6; }
 
         if $PKG_CONFIG --exists "$MOZ_FLAVOUR-xpcom" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZILLAXPCOM_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5
 $as_echo_n "checking MOZILLAXPCOM_CFLAGS... " >&6; }
             MOZILLAXPCOM_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-xpcom"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZILLAXPCOM_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5
 $as_echo "$MOZILLAXPCOM_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZILLAXPCOM_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5
 $as_echo_n "checking MOZILLAXPCOM_LIBS... " >&6; }
             MOZILLAXPCOM_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-xpcom"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZILLAXPCOM_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5
 $as_echo "$MOZILLAXPCOM_LIBS" >&6; }
         else
             MOZILLAXPCOM_CFLAGS=""
@@ -14901,9 +19061,9 @@ $as_echo "$MOZILLAXPCOM_LIBS" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -14916,14 +19076,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -14932,10 +19092,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -14950,24 +19110,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxul " >&5
+        { $as_echo "$as_me:$LINENO: checking for libxul " >&5
 $as_echo_n "checking for libxul ... " >&6; }
 
         if $PKG_CONFIG --exists "libxul " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZILLAXPCOM_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5
 $as_echo_n "checking MOZILLAXPCOM_CFLAGS... " >&6; }
             MOZILLAXPCOM_CFLAGS=`$PKG_CONFIG --cflags "libxul "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZILLAXPCOM_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5
 $as_echo "$MOZILLAXPCOM_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZILLAXPCOM_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5
 $as_echo_n "checking MOZILLAXPCOM_LIBS... " >&6; }
             MOZILLAXPCOM_LIBS=`$PKG_CONFIG --libs "libxul "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZILLAXPCOM_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5
 $as_echo "$MOZILLAXPCOM_LIBS" >&6; }
         else
             MOZILLAXPCOM_CFLAGS=""
@@ -14989,7 +19149,9 @@ $as_echo "$MOZILLAXPCOM_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error "Library requirements (libxul ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     { { $as_echo "$as_me:$LINENO: error: Library requirements (libxul ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+$as_echo "$as_me: error: Library requirements (libxul ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
   fi
 
       MOZ_INC=`$PKG_CONFIG --variable=includedir libxul`
@@ -15007,14 +19169,19 @@ $as_echo "$MOZILLAXPCOM_LIBS" >&6; }
     save_LIBS="$LIBS"
     CPPFLAGS="$CPPFLAGS $MOZ_NSS_CFLAGS"
     LDFLAGS="$LDFLAGS $MOZ_NSS_LIBS"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PK11_GetCertFromPrivateKey in -lnss3" >&5
+
+{ $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -15032,18 +19199,43 @@ return PK11_GetCertFromPrivateKey ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_nss3_PK11_GetCertFromPrivateKey=yes
 else
-  ac_cv_lib_nss3_PK11_GetCertFromPrivateKey=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_nss3_PK11_GetCertFromPrivateKey=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&5
 $as_echo "$ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&6; }
-if test "x$ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" = x""yes; then :
+if test "x$ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBNSS3 1
 _ACEOF
@@ -15051,9 +19243,13 @@ _ACEOF
   LIBS="-lnss3 $LIBS"
 
 else
-  as_fn_error "PK11_GetCertFromPrivateKey missing but needed.
+  { { $as_echo "$as_me:$LINENO: error: PK11_GetCertFromPrivateKey missing but needed.
+See https://bugzilla.mozilla.org/show_bug.cgi?id=262274.
+Fixed since nss 3.9.3 (contained by e.g. mozilla >= 1.7.5)" >&5
+$as_echo "$as_me: error: PK11_GetCertFromPrivateKey missing but needed.
 See https://bugzilla.mozilla.org/show_bug.cgi?id=262274.
-Fixed since nss 3.9.3 (contained by e.g. mozilla >= 1.7.5)" "$LINENO" 5
+Fixed since nss 3.9.3 (contained by e.g. mozilla >= 1.7.5)" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
     LDFLAGS="$save_LDFLAGS"
@@ -15062,16 +19258,20 @@ fi
 
     MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS
     if test "$WITH_LDAP" != "NO" && test "$WITH_OPENLDAP" != "YES"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $tmp was compiled with --enable-ldap" >&5
+      { $as_echo "$as_me:$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
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+         { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
          MOZ_LDAP_CFLAGS="-I$MOZ_INC"
       else
-        as_fn_error "no.
+        { { $as_echo "$as_me:$LINENO: error: no.
+Could not find LDAP header include files in $MOZ_INC/ldap.
+Please recompile $tmp with --enable-ldap or use --with-openldap." >&5
+$as_echo "$as_me: error: no.
 Could not find LDAP header include files in $MOZ_INC/ldap.
-Please recompile $tmp with --enable-ldap or use --with-openldap." "$LINENO" 5
+Please recompile $tmp with --enable-ldap or use --with-openldap." >&2;}
+   { (exit 1); exit 1; }; }
       fi
     fi
 
@@ -15082,47 +19282,47 @@ Please recompile $tmp with --enable-ldap or use --with-openldap." "$LINENO" 5
     fi
 
 elif test "$enable_mozilla" = "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+    { $as_echo "$as_me:$LINENO: result: none" >&5
 $as_echo "none" >&6; }
     WITH_MOZILLA=NO
     ENABLE_NSS_MODULE=NO
     enable_nss_module=no
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+    { $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking which mozilla version to build" >&5
+   { $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZILLA_VERSION" >&5
+   { $as_echo "$as_me:$LINENO: result: $MOZILLA_VERSION" >&5
 $as_echo "$MOZILLA_VERSION" >&6; }
 fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for toolkit mozilla should use" >&5
+{ $as_echo "$as_me:$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
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: mac" >&5
+         { $as_echo "$as_me:$LINENO: result: mac" >&5
 $as_echo "mac" >&6; }
       else
          MOZILLA_TOOLKIT=gtk2
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: gtk2" >&5
+         { $as_echo "$as_me:$LINENO: result: gtk2" >&5
 $as_echo "gtk2" >&6; }
       fi
    fi
 else
    MOZILLA_TOOLKIT=$with_mozilla_toolkit
    enable_build_mozilla=1
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZILLA_TOOLKIT" >&5
+   { $as_echo "$as_me:$LINENO: result: $MOZILLA_TOOLKIT" >&5
 $as_echo "$MOZILLA_TOOLKIT" >&6; }
 fi
 #if test "$_os" = "Darwin" && test "$MOZILLA_TOOLKIT" != "gtk2"; then
@@ -15140,46 +19340,54 @@ else
       enable_build_mozilla=
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Mozilla/SeaMonkey" >&5
+{ $as_echo "$as_me:$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"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 else
    BUILD_MOZAB=""
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build provided NSS module" >&5
+{ $as_echo "$as_me:$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"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
    if test "$_os" = "WINNT"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mozilla build tooling" >&5
+      { $as_echo "$as_me:$LINENO: checking for Mozilla build tooling" >&5
 $as_echo_n "checking for Mozilla build tooling... " >&6; }
       if test -z "$MOZILLABUILD" ; then
-as_fn_error "Mozilla build tooling not found.
+{ { $as_echo "$as_me:$LINENO: error: Mozilla build tooling not found.
 Use the --with-mozilla-build option after installling the tools obtained
-from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32" "$LINENO" 5
+from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32" >&5
+$as_echo "$as_me: error: Mozilla build tooling not found.
+Use the --with-mozilla-build option after installling the tools obtained
+from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32" >&2;}
+   { (exit 1); exit 1; }; }
       else
          if test \( "$WITH_MINGWIN" = "yes" \) ; then
             if test ! -d "$MOZILLABUILD" ; then
-as_fn_error "Mozilla build tooling incomplete!" "$LINENO" 5
+{ { $as_echo "$as_me:$LINENO: error: Mozilla build tooling incomplete!" >&5
+$as_echo "$as_me: error: Mozilla build tooling incomplete!" >&2;}
+   { (exit 1); exit 1; }; }
             else
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+               { $as_echo "$as_me:$LINENO: result: ok" >&5
 $as_echo "ok" >&6; }
             fi
          else
             if test ! -d "$MOZILLABUILD/moztools" \
                -o ! -d "$MOZILLABUILD/msys" ; then
-as_fn_error "Mozilla build tooling incomplete!" "$LINENO" 5
+{ { $as_echo "$as_me:$LINENO: error: Mozilla build tooling incomplete!" >&5
+$as_echo "$as_me: error: Mozilla build tooling incomplete!" >&2;}
+   { (exit 1); exit 1; }; }
             else
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+               { $as_echo "$as_me:$LINENO: result: ok" >&5
 $as_echo "ok" >&6; }
             fi
          fi
@@ -15187,7 +19395,7 @@ $as_echo "ok" >&6; }
    fi
 else
    ENABLE_NSS_MODULE="NO"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -15196,10 +19404,12 @@ if test "$BUILD_MOZAB" = "TRUE"; then
     if test "$WITH_MINGWIN" != "yes"; then
       # compiling with MSVC. Only supported platform here is MSVS2005 at the moment.
       if test "$MSVSVER" != "2005"; then
-        as_fn_error "Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only." "$LINENO" 5
+        { { $as_echo "$as_me:$LINENO: error: Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only." >&5
+$as_echo "$as_me: error: Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only." >&2;}
+   { (exit 1); exit 1; }; }
       fi
     else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Building SeaMonkey with mingwin is not tested, and likely to break." >&5
+      { $as_echo "$as_me:$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
@@ -15210,48 +19420,54 @@ $as_echo "$as_me: WARNING: Building SeaMonkey with mingwin is not tested, and li
    fi
    MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source"
    MOZILLA_FETCH_FILE=`grep $MOZILLA_SOURCE_VERSION ooo.lst`
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mozilla sources" >&5
+   { $as_echo "$as_me:$LINENO: checking for mozilla sources" >&5
 $as_echo_n "checking for mozilla sources... " >&6; }
    if test -z "$MOZILLA_FETCH_FILE"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+      { $as_echo "$as_me:$LINENO: result: not found" >&5
 $as_echo "not found" >&6; }
       HAVE_MOZILLA_TARBALL=n
    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $MOZILLA_FETCH_FILE" >&5
+      { $as_echo "$as_me:$LINENO: checking for $MOZILLA_FETCH_FILE" >&5
 $as_echo_n "checking for $MOZILLA_FETCH_FILE... " >&6; }
       if test ! -e "$TARFILE_LOCATION/$MOZILLA_FETCH_FILE"; then
          if test -z "$DO_FETCH"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: will be fetched" >&5
+            { $as_echo "$as_me:$LINENO: result: will be fetched" >&5
 $as_echo "will be fetched" >&6; }
             HAVE_MOZILLA_TARBALL=y
          else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+            { $as_echo "$as_me:$LINENO: result: not found" >&5
 $as_echo "not found" >&6; }
             HAVE_MOZILLA_TARBALL=n
          fi
       else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+         { $as_echo "$as_me:$LINENO: result: found" >&5
 $as_echo "found" >&6; }
          HAVE_MOZILLA_TARBALL=y
       fi
    fi
    if test "$HAVE_MOZILLA_TARBALL" != "y"; then
-      as_fn_error "Mozilla/SeaMonkey source archive not found.
-Use \"./fetch_tarballs.sh ooo.lst\" to download." "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: Mozilla/SeaMonkey source archive not found.
+Use \"./fetch_tarballs.sh ooo.lst\" to download." >&5
+$as_echo "$as_me: error: Mozilla/SeaMonkey source archive not found.
+Use \"./fetch_tarballs.sh ooo.lst\" to download." >&2;}
+   { (exit 1); exit 1; }; }
    fi
    if test "$_os" = "WINNT"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for moztools binaries" >&5
+      { $as_echo "$as_me:$LINENO: checking for moztools binaries" >&5
 $as_echo_n "checking for moztools binaries... " >&6; }
       if test ! -e "$TARFILE_LOCATION/vc8-moztools.zip" ; then
-        as_fn_error "The following file is missing in $TARFILE_LOCATION: vc8-moztools.zip
-(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)" "$LINENO" 5
+        { { $as_echo "$as_me:$LINENO: error: The following file is missing in $TARFILE_LOCATION: vc8-moztools.zip
+(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)" >&5
+$as_echo "$as_me: error: The following file is missing in $TARFILE_LOCATION: vc8-moztools.zip
+(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)" >&2;}
+   { (exit 1); exit 1; }; }
       else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+         { $as_echo "$as_me:$LINENO: result: ok" >&5
 $as_echo "ok" >&6; }
       fi
    elif test "$_os" = "Darwin"; then
       if test "$MOZILLA_TOOLKIT" = "gtk2"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mozilla can be built..." >&5
+         { $as_echo "$as_me:$LINENO: checking whether mozilla can be built..." >&5
 $as_echo "$as_me: checking whether mozilla can be built..." >&6;}
 
   succeeded=no
@@ -15259,9 +19475,9 @@ $as_echo "$as_me: checking whether mozilla can be built..." >&6;}
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -15274,14 +19490,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -15290,10 +19506,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -15308,24 +19524,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8" >&5
+        { $as_echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8" >&5
 $as_echo_n "checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8... " >&6; }
 
         if $PKG_CONFIG --exists "gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZGTK2_CFLAGS" >&5
+            { $as_echo "$as_me:$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"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZGTK2_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $MOZGTK2_CFLAGS" >&5
 $as_echo "$MOZGTK2_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZGTK2_LIBS" >&5
+            { $as_echo "$as_me:$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"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZGTK2_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $MOZGTK2_LIBS" >&5
 $as_echo "$MOZGTK2_LIBS" >&6; }
         else
             MOZGTK2_CFLAGS=""
@@ -15345,10 +19561,12 @@ $as_echo "$MOZGTK2_LIBS" >&6; }
   fi
 
   if test $succeeded = yes; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: OK - can build mozilla" >&5
+     { $as_echo "$as_me:$LINENO: OK - can build mozilla" >&5
 $as_echo "$as_me: OK - can build mozilla" >&6;}
   else
-     as_fn_error "Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages" "$LINENO" 5
+     { { $as_echo "$as_me:$LINENO: error: Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages" >&5
+$as_echo "$as_me: error: Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages" >&2;}
+   { (exit 1); exit 1; }; }
   fi
 
       else
@@ -15358,9 +19576,9 @@ $as_echo "$as_me: OK - can build mozilla" >&6;}
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -15373,14 +19591,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -15389,10 +19607,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -15407,24 +19625,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libIDL-2.0 >= 0.6.3" >&5
+        { $as_echo "$as_me:$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
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
 $as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; }
             MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.6.3"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
 $as_echo "$MOZLIBREQ_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
 $as_echo_n "checking MOZLIBREQ_LIBS... " >&6; }
             MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libIDL-2.0 >= 0.6.3"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
 $as_echo "$MOZLIBREQ_LIBS" >&6; }
         else
             MOZLIBREQ_CFLAGS=""
@@ -15450,7 +19668,9 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; }
   fi
 
          if test -z "$MOZIDL"; then
-            as_fn_error "libIDL 0.6.3 or newer is needed to build mozilla with mac toolkit." "$LINENO" 5
+            { { $as_echo "$as_me:$LINENO: error: libIDL 0.6.3 or newer is needed to build mozilla with mac toolkit." >&5
+$as_echo "$as_me: error: libIDL 0.6.3 or newer is needed to build mozilla with mac toolkit." >&2;}
+   { (exit 1); exit 1; }; }
          fi
       fi
    else
@@ -15462,9 +19682,9 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -15477,14 +19697,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -15493,10 +19713,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -15511,24 +19731,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0" >&5
+        { $as_echo "$as_me:$LINENO: checking for gtk+-2.0" >&5
 $as_echo_n "checking for gtk+-2.0... " >&6; }
 
         if $PKG_CONFIG --exists "gtk+-2.0" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
 $as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; }
             MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
 $as_echo "$MOZLIBREQ_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
 $as_echo_n "checking MOZLIBREQ_LIBS... " >&6; }
             MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "gtk+-2.0"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
 $as_echo "$MOZLIBREQ_LIBS" >&6; }
         else
             MOZLIBREQ_CFLAGS=""
@@ -15554,7 +19774,9 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; }
   fi
 
          if test -z "$MOZGTK"; then
-            as_fn_error "GTK2 is needed to build mozilla." "$LINENO" 5
+            { { $as_echo "$as_me:$LINENO: error: GTK2 is needed to build mozilla." >&5
+$as_echo "$as_me: error: GTK2 is needed to build mozilla." >&2;}
+   { (exit 1); exit 1; }; }
          fi
 
   succeeded=no
@@ -15562,9 +19784,9 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -15577,14 +19799,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -15593,10 +19815,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -15611,24 +19833,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libIDL-2.0 >= 0.8.0" >&5
+        { $as_echo "$as_me:$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
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
 $as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; }
             MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
 $as_echo "$MOZLIBREQ_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
 $as_echo_n "checking MOZLIBREQ_LIBS... " >&6; }
             MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libIDL-2.0 >= 0.8.0"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
 $as_echo "$MOZLIBREQ_LIBS" >&6; }
         else
             MOZLIBREQ_CFLAGS=""
@@ -15654,7 +19876,9 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; }
   fi
 
          if test -z "$MOZIDL"; then
-            as_fn_error "libIDL >= 0.8.0 is needed when using GTK2 to build mozilla." "$LINENO" 5
+            { { $as_echo "$as_me:$LINENO: error: libIDL >= 0.8.0 is needed when using GTK2 to build mozilla." >&5
+$as_echo "$as_me: error: libIDL >= 0.8.0 is needed when using GTK2 to build mozilla." >&2;}
+   { (exit 1); exit 1; }; }
          fi
       else
 
@@ -15663,9 +19887,9 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -15678,14 +19902,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -15694,10 +19918,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -15712,24 +19936,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+ >= 1.2.3" >&5
+        { $as_echo "$as_me:$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
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5
 $as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; }
             MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "gtk+ >= 1.2.3"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
 $as_echo "$MOZLIBREQ_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5
 $as_echo_n "checking MOZLIBREQ_LIBS... " >&6; }
             MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "gtk+ >= 1.2.3"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
 $as_echo "$MOZLIBREQ_LIBS" >&6; }
         else
             MOZLIBREQ_CFLAGS=""
@@ -15755,7 +19979,9 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; }
   fi
 
          if test -z "$MOZGTK"; then
-            as_fn_error "gtk 1.2 is needed when not using GTK2 to build mozilla." "$LINENO" 5
+            { { $as_echo "$as_me:$LINENO: error: gtk 1.2 is needed when not using GTK2 to build mozilla." >&5
+$as_echo "$as_me: error: gtk 1.2 is needed when not using GTK2 to build mozilla." >&2;}
+   { (exit 1); exit 1; }; }
          fi
 
   succeeded=no
@@ -15763,9 +19989,9 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -15778,14 +20004,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -15794,10 +20020,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -15812,24 +20038,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libidl >= 0.6.3 libidl <= 0.6.8" >&5
+        { $as_echo "$as_me:$LINENO: checking for libidl >= 0.6.3 libidl <= 0.6.8" >&5
 $as_echo_n "checking for libidl >= 0.6.3 libidl <= 0.6.8... " >&6; }
 
         if $PKG_CONFIG --exists "libidl >= 0.6.3 libidl <= 0.6.8" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_CFLAGS" >&5
+            { $as_echo "$as_me:$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"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5
 $as_echo "$MOZLIBREQ_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_LIBS" >&5
+            { $as_echo "$as_me:$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"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5
 $as_echo "$MOZLIBREQ_LIBS" >&6; }
         else
             MOZLIBREQ_CFLAGS=""
@@ -15855,7 +20081,9 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; }
   fi
 
          if test -z "$MOZIDL"; then
-            as_fn_error "libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." "$LINENO" 5
+            { { $as_echo "$as_me:$LINENO: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&5
+$as_echo "$as_me: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&2;}
+   { (exit 1); exit 1; }; }
          fi
       fi
    fi
@@ -15875,34 +20103,162 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which sane header to use" >&5
+{ $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+   { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
    SYSTEM_SANE_HEADER=YES
-   ac_fn_c_check_header_mongrel "$LINENO" "sane/sane.h" "ac_cv_header_sane_sane_h" "$ac_includes_default"
-if test "x$ac_cv_header_sane_sane_h" = x""yes; then :
+   if test "${ac_cv_header_sane_sane_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for sane/sane.h" >&5
+$as_echo_n "checking for sane/sane.h... " >&6; }
+if test "${ac_cv_header_sane_sane_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5
+$as_echo "$ac_cv_header_sane_sane_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking sane/sane.h usability" >&5
+$as_echo_n "checking sane/sane.h usability... " >&6; }
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking sane/sane.h presence" >&5
+$as_echo_n "checking sane/sane.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sane/sane.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: sane/sane.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: sane/sane.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: sane/sane.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: sane/sane.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: sane/sane.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: sane/sane.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: sane/sane.h: in the future, the compiler will take precedence" >&2;}
 
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for sane/sane.h" >&5
+$as_echo_n "checking for sane/sane.h... " >&6; }
+if test "${ac_cv_header_sane_sane_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  as_fn_error "sane not found. install sane" "$LINENO" 5
+  ac_cv_header_sane_sane_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5
+$as_echo "$ac_cv_header_sane_sane_h" >&6; }
+
+fi
+if test "x$ac_cv_header_sane_sane_h" = x""yes; then
+  :
+else
+  { { $as_echo "$as_me:$LINENO: error: sane not found. install sane" >&5
+$as_echo "$as_me: error: sane not found. install sane" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+   { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
    SYSTEM_SANE_HEADER=NO
    BUILD_TYPE="$BUILD_TYPE SANE"
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which icu to use" >&5
+{ $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+   { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
    SYSTEM_ICU=YES
    ac_ext=cpp
@@ -15911,24 +20267,50 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unicode/rbbi.h" >&5
+   { $as_echo "$as_me:$LINENO: checking for unicode/rbbi.h" >&5
 $as_echo_n "checking for unicode/rbbi.h... " >&6; }
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 unicode/rbbi.h
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked." >&5
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  { $as_echo "$as_me:$LINENO: result: checked." >&5
 $as_echo "checked." >&6; }
 else
-  as_fn_error "icu headers not found." "$LINENO" 5
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  { { $as_echo "$as_me:$LINENO: error: icu headers not found." >&5
+$as_echo "$as_me: error: icu headers not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
+
 rm -f conftest.err conftest.$ac_ext
    # Extract the first word of "genbrk", so it can be a program name with args.
 set dummy genbrk; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_SYSTEM_GENBRK+set}" = set; then :
+if test "${ac_cv_path_SYSTEM_GENBRK+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $SYSTEM_GENBRK in
@@ -15942,14 +20324,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -15957,22 +20339,24 @@ esac
 fi
 SYSTEM_GENBRK=$ac_cv_path_SYSTEM_GENBRK
 if test -n "$SYSTEM_GENBRK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSTEM_GENBRK" >&5
+  { $as_echo "$as_me:$LINENO: result: $SYSTEM_GENBRK" >&5
 $as_echo "$SYSTEM_GENBRK" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
    if test -z "$SYSTEM_GENBRK"; then
-      as_fn_error "\\"genbrk\\" not found in \$PATH, install the icu development tool \\"genbrk\"\" "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: \\"genbrk\\" not found in \$PATH, install the icu development tool \\"genbrk\"\" >&5
+$as_echo "$as_me: error: \\"genbrk\\" not found in \$PATH, install the icu development tool \\"genbrk\"\" >&2;}
+   { (exit 1); exit 1; }; }
    fi
    # Extract the first word of "genccode", so it can be a program name with args.
 set dummy genccode; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_SYSTEM_GENCCODE+set}" = set; then :
+if test "${ac_cv_path_SYSTEM_GENCCODE+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $SYSTEM_GENCCODE in
@@ -15986,14 +20370,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -16001,22 +20385,24 @@ esac
 fi
 SYSTEM_GENCCODE=$ac_cv_path_SYSTEM_GENCCODE
 if test -n "$SYSTEM_GENCCODE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSTEM_GENCCODE" >&5
+  { $as_echo "$as_me:$LINENO: result: $SYSTEM_GENCCODE" >&5
 $as_echo "$SYSTEM_GENCCODE" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
    if test -z "$SYSTEM_GENCCODE"; then
-      as_fn_error "\\"genccode\\" not found in \$PATH, install the icu development tool \\"genccode\"\" "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: \\"genccode\\" not found in \$PATH, install the icu development tool \\"genccode\"\" >&5
+$as_echo "$as_me: error: \\"genccode\\" not found in \$PATH, install the icu development tool \\"genccode\"\" >&2;}
+   { (exit 1); exit 1; }; }
    fi
    # Extract the first word of "gencmn", so it can be a program name with args.
 set dummy gencmn; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_SYSTEM_GENCMN+set}" = set; then :
+if test "${ac_cv_path_SYSTEM_GENCMN+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $SYSTEM_GENCMN in
@@ -16030,14 +20416,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -16045,26 +20431,35 @@ esac
 fi
 SYSTEM_GENCMN=$ac_cv_path_SYSTEM_GENCMN
 if test -n "$SYSTEM_GENCMN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSTEM_GENCMN" >&5
+  { $as_echo "$as_me:$LINENO: result: $SYSTEM_GENCMN" >&5
 $as_echo "$SYSTEM_GENCMN" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
    if test -z "$SYSTEM_GENCMN"; then
-      as_fn_error "\\"gencmn\\" not found in \$PATH, install the icu development tool \\"gencmn\"\" "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: \\"gencmn\\" not found in \$PATH, install the icu development tool \\"gencmn\"\" >&5
+$as_echo "$as_me: error: \\"gencmn\\" not found in \$PATH, install the icu development tool \\"gencmn\"\" >&2;}
+   { (exit 1); exit 1; }; }
    fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking ICU version" >&5
+   { $as_echo "$as_me:$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
+      if test "$cross_compiling" = yes; then
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_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
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <unicode/uversion.h>
@@ -16077,16 +20472,45 @@ int main(int argc, char **argv) {
 }
 
 _ACEOF
-if ac_fn_cxx_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  { $as_echo "$as_me:$LINENO: result: OK" >&5
 $as_echo "OK" >&6; }
 else
-  as_fn_error "not suitable, only >= 4.0 supported currently" "$LINENO" 5
+  $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
+
+( exit $ac_status )
+{ { $as_echo "$as_me:$LINENO: error: not suitable, only >= 4.0 supported currently" >&5
+$as_echo "$as_me: error: not suitable, only >= 4.0 supported currently" >&2;}
+   { (exit 1); exit 1; }; }
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+
       ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -16094,7 +20518,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+    { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
     SYSTEM_ICU=NO
     BUILD_TYPE="$BUILD_TYPE ICU"
@@ -16105,17 +20529,17 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable graphite support" >&5
+{ $as_echo "$as_me:$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
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+    { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
     ENABLE_GRAPHITE="TRUE"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking which graphite to use" >&5
+    { $as_echo "$as_me:$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
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+        { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
         SYSTEM_GRAPHITE=YES
 
@@ -16124,9 +20548,9 @@ $as_echo "external" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -16139,14 +20563,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -16155,10 +20579,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -16173,24 +20597,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for silgraphite " >&5
+        { $as_echo "$as_me:$LINENO: checking for silgraphite " >&5
 $as_echo_n "checking for silgraphite ... " >&6; }
 
         if $PKG_CONFIG --exists "silgraphite " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GRAPHITE_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking GRAPHITE_CFLAGS" >&5
 $as_echo_n "checking GRAPHITE_CFLAGS... " >&6; }
             GRAPHITE_CFLAGS=`$PKG_CONFIG --cflags "silgraphite "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GRAPHITE_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $GRAPHITE_CFLAGS" >&5
 $as_echo "$GRAPHITE_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GRAPHITE_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking GRAPHITE_LIBS" >&5
 $as_echo_n "checking GRAPHITE_LIBS... " >&6; }
             GRAPHITE_LIBS=`$PKG_CONFIG --libs "silgraphite "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GRAPHITE_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $GRAPHITE_LIBS" >&5
 $as_echo "$GRAPHITE_LIBS" >&6; }
         else
             GRAPHITE_CFLAGS=""
@@ -16212,17 +20636,19 @@ $as_echo "$GRAPHITE_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error "Library requirements (silgraphite ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     { { $as_echo "$as_me:$LINENO: error: Library requirements (silgraphite ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+$as_echo "$as_me: error: Library requirements (silgraphite ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
   fi
 
     else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+        { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
         SYSTEM_GRAPHITE=NO
         BUILD_TYPE="$BUILD_TYPE GRAPHITE"
     fi
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -16233,12 +20659,14 @@ fi
 
 if test  "$_os" = "Darwin"; then
    if test "x$with_x" = "xyes"; then
-      as_fn_error "X11 build is no longer supported on MacOSX, please use the native aqua build" "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: X11 build is no longer supported on MacOSX, please use the native aqua build" >&5
+$as_echo "$as_me: error: X11 build is no longer supported on MacOSX, please use the native aqua build" >&2;}
+   { (exit 1); exit 1; }; }
    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /System/Library/Frameworks/AppKit.framework" >&5
+      { $as_echo "$as_me:$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
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+         { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
          x_includes="no_x_includes"
          x_libraries="no_x_libraries"
@@ -16247,7 +20675,9 @@ $as_echo "yes" >&6; }
          ENABLE_CUPS=""
 
       else
-         as_fn_error "No AppKit.framewrok found" "$LINENO" 5
+         { { $as_echo "$as_me:$LINENO: error: No AppKit.framewrok found" >&5
+$as_echo "$as_me: error: No AppKit.framewrok found" >&2;}
+   { (exit 1); exit 1; }; }
       fi
    fi
 fi
@@ -16259,12 +20689,12 @@ elif test "$_os" = "OS2" ; then
    echo "Do Nothing for _os = OS2. Don't check for X11."
       :
 elif test "$_os" != "WINNT" ; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
+   { $as_echo "$as_me:$LINENO: checking for X" >&5
 $as_echo_n "checking for X... " >&6; }
 
 
 # Check whether --with-x was given.
-if test "${with_x+set}" = set; then :
+if test "${with_x+set}" = set; then
   withval=$with_x;
 fi
 
@@ -16274,8 +20704,10 @@ if test "x$with_x" = xno; then
   have_x=disabled
 else
   case $x_includes,$x_libraries in #(
-    *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
-    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
+    *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5
+$as_echo "$as_me: error: cannot use X directory names containing '" >&2;}
+   { (exit 1); exit 1; }; };; #(
+    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   # One or both of the vars are not set, and there is no cached value.
@@ -16323,25 +20755,21 @@ fi
 # 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
@@ -16363,14 +20791,37 @@ ac_x_header_dirs='
 if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Xlib.h.
   # First, try using that file with no special directory specified.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <X11/Xlib.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # We can compile using X headers with no special include directory.
 ac_x_includes=
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   for ac_dir in $ac_x_header_dirs; do
   if test -r "$ac_dir/X11/Xlib.h"; then
     ac_x_includes=$ac_dir
@@ -16378,6 +20829,7 @@ else
   fi
 done
 fi
+
 rm -f conftest.err conftest.$ac_ext
 fi # $ac_x_includes = no
 
@@ -16387,7 +20839,11 @@ if test "$ac_x_libraries" = no; then
   # Don't add to $LIBS permanently.
   ac_save_LIBS=$LIBS
   LIBS="-lX11 $LIBS"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <X11/Xlib.h>
 int
@@ -16398,12 +20854,35 @@ XrmInitialize ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
 ac_x_libraries=
 else
-  LIBS=$ac_save_LIBS
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	LIBS=$ac_save_LIBS
 for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 do
   # Don't even attempt the hair of trying to link an X program!
@@ -16415,8 +20894,10 @@ do
   done
 done
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 fi # $ac_x_libraries = no
 
 case $ac_x_includes,$ac_x_libraries in #(
@@ -16437,7 +20918,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5
+  { $as_echo "$as_me:$LINENO: result: $have_x" >&5
 $as_echo "$have_x" >&6; }
   no_x=yes
 else
@@ -16448,14 +20929,16 @@ else
   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 "$as_me:$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.
 
-$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define X_DISPLAY_MISSING 1
+_ACEOF
 
   X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
 else
@@ -16468,12 +20951,16 @@ else
     X_LIBS="$X_LIBS -L$x_libraries"
     # For Solaris; some versions of Sun CC require a space after -R and
     # others require no space.  Words are not sufficient . . . .
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5
+    { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
 $as_echo_n "checking whether -R must be followed by a space... " >&6; }
     ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
     ac_xsave_c_werror_flag=$ac_c_werror_flag
     ac_c_werror_flag=yes
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -16484,13 +20971,40 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
        X_LIBS="$X_LIBS -R$x_libraries"
 else
-  LIBS="$ac_xsave_LIBS -R $x_libraries"
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	LIBS="$ac_xsave_LIBS -R $x_libraries"
+       cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -16501,19 +21015,46 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 	  X_LIBS="$X_LIBS -R $x_libraries"
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	{ $as_echo "$as_me:$LINENO: result: neither works" >&5
 $as_echo "neither works" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
     ac_c_werror_flag=$ac_xsave_c_werror_flag
     LIBS=$ac_xsave_LIBS
   fi
@@ -16529,7 +21070,11 @@ rm -f core conftest.err conftest.$ac_objext \
     # libraries were built with DECnet support.  And Karl Berry says
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -16547,17 +21092,44 @@ return XOpenDisplay ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  :
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	{ $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
 $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -16575,30 +21147,59 @@ return dnet_ntoa ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
-  ac_cv_lib_dnet_dnet_ntoa=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_dnet_dnet_ntoa=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
+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
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
+      { $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -16616,25 +21217,52 @@ return dnet_ntoa ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
-  ac_cv_lib_dnet_stub_dnet_ntoa=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_dnet_stub_dnet_ntoa=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
+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 core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
     LIBS="$ac_xsave_LIBS"
 
     # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
@@ -16645,20 +21273,105 @@ rm -f core conftest.err conftest.$ac_objext \
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-if test "x$ac_cv_func_gethostbyname" = x""yes; then :
+    { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
+$as_echo_n "checking for gethostbyname... " >&6; }
+if test "${ac_cv_func_gethostbyname+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.  */
+/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define gethostbyname innocuous_gethostbyname
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char gethostbyname (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef gethostbyname
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+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
+#endif
+
+int
+main ()
+{
+return gethostbyname ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_func_gethostbyname=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_cv_func_gethostbyname=no
 fi
 
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
+$as_echo "$ac_cv_func_gethostbyname" >&6; }
+
     if test $ac_cv_func_gethostbyname = no; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
+      { $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -16676,30 +21389,59 @@ return gethostbyname ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
-  ac_cv_lib_nsl_gethostbyname=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_nsl_gethostbyname=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
+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
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
+	{ $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -16717,18 +21459,43 @@ return gethostbyname ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
-  ac_cv_lib_bsd_gethostbyname=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_bsd_gethostbyname=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
 $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
 fi
 
@@ -16742,20 +21509,105 @@ fi
     # variants that don't use the name server (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-if test "x$ac_cv_func_connect" = x""yes; then :
+    { $as_echo "$as_me:$LINENO: checking for connect" >&5
+$as_echo_n "checking for connect... " >&6; }
+if test "${ac_cv_func_connect+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.  */
+/* Define connect to an innocuous variant, in case <limits.h> declares connect.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define connect innocuous_connect
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char connect (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef connect
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+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
+#endif
+
+int
+main ()
+{
+return connect ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_func_connect=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_cv_func_connect=no
 fi
 
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+$as_echo "$ac_cv_func_connect" >&6; }
+
     if test $ac_cv_func_connect = no; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
+      { $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -16773,38 +21625,148 @@ return connect ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_socket_connect=yes
 else
-  ac_cv_lib_socket_connect=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_socket_connect=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
 $as_echo "$ac_cv_lib_socket_connect" >&6; }
-if test "x$ac_cv_lib_socket_connect" = x""yes; then :
+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.
-    ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
-if test "x$ac_cv_func_remove" = x""yes; then :
+    { $as_echo "$as_me:$LINENO: checking for remove" >&5
+$as_echo_n "checking for remove... " >&6; }
+if test "${ac_cv_func_remove+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.  */
+/* Define remove to an innocuous variant, in case <limits.h> declares remove.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define remove innocuous_remove
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char remove (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef remove
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+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
+#endif
 
+int
+main ()
+{
+return remove ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_func_remove=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_func_remove=no
 fi
 
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+$as_echo "$ac_cv_func_remove" >&6; }
+
     if test $ac_cv_func_remove = no; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
+      { $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -16822,38 +21784,148 @@ return remove ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_posix_remove=yes
 else
-  ac_cv_lib_posix_remove=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_posix_remove=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
 $as_echo "$ac_cv_lib_posix_remove" >&6; }
-if test "x$ac_cv_lib_posix_remove" = x""yes; then :
+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.
-    ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
-if test "x$ac_cv_func_shmat" = x""yes; then :
+    { $as_echo "$as_me:$LINENO: checking for shmat" >&5
+$as_echo_n "checking for shmat... " >&6; }
+if test "${ac_cv_func_shmat+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.  */
+/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define shmat innocuous_shmat
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char shmat (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef shmat
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+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
+#endif
+
+int
+main ()
+{
+return shmat ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_func_shmat=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_func_shmat=no
+fi
 
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+$as_echo "$ac_cv_func_shmat" >&6; }
 
     if test $ac_cv_func_shmat = no; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
+      { $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -16871,18 +21943,43 @@ return shmat ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_ipc_shmat=yes
 else
-  ac_cv_lib_ipc_shmat=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_ipc_shmat=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
 $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
+if test "x$ac_cv_lib_ipc_shmat" = x""yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
 fi
 
@@ -16898,14 +21995,18 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
+  { $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -16923,18 +22024,43 @@ return IceConnectionNumber ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
-  ac_cv_lib_ICE_IceConnectionNumber=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_ICE_IceConnectionNumber=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
 fi
 
@@ -16951,21 +22077,29 @@ fi
      x_libraries="default_x_libraries"
    fi
       if test -z "$x_libraries"; then
-      as_fn_error "No X libraries found" "$LINENO" 5 # Exit
+      { { $as_echo "$as_me:$LINENO: error: No X libraries found" >&5
+$as_echo "$as_me: error: No X libraries found" >&2;}
+   { (exit 1); exit 1; }; } # Exit
    fi
    if test -z "$x_includes"; then
-      as_fn_error "No X includes found" "$LINENO" 5 # Exit
+      { { $as_echo "$as_me:$LINENO: error: No X includes found" >&5
+$as_echo "$as_me: error: No X includes found" >&2;}
+   { (exit 1); exit 1; }; } # Exit
    fi
    CFLAGS=$X_CFLAGS
    LDFLAGS="$X_LDFLAGS $X_LIBS"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDisplay in -lX11" >&5
+   { $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -16983,31 +22117,62 @@ return XOpenDisplay ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
-  ac_cv_lib_X11_XOpenDisplay=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_X11_XOpenDisplay=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 $as_echo "$ac_cv_lib_X11_XOpenDisplay" >&6; }
-if test "x$ac_cv_lib_X11_XOpenDisplay" = x""yes; then :
+if test "x$ac_cv_lib_X11_XOpenDisplay" = x""yes; then
   x_libs="-lX11 $X_EXTRA_LIBS"
 else
-  as_fn_error "X Development libraries not found" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: X Development libraries not found" >&5
+$as_echo "$as_me: error: X Development libraries not found" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XauDisposeAuth in -lXau" >&5
+      { $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -17025,18 +22190,43 @@ return XauDisposeAuth ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_Xau_XauDisposeAuth=yes
 else
-  ac_cv_lib_Xau_XauDisposeAuth=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_Xau_XauDisposeAuth=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xau_XauDisposeAuth" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauDisposeAuth" >&5
 $as_echo "$ac_cv_lib_Xau_XauDisposeAuth" >&6; }
-if test "x$ac_cv_lib_Xau_XauDisposeAuth" = x""yes; then :
+if test "x$ac_cv_lib_Xau_XauDisposeAuth" = x""yes; then
   XAU_LIBS="-lXau"
 fi
 
@@ -17068,53 +22258,160 @@ fi
 
 
 if test "$_os" != "WINNT" -a "$_os" != "OS2" -a "$_os" != "Darwin"; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use Xaw" >&5
+            { $as_echo "$as_me:$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
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+       { $as_echo "$as_me:$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 :
+
+for ac_header in X11/Composite.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  eval "$as_ac_Header=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define HAVE_X11_COMPOSITE_H 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  as_fn_error "Xt include headers not found" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: Xt include headers not found" >&5
+$as_echo "$as_me: error: Xt include headers not found" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 done
 
    else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+       { $as_echo "$as_me:$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 :
+
+for ac_header in X11/Xaw/Label.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  eval "$as_ac_Header=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define HAVE_X11_XAW_LABEL_H 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  as_fn_error "Xaw include headers not found" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: Xaw include headers not found" >&5
+$as_echo "$as_me: error: Xaw include headers not found" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 done
 
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lXaw" >&5
+
+{ $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 
@@ -17126,18 +22423,43 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_Xaw_main=yes
 else
-  ac_cv_lib_Xaw_main=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_Xaw_main=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xaw_main" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xaw_main" >&5
 $as_echo "$ac_cv_lib_Xaw_main" >&6; }
-if test "x$ac_cv_lib_Xaw_main" = x""yes; then :
+if test "x$ac_cv_lib_Xaw_main" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBXAW 1
 _ACEOF
@@ -17145,7 +22467,9 @@ _ACEOF
   LIBS="-lXaw $LIBS"
 
 else
-  as_fn_error "Xaw library not found or functional" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: Xaw library not found or functional" >&5
+$as_echo "$as_me: error: Xaw library not found or functional" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
    fi
@@ -17155,23 +22479,158 @@ fi
 
 
 if test "$ENABLE_FONTCONFIG" = "TRUE" ; then
-    ac_fn_c_check_header_mongrel "$LINENO" "fontconfig/fontconfig.h" "ac_cv_header_fontconfig_fontconfig_h" "$ac_includes_default"
-if test "x$ac_cv_header_fontconfig_fontconfig_h" = x""yes; then :
+    if test "${ac_cv_header_fontconfig_fontconfig_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for fontconfig/fontconfig.h" >&5
+$as_echo_n "checking for fontconfig/fontconfig.h... " >&6; }
+if test "${ac_cv_header_fontconfig_fontconfig_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_fontconfig_fontconfig_h" >&5
+$as_echo "$ac_cv_header_fontconfig_fontconfig_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking fontconfig/fontconfig.h usability" >&5
+$as_echo_n "checking fontconfig/fontconfig.h usability... " >&6; }
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking fontconfig/fontconfig.h presence" >&5
+$as_echo_n "checking fontconfig/fontconfig.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <fontconfig/fontconfig.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: fontconfig/fontconfig.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: fontconfig/fontconfig.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for fontconfig/fontconfig.h" >&5
+$as_echo_n "checking for fontconfig/fontconfig.h... " >&6; }
+if test "${ac_cv_header_fontconfig_fontconfig_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_fontconfig_fontconfig_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_fontconfig_fontconfig_h" >&5
+$as_echo "$ac_cv_header_fontconfig_fontconfig_h" >&6; }
 
+fi
+if test "x$ac_cv_header_fontconfig_fontconfig_h" = x""yes; then
+  :
 else
-  as_fn_error "fontconfig/fontconfig.h could not be found. libfontconfig1-dev or fontconfig???-devel missing?" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: fontconfig/fontconfig.h could not be found. libfontconfig1-dev or fontconfig???-devel missing?" >&5
+$as_echo "$as_me: error: fontconfig/fontconfig.h could not be found. libfontconfig1-dev or fontconfig???-devel missing?" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fontconfig is >= 2.2.0" >&5
+    { $as_echo "$as_me:$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
+    if test "$cross_compiling" = yes; then
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_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
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <fontconfig/fontconfig.h>
@@ -17182,60 +22641,222 @@ int main(int argc, char **argv) {
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  as_fn_error "no, fontconfig >= 2.2.0 needed" "$LINENO" 5
+  $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
+
+( exit $ac_status )
+{ { $as_echo "$as_me:$LINENO: error: no, fontconfig >= 2.2.0 needed" >&5
+$as_echo "$as_me: error: no, fontconfig >= 2.2.0 needed" >&2;}
+   { (exit 1); exit 1; }; }
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to link to Xrender" >&5
+{ $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
    XRENDER_LINK=YES
    with_system_xrender_headers=yes
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, dynamically open it" >&5
+   { $as_echo "$as_me:$LINENO: result: no, dynamically open it" >&5
 $as_echo "no, dynamically open it" >&6; }
    XRENDER_LINK=NO
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which Xrender headers to use" >&5
+{ $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+   { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
    SYSTEM_XRENDER_HEADERS=YES
-   ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/Xrender.h" "ac_cv_header_X11_extensions_Xrender_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_extensions_Xrender_h" = x""yes; then :
+   if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5
+$as_echo_n "checking for X11/extensions/Xrender.h... " >&6; }
+if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5
+$as_echo "$ac_cv_header_X11_extensions_Xrender_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xrender.h usability" >&5
+$as_echo_n "checking X11/extensions/Xrender.h usability... " >&6; }
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xrender.h presence" >&5
+$as_echo_n "checking X11/extensions/Xrender.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <X11/extensions/Xrender.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xrender.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xrender.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5
+$as_echo_n "checking for X11/extensions/Xrender.h... " >&6; }
+if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_X11_extensions_Xrender_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5
+$as_echo "$ac_cv_header_X11_extensions_Xrender_h" >&6; }
 
+fi
+if test "x$ac_cv_header_X11_extensions_Xrender_h" = x""yes; then
+  :
 else
-  as_fn_error "Xrender not found. install X" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: Xrender not found. install X" >&5
+$as_echo "$as_me: error: Xrender not found. install X" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+   { $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRenderQueryVersion in -lXrender" >&5
+
+{ $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -17253,18 +22874,43 @@ return XRenderQueryVersion ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_Xrender_XRenderQueryVersion=yes
 else
-  ac_cv_lib_Xrender_XRenderQueryVersion=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_Xrender_XRenderQueryVersion=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrender_XRenderQueryVersion" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderQueryVersion" >&5
 $as_echo "$ac_cv_lib_Xrender_XRenderQueryVersion" >&6; }
-if test "x$ac_cv_lib_Xrender_XRenderQueryVersion" = x""yes; then :
+if test "x$ac_cv_lib_Xrender_XRenderQueryVersion" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBXRENDER 1
 _ACEOF
@@ -17272,19 +22918,21 @@ _ACEOF
   LIBS="-lXrender $LIBS"
 
 else
-  as_fn_error "libXrender not found or functional" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: libXrender not found or functional" >&5
+$as_echo "$as_me: error: libXrender not found or functional" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable RandR support" >&5
+{ $as_echo "$as_me:$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"
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: resorting to dlopen libXrandr at runtime" >&5
+	  { $as_echo "$as_me:$LINENO: result: resorting to dlopen libXrandr at runtime" >&5
 $as_echo "resorting to dlopen libXrandr at runtime" >&6; }
    else
 	  XRANDR_DLOPEN="FALSE"
@@ -17294,9 +22942,9 @@ $as_echo "resorting to dlopen libXrandr at runtime" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -17309,14 +22957,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -17325,10 +22973,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -17343,24 +22991,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xrandr >= 1.2" >&5
+        { $as_echo "$as_me:$LINENO: checking for xrandr >= 1.2" >&5
 $as_echo_n "checking for xrandr >= 1.2... " >&6; }
 
         if $PKG_CONFIG --exists "xrandr >= 1.2" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking XRANDR_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking XRANDR_CFLAGS" >&5
 $as_echo_n "checking XRANDR_CFLAGS... " >&6; }
             XRANDR_CFLAGS=`$PKG_CONFIG --cflags "xrandr >= 1.2"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XRANDR_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $XRANDR_CFLAGS" >&5
 $as_echo "$XRANDR_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking XRANDR_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking XRANDR_LIBS" >&5
 $as_echo_n "checking XRANDR_LIBS... " >&6; }
             XRANDR_LIBS=`$PKG_CONFIG --libs "xrandr >= 1.2"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XRANDR_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $XRANDR_LIBS" >&5
 $as_echo "$XRANDR_LIBS" >&6; }
         else
             XRANDR_CFLAGS=""
@@ -17386,23 +23034,156 @@ $as_echo "$XRANDR_LIBS" >&6; }
   fi
 
       if test "$ENABLE_RANDR" != "TRUE"; then
-         ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/Xrandr.h" "ac_cv_header_X11_extensions_Xrandr_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_extensions_Xrandr_h" = x""yes; then :
+         if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5
+$as_echo_n "checking for X11/extensions/Xrandr.h... " >&6; }
+if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5
+$as_echo "$ac_cv_header_X11_extensions_Xrandr_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xrandr.h usability" >&5
+$as_echo_n "checking X11/extensions/Xrandr.h usability... " >&6; }
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xrandr.h presence" >&5
+$as_echo_n "checking X11/extensions/Xrandr.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <X11/extensions/Xrandr.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
 else
-  as_fn_error "X11/extensions/Xrandr.h could not be found. X11 dev missing?" "$LINENO" 5
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5
+$as_echo_n "checking for X11/extensions/Xrandr.h... " >&6; }
+if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_X11_extensions_Xrandr_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5
+$as_echo "$ac_cv_header_X11_extensions_Xrandr_h" >&6; }
+
+fi
+if test "x$ac_cv_header_X11_extensions_Xrandr_h" = x""yes; then
+  :
+else
+  { { $as_echo "$as_me:$LINENO: error: X11/extensions/Xrandr.h could not be found. X11 dev missing?" >&5
+$as_echo "$as_me: error: X11/extensions/Xrandr.h could not be found. X11 dev missing?" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
          XRANDR_CFLAGS=" "
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRRQueryExtension in -lXrandr" >&5
+
+{ $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -17420,18 +23201,43 @@ return XRRQueryExtension ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_Xrandr_XRRQueryExtension=yes
 else
-  ac_cv_lib_Xrandr_XRRQueryExtension=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_Xrandr_XRRQueryExtension=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrandr_XRRQueryExtension" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRQueryExtension" >&5
 $as_echo "$ac_cv_lib_Xrandr_XRRQueryExtension" >&6; }
-if test "x$ac_cv_lib_Xrandr_XRRQueryExtension" = x""yes; then :
+if test "x$ac_cv_lib_Xrandr_XRRQueryExtension" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBXRANDR 1
 _ACEOF
@@ -17439,18 +23245,20 @@ _ACEOF
   LIBS="-lXrandr $LIBS"
 
 else
-   as_fn_error "libXrandr not found or functional" "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: libXrandr not found or functional" >&5
+$as_echo "$as_me: error: libXrandr not found or functional" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
          XRANDR_LIBS="-lXrandr "
          ENABLE_RANDR="TRUE"
-	     { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling RandR support" >&5
+	     { $as_echo "$as_me:$LINENO: result: enabling RandR support" >&5
 $as_echo "enabling RandR support" >&6; }
       fi
    fi
 else
    ENABLE_RANDR=""
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -17458,21 +23266,21 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use neon" >&5
+{ $as_echo "$as_me:$LINENO: checking whether to use neon" >&5
 $as_echo_n "checking whether to use neon... " >&6; }
 if test "$enable_neon" = "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+    { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
     DISABLE_NEON=TRUE
 
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+    { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which neon to use" >&5
+{ $as_echo "$as_me:$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
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+        { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
 
   succeeded=no
@@ -17480,9 +23288,9 @@ $as_echo "external" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -17495,14 +23303,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -17511,10 +23319,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -17529,24 +23337,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for neon >= 0.24.0" >&5
+        { $as_echo "$as_me:$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
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking NEON_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking NEON_CFLAGS" >&5
 $as_echo_n "checking NEON_CFLAGS... " >&6; }
             NEON_CFLAGS=`$PKG_CONFIG --cflags "neon >= 0.24.0"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NEON_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $NEON_CFLAGS" >&5
 $as_echo "$NEON_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking NEON_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking NEON_LIBS" >&5
 $as_echo_n "checking NEON_LIBS... " >&6; }
             NEON_LIBS=`$PKG_CONFIG --libs "neon >= 0.24.0"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NEON_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $NEON_LIBS" >&5
 $as_echo "$NEON_LIBS" >&6; }
         else
             NEON_CFLAGS=""
@@ -17568,14 +23376,16 @@ $as_echo "$NEON_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error "you need neon >= 0.24.x for system-neon" "$LINENO" 5
+     { { $as_echo "$as_me:$LINENO: error: you need neon >= 0.24.x for system-neon" >&5
+$as_echo "$as_me: error: you need neon >= 0.24.x for system-neon" >&2;}
+   { (exit 1); exit 1; }; }
   fi
 
         NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
         NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
         SYSTEM_NEON=YES
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+    { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
     SYSTEM_NEON=NO
     NEON_LIBS=-lneon
@@ -17591,11 +23401,11 @@ fi
 if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then
    with_system_openssl=yes
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libssl to use" >&5
+{ $as_echo "$as_me:$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
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+    { $as_echo "$as_me:$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
@@ -17609,9 +23419,9 @@ $as_echo "external" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -17624,14 +23434,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -17640,10 +23450,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -17658,24 +23468,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl " >&5
+        { $as_echo "$as_me:$LINENO: checking for openssl " >&5
 $as_echo_n "checking for openssl ... " >&6; }
 
         if $PKG_CONFIG --exists "openssl " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking OPENSSL_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking OPENSSL_CFLAGS" >&5
 $as_echo_n "checking OPENSSL_CFLAGS... " >&6; }
             OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENSSL_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $OPENSSL_CFLAGS" >&5
 $as_echo "$OPENSSL_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking OPENSSL_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking OPENSSL_LIBS" >&5
 $as_echo_n "checking OPENSSL_LIBS... " >&6; }
             OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENSSL_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $OPENSSL_LIBS" >&5
 $as_echo "$OPENSSL_LIBS" >&6; }
         else
             OPENSSL_CFLAGS=""
@@ -17697,13 +23507,15 @@ $as_echo "$OPENSSL_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error "Library requirements (openssl ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     { { $as_echo "$as_me:$LINENO: error: Library requirements (openssl ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+$as_echo "$as_me: error: Library requirements (openssl ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
   fi
 
     fi
     SYSTEM_OPENSSL=YES
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+    { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
     SYSTEM_OPENSSL=NO
     BUILD_TYPE="$BUILD_TYPE OPENSSL"
@@ -17712,22 +23524,22 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable agg" >&5
+{ $as_echo "$as_me:$LINENO: checking whether to enable agg" >&5
 $as_echo_n "checking whether to enable agg... " >&6; }
 if test "$with_agg" = "no"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
   ENABLE_AGG=YES
 
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking which AGG to use" >&5
+        { $as_echo "$as_me:$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
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+         { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
 
   succeeded=no
@@ -17735,9 +23547,9 @@ $as_echo "external" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -17750,14 +23562,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -17766,10 +23578,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -17784,24 +23596,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libagg >= 2.3" >&5
+        { $as_echo "$as_me:$LINENO: checking for libagg >= 2.3" >&5
 $as_echo_n "checking for libagg >= 2.3... " >&6; }
 
         if $PKG_CONFIG --exists "libagg >= 2.3" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking AGG_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking AGG_CFLAGS" >&5
 $as_echo_n "checking AGG_CFLAGS... " >&6; }
             AGG_CFLAGS=`$PKG_CONFIG --cflags "libagg >= 2.3"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AGG_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $AGG_CFLAGS" >&5
 $as_echo "$AGG_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking AGG_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking AGG_LIBS" >&5
 $as_echo_n "checking AGG_LIBS... " >&6; }
             AGG_LIBS=`$PKG_CONFIG --libs "libagg >= 2.3"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AGG_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $AGG_LIBS" >&5
 $as_echo "$AGG_LIBS" >&6; }
         else
             AGG_CFLAGS=""
@@ -17823,10 +23635,12 @@ $as_echo "$AGG_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error "Library requirements (libagg >= 2.3) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     { { $as_echo "$as_me:$LINENO: error: Library requirements (libagg >= 2.3) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+$as_echo "$as_me: error: Library requirements (libagg >= 2.3) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
   fi
 
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking agg version" >&5
+         { $as_echo "$as_me:$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)
@@ -17839,20 +23653,22 @@ $as_echo_n "checking agg version... " >&6; }
 	 	$PKG_CONFIG --modversion libagg | grep -q 2.4; then
             # 2.4's libagg.pc.in still contains 2.3 :/
             if $EGREP -q "Version 2.4" `echo $AGG_INCDIR`/agg_basics.h; then
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.4" >&5
+               { $as_echo "$as_me:$LINENO: result: 2.4" >&5
 $as_echo "2.4" >&6; }
                AGG_VERSION=2400
             else
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.3" >&5
+               { $as_echo "$as_me:$LINENO: result: 2.3" >&5
 $as_echo "2.3" >&6; }
                AGG_VERSION=2300
             fi
             SYSTEM_AGG=YES
 	 else
-	    as_fn_error "only agg 2.3 and 2.4 are supported" "$LINENO" 5
+	    { { $as_echo "$as_me:$LINENO: error: only agg 2.3 and 2.4 are supported" >&5
+$as_echo "$as_me: error: only agg 2.3 and 2.4 are supported" >&2;}
+   { (exit 1); exit 1; }; }
 	 fi
   else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+         { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
          SYSTEM_AGG=NO
          AGG_VERSION=2300
@@ -17862,11 +23678,11 @@ $as_echo "internal" >&6; }
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which redland library to use" >&5
+{ $as_echo "$as_me:$LINENO: checking which redland library to use" >&5
 $as_echo_n "checking which redland library to use... " >&6; }
-if test -n "$with_system_redland" && \
+if test -n "$with_system_redland" -o -n "$with_system_libs" && \
 	test "$with_system_redland" != "no"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+	{ $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
 	SYSTEM_REDLAND=YES
 
@@ -17875,9 +23691,9 @@ $as_echo "external" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -17890,14 +23706,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -17906,10 +23722,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -17924,31 +23740,31 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for redland" >&5
-$as_echo_n "checking for redland... " >&6; }
+        { $as_echo "$as_me:$LINENO: checking for redland >= 1.0.8" >&5
+$as_echo_n "checking for redland >= 1.0.8... " >&6; }
 
-        if $PKG_CONFIG --exists "redland" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+        if $PKG_CONFIG --exists "redland >= 1.0.8" ; then
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking REDLAND_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking REDLAND_CFLAGS" >&5
 $as_echo_n "checking REDLAND_CFLAGS... " >&6; }
-            REDLAND_CFLAGS=`$PKG_CONFIG --cflags "redland"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $REDLAND_CFLAGS" >&5
+            REDLAND_CFLAGS=`$PKG_CONFIG --cflags "redland >= 1.0.8"`
+            { $as_echo "$as_me:$LINENO: result: $REDLAND_CFLAGS" >&5
 $as_echo "$REDLAND_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking REDLAND_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking REDLAND_LIBS" >&5
 $as_echo_n "checking REDLAND_LIBS... " >&6; }
-            REDLAND_LIBS=`$PKG_CONFIG --libs "redland"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $REDLAND_LIBS" >&5
+            REDLAND_LIBS=`$PKG_CONFIG --libs "redland >= 1.0.8"`
+            { $as_echo "$as_me:$LINENO: result: $REDLAND_LIBS" >&5
 $as_echo "$REDLAND_LIBS" >&6; }
         else
             REDLAND_CFLAGS=""
             REDLAND_LIBS=""
             ## If we have a custom action on failure, don't print errors, but
             ## do set a variable so people can do so.
-            REDLAND_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "redland"`
+            REDLAND_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "redland >= 1.0.8"`
             echo $REDLAND_PKG_ERRORS
         fi
 
@@ -17963,11 +23779,13 @@ $as_echo "$REDLAND_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error "Library requirements (redland) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     { { $as_echo "$as_me:$LINENO: error: Library requirements (redland >= 1.0.8) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+$as_echo "$as_me: error: Library requirements (redland >= 1.0.8) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
   fi
 
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+	{ $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
 	BUILD_TYPE="$BUILD_TYPE REDLAND"
 	SYSTEM_REDLAND=NO
@@ -17975,11 +23793,11 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libhunspell to use" >&5
+{ $as_echo "$as_me:$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
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+    { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
     SYSTEM_HUNSPELL=YES
     ac_ext=cpp
@@ -17994,9 +23812,9 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -18009,14 +23827,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -18025,10 +23843,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -18043,24 +23861,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hunspell" >&5
+        { $as_echo "$as_me:$LINENO: checking for hunspell" >&5
 $as_echo_n "checking for hunspell... " >&6; }
 
         if $PKG_CONFIG --exists "hunspell" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking HUNSPELL_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking HUNSPELL_CFLAGS" >&5
 $as_echo_n "checking HUNSPELL_CFLAGS... " >&6; }
             HUNSPELL_CFLAGS=`$PKG_CONFIG --cflags "hunspell"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HUNSPELL_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $HUNSPELL_CFLAGS" >&5
 $as_echo "$HUNSPELL_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking HUNSPELL_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking HUNSPELL_LIBS" >&5
 $as_echo_n "checking HUNSPELL_LIBS... " >&6; }
             HUNSPELL_LIBS=`$PKG_CONFIG --libs "hunspell"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HUNSPELL_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $HUNSPELL_LIBS" >&5
 $as_echo "$HUNSPELL_LIBS" >&6; }
         else
             HUNSPELL_CFLAGS=""
@@ -18086,16 +23904,270 @@ $as_echo "$HUNSPELL_LIBS" >&6; }
   fi
 
     if test "$HUNSPELL_PC" != "TRUE"; then
-      ac_fn_cxx_check_header_mongrel "$LINENO" "hunspell.hxx" "ac_cv_header_hunspell_hxx" "$ac_includes_default"
-if test "x$ac_cv_header_hunspell_hxx" = x""yes; then :
+      if test "${ac_cv_header_hunspell_hxx+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for hunspell.hxx" >&5
+$as_echo_n "checking for hunspell.hxx... " >&6; }
+if test "${ac_cv_header_hunspell_hxx+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hxx" >&5
+$as_echo "$ac_cv_header_hunspell_hxx" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking hunspell.hxx usability" >&5
+$as_echo_n "checking hunspell.hxx usability... " >&6; }
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking hunspell.hxx presence" >&5
+$as_echo_n "checking hunspell.hxx presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <hunspell.hxx>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: hunspell.hxx: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: hunspell.hxx: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: hunspell.hxx:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: hunspell.hxx: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: hunspell.hxx:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: hunspell.hxx: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: hunspell.hxx: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for hunspell.hxx" >&5
+$as_echo_n "checking for hunspell.hxx... " >&6; }
+if test "${ac_cv_header_hunspell_hxx+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_hunspell_hxx=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hxx" >&5
+$as_echo "$ac_cv_header_hunspell_hxx" >&6; }
+
+fi
+if test "x$ac_cv_header_hunspell_hxx" = x""yes; then
+  :
+else
+
+      if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for hunspell/hunspell.hxx" >&5
+$as_echo_n "checking for hunspell/hunspell.hxx... " >&6; }
+if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hunspell_hxx" >&5
+$as_echo "$ac_cv_header_hunspell_hunspell_hxx" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking hunspell/hunspell.hxx usability" >&5
+$as_echo_n "checking hunspell/hunspell.hxx usability... " >&6; }
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking hunspell/hunspell.hxx presence" >&5
+$as_echo_n "checking hunspell/hunspell.hxx presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <hunspell/hunspell.hxx>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
 
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: hunspell/hunspell.hxx:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: hunspell/hunspell.hxx:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for hunspell/hunspell.hxx" >&5
+$as_echo_n "checking for hunspell/hunspell.hxx... " >&6; }
+if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
+  ac_cv_header_hunspell_hunspell_hxx=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hunspell_hxx" >&5
+$as_echo "$ac_cv_header_hunspell_hunspell_hxx" >&6; }
 
-      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 :
+fi
+if test "x$ac_cv_header_hunspell_hunspell_hxx" = x""yes; then
    HUNSPELL_CFLAGS=-I/usr/include/hunspell
 else
-  as_fn_error "hunspell headers not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: hunspell headers not found." >&5
+$as_echo "$as_me: error: hunspell headers not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
@@ -18103,14 +24175,19 @@ fi
 fi
 
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lhunspell" >&5
+
+{ $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 
@@ -18122,18 +24199,43 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_hunspell_main=yes
 else
-  ac_cv_lib_hunspell_main=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_hunspell_main=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hunspell_main" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_hunspell_main" >&5
 $as_echo "$ac_cv_lib_hunspell_main" >&6; }
-if test "x$ac_cv_lib_hunspell_main" = x""yes; then :
+if test "x$ac_cv_lib_hunspell_main" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBHUNSPELL 1
 _ACEOF
@@ -18141,7 +24243,9 @@ _ACEOF
   LIBS="-lhunspell $LIBS"
 
 else
-   as_fn_error "hunspell library not found." "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: hunspell library not found." >&5
+$as_echo "$as_me: error: hunspell library not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
       HUNSPELL_LIBS=-lhunspell
@@ -18153,7 +24257,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+    { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
     SYSTEM_HUNSPELL=NO
     BUILD_TYPE="$BUILD_TYPE HUNSPELL"
@@ -18162,37 +24266,266 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which altlinuxhyph to use" >&5
+{ $as_echo "$as_me:$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
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+    { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
     SYSTEM_HYPH=YES
-    ac_fn_c_check_header_mongrel "$LINENO" "hyphen.h" "ac_cv_header_hyphen_h" "$ac_includes_default"
-if test "x$ac_cv_header_hyphen_h" = x""yes; then :
+    if test "${ac_cv_header_hyphen_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for hyphen.h" >&5
+$as_echo_n "checking for hyphen.h... " >&6; }
+if test "${ac_cv_header_hyphen_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hyphen_h" >&5
+$as_echo "$ac_cv_header_hyphen_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking hyphen.h usability" >&5
+$as_echo_n "checking hyphen.h usability... " >&6; }
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking hyphen.h presence" >&5
+$as_echo_n "checking hyphen.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <hyphen.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: hyphen.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: hyphen.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: hyphen.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: hyphen.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: hyphen.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: hyphen.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: hyphen.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: hyphen.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: hyphen.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: hyphen.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: hyphen.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: hyphen.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: hyphen.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: hyphen.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: hyphen.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: hyphen.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for hyphen.h" >&5
+$as_echo_n "checking for hyphen.h... " >&6; }
+if test "${ac_cv_header_hyphen_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_hyphen_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hyphen_h" >&5
+$as_echo "$ac_cv_header_hyphen_h" >&6; }
+
+fi
+if test "x$ac_cv_header_hyphen_h" = x""yes; then
+  :
 else
-   as_fn_error "altlinuxhyph headers not found." "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: altlinuxhyph headers not found." >&5
+$as_echo "$as_me: error: altlinuxhyph headers not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
-    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 :
+    { $as_echo "$as_me:$LINENO: checking for struct _HyphenDict.cset" >&5
+$as_echo_n "checking for struct _HyphenDict.cset... " >&6; }
+if test "${ac_cv_member_struct__HyphenDict_cset+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.  */
+#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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_member_struct__HyphenDict_cset=yes
+else
+  $as_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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_member_struct__HyphenDict_cset=yes
 else
-   as_fn_error "no. You are sure you have altlinuyhyph headers?" "$LINENO" 5
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_member_struct__HyphenDict_cset=no
 fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hnj_hyphen_hyphenate2 in -lhyphen" >&5
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct__HyphenDict_cset" >&5
+$as_echo "$ac_cv_member_struct__HyphenDict_cset" >&6; }
+if test "x$ac_cv_member_struct__HyphenDict_cset" = x""yes; then
+  :
+else
+   { { $as_echo "$as_me:$LINENO: error: no. You are sure you have altlinuyhyph headers?" >&5
+$as_echo "$as_me: error: no. You are sure you have altlinuyhyph headers?" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+    { $as_echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhyphen" >&5
 $as_echo_n "checking for hnj_hyphen_hyphenate2 in -lhyphen... " >&6; }
-if test "${ac_cv_lib_hyphen_hnj_hyphen_hyphenate2+set}" = set; then :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -18210,32 +24543,63 @@ return hnj_hyphen_hyphenate2 ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=yes
 else
-  ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&5
 $as_echo "$ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&6; }
-if test "x$ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" = x""yes; then :
+if test "x$ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" = x""yes; then
   HYPHEN_LIB=-lhyphen
 else
-   as_fn_error "altlinuxhyph library not found or too old." "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: altlinuxhyph library not found or too old." >&5
+$as_echo "$as_me: error: altlinuxhyph library not found or too old." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
     if test -z "$HYPHEN_LIB"; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hnj_hyphen_hyphenate2 in -lhyph" >&5
+       { $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -18253,33 +24617,64 @@ return hnj_hyphen_hyphenate2 ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_hyph_hnj_hyphen_hyphenate2=yes
 else
-  ac_cv_lib_hyph_hnj_hyphen_hyphenate2=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_hyph_hnj_hyphen_hyphenate2=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&5
 $as_echo "$ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&6; }
-if test "x$ac_cv_lib_hyph_hnj_hyphen_hyphenate2" = x""yes; then :
+if test "x$ac_cv_lib_hyph_hnj_hyphen_hyphenate2" = x""yes; then
   HYPHEN_LIB=-lhyph
 else
-   as_fn_error "altlinuxhyph library not found or too old." "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: altlinuxhyph library not found or too old." >&5
+$as_echo "$as_me: error: altlinuxhyph library not found or too old." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
     fi
     if test -z "$HYPHEN_LIB"; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hnj_hyphen_hyphenate2 in -lhnj" >&5
+       { $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -18297,26 +24692,53 @@ return hnj_hyphen_hyphenate2 ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_hnj_hnj_hyphen_hyphenate2=yes
 else
-  ac_cv_lib_hnj_hnj_hyphen_hyphenate2=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_hnj_hnj_hyphen_hyphenate2=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&5
 $as_echo "$ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&6; }
-if test "x$ac_cv_lib_hnj_hnj_hyphen_hyphenate2" = x""yes; then :
+if test "x$ac_cv_lib_hnj_hnj_hyphen_hyphenate2" = x""yes; then
   HYPHEN_LIB=-lhnj
 else
-   as_fn_error "altlinuxhyph library not found or too old." "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: altlinuxhyph library not found or too old." >&5
+$as_echo "$as_me: error: altlinuxhyph library not found or too old." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
     fi
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+    { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
     SYSTEM_HYPH=NO
     BUILD_TYPE="$BUILD_TYPE HYPHEN"
@@ -18324,28 +24746,161 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which mythes to use" >&5
+{ $as_echo "$as_me:$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
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+    { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
     SYSTEM_MYTHES=YES
-    ac_fn_c_check_header_mongrel "$LINENO" "mythes.hxx" "ac_cv_header_mythes_hxx" "$ac_includes_default"
-if test "x$ac_cv_header_mythes_hxx" = x""yes; then :
+    if test "${ac_cv_header_mythes_hxx+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for mythes.hxx" >&5
+$as_echo_n "checking for mythes.hxx... " >&6; }
+if test "${ac_cv_header_mythes_hxx+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mythes_hxx" >&5
+$as_echo "$ac_cv_header_mythes_hxx" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking mythes.hxx usability" >&5
+$as_echo_n "checking mythes.hxx usability... " >&6; }
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking mythes.hxx presence" >&5
+$as_echo_n "checking mythes.hxx presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <mythes.hxx>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: mythes.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: mythes.hxx: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: mythes.hxx: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: mythes.hxx:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: mythes.hxx: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: mythes.hxx:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: mythes.hxx: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: mythes.hxx: in the future, the compiler will take precedence" >&2;}
 
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for mythes.hxx" >&5
+$as_echo_n "checking for mythes.hxx... " >&6; }
+if test "${ac_cv_header_mythes_hxx+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_mythes_hxx=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mythes_hxx" >&5
+$as_echo "$ac_cv_header_mythes_hxx" >&6; }
+
+fi
+if test "x$ac_cv_header_mythes_hxx" = x""yes; then
+  :
 else
-   as_fn_error "mythes.hxx headers not found." "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: mythes.hxx headers not found." >&5
+$as_echo "$as_me: error: mythes.hxx headers not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lmythes" >&5
+
+{ $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 
@@ -18357,18 +24912,43 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_mythes_main=yes
 else
-  ac_cv_lib_mythes_main=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_mythes_main=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mythes_main" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mythes_main" >&5
 $as_echo "$ac_cv_lib_mythes_main" >&6; }
-if test "x$ac_cv_lib_mythes_main" = x""yes; then :
+if test "x$ac_cv_lib_mythes_main" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBMYTHES 1
 _ACEOF
@@ -18376,39 +24956,174 @@ _ACEOF
   LIBS="-lmythes $LIBS"
 
 else
-   as_fn_error "mythes library not found." "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: mythes library not found." >&5
+$as_echo "$as_me: error: mythes library not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+    { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
     SYSTEM_MYTHES=NO
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which lpsolve to use" >&5
+{ $as_echo "$as_me:$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
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+    { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
     SYSTEM_LPSOLVE=YES
-    ac_fn_c_check_header_mongrel "$LINENO" "lpsolve/lp_lib.h" "ac_cv_header_lpsolve_lp_lib_h" "$ac_includes_default"
-if test "x$ac_cv_header_lpsolve_lp_lib_h" = x""yes; then :
+    if test "${ac_cv_header_lpsolve_lp_lib_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for lpsolve/lp_lib.h" >&5
+$as_echo_n "checking for lpsolve/lp_lib.h... " >&6; }
+if test "${ac_cv_header_lpsolve_lp_lib_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lpsolve_lp_lib_h" >&5
+$as_echo "$ac_cv_header_lpsolve_lp_lib_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking lpsolve/lp_lib.h usability" >&5
+$as_echo_n "checking lpsolve/lp_lib.h usability... " >&6; }
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking lpsolve/lp_lib.h presence" >&5
+$as_echo_n "checking lpsolve/lp_lib.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <lpsolve/lp_lib.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: lpsolve/lp_lib.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: lpsolve/lp_lib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for lpsolve/lp_lib.h" >&5
+$as_echo_n "checking for lpsolve/lp_lib.h... " >&6; }
+if test "${ac_cv_header_lpsolve_lp_lib_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_lpsolve_lp_lib_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lpsolve_lp_lib_h" >&5
+$as_echo "$ac_cv_header_lpsolve_lp_lib_h" >&6; }
 
+fi
+if test "x$ac_cv_header_lpsolve_lp_lib_h" = x""yes; then
+  :
 else
-   as_fn_error "lpsolve headers not found." "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: lpsolve headers not found." >&5
+$as_echo "$as_me: error: lpsolve headers not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for make_lp in -llpsolve55" >&5
+
+{ $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -18426,18 +25141,43 @@ return make_lp ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_lpsolve55_make_lp=yes
 else
-  ac_cv_lib_lpsolve55_make_lp=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_lpsolve55_make_lp=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lpsolve55_make_lp" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lpsolve55_make_lp" >&5
 $as_echo "$ac_cv_lib_lpsolve55_make_lp" >&6; }
-if test "x$ac_cv_lib_lpsolve55_make_lp" = x""yes; then :
+if test "x$ac_cv_lib_lpsolve55_make_lp" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBLPSOLVE55 1
 _ACEOF
@@ -18445,11 +25185,13 @@ _ACEOF
   LIBS="-llpsolve55 $LIBS"
 
 else
-   as_fn_error "lpsolve library not found or too old." "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: lpsolve library not found or too old." >&5
+$as_echo "$as_me: error: lpsolve library not found or too old." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+    { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
     SYSTEM_LPSOLVE=NO
     BUILD_TYPE="$BUILD_TYPE LPSOLVE"
@@ -18457,17 +25199,21 @@ fi
 
 
 if test "$_os" = "Linux"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libc is >= 2.1.1" >&5
+   { $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnu_get_libc_version in -lc" >&5
+   { $as_echo "$as_me:$LINENO: checking for gnu_get_libc_version in -lc" >&5
 $as_echo_n "checking for gnu_get_libc_version in -lc... " >&6; }
-if test "${ac_cv_lib_c_gnu_get_libc_version+set}" = set; then :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -18485,32 +25231,59 @@ return gnu_get_libc_version ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_c_gnu_get_libc_version=yes
 else
-  ac_cv_lib_c_gnu_get_libc_version=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_c_gnu_get_libc_version=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_gnu_get_libc_version" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_gnu_get_libc_version" >&5
 $as_echo "$ac_cv_lib_c_gnu_get_libc_version" >&6; }
-if test "x$ac_cv_lib_c_gnu_get_libc_version" = x""yes; then :
+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
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+      { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
    else
-      as_fn_error "no, upgrade libc" "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: no, upgrade libc" >&5
+$as_echo "$as_me: error: no, upgrade libc" >&2;}
+   { (exit 1); exit 1; }; }
    fi
 fi
 
 if test \( "$_os" = "WINNT" \) ; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PSDK files" >&5
+	{ $as_echo "$as_me:$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
@@ -18532,12 +25305,19 @@ $as_echo_n "checking for PSDK files... " >&6; }
         PSDK_HOME=`echo $PSDK_HOME | $SED 's/\/$//'`
     # Problem with current PSDK (iz 49865)
     if test -f "$PSDK_HOME/Lib/libcp.lib"; then
-        as_fn_error "
+        { { $as_echo "$as_me:$LINENO: error:
+
+Some modules do not build correctly with MS Platform SDK - April 2005
+Edition if the library ($PSDK_HOME/Lib/libcp.lib) is found.
+Remove/rename/backup that file and restart configure. Details about this
+problem can be found in issue 49856." >&5
+$as_echo "$as_me: error:
 
 Some modules do not build correctly with MS Platform SDK - April 2005
 Edition if the library ($PSDK_HOME/Lib/libcp.lib) is found.
 Remove/rename/backup that file and restart configure. Details about this
-problem can be found in issue 49856." "$LINENO" 5
+problem can be found in issue 49856." >&2;}
+   { (exit 1); exit 1; }; }
     fi
 # WIndows SDK has different headers
 	if test \( -f "$PSDK_HOME/Include/adoint.h" \) \
@@ -18553,27 +25333,32 @@ problem can be found in issue 49856." "$LINENO" 5
 		HAVE_PSDK_LIB="no"
 	fi
     if test "$HAVE_PSDK_H" = "no" -o "$HAVE_PSDK_LIB" = "no"; then
-        as_fn_error "Some (all?) PSDK files not found, please check if all needed Platform SDKs
-are installed or use --with-psdk-home ." "$LINENO" 5
+        { { $as_echo "$as_me:$LINENO: error: Some (all?) PSDK files not found, please check if all needed Platform SDKs
+are installed or use --with-psdk-home ." >&5
+$as_echo "$as_me: error: Some (all?) PSDK files not found, please check if all needed Platform SDKs
+are installed or use --with-psdk-home ." >&2;}
+   { (exit 1); exit 1; }; }
     fi
     if test ! -x "$PSDK_HOME/bin/msiinfo.exe" \
          -o ! -x "$PSDK_HOME/bin/msidb.exe" \
          -o ! -x "$PSDK_HOME/bin/uuidgen.exe" \
          -o ! -x "$PSDK_HOME/bin/msitran.exe" ; then
-        as_fn_error "Some (all) files of the Windows Installer SDK are missing, please install." "$LINENO" 5
+        { { $as_echo "$as_me:$LINENO: error: Some (all) files of the Windows Installer SDK are missing, please install." >&5
+$as_echo "$as_me: error: Some (all) files of the Windows Installer SDK are missing, please install." >&2;}
+   { (exit 1); exit 1; }; }
     fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: SDK files found ...)" >&5
+    { $as_echo "$as_me:$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
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: Found Windows SDK 6.1 ($PSDK_HOME)" >&5
+        { $as_echo "$as_me:$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
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: Found Windows SDK 6.0 ($PSDK_HOME)" >&5
+        { $as_echo "$as_me:$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
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: Found Legacy Windows Platform SDK ($PSDK_HOME)" >&5
+        { $as_echo "$as_me:$LINENO: result: Found Legacy Windows Platform SDK ($PSDK_HOME)" >&5
 $as_echo "Found Legacy Windows Platform SDK ($PSDK_HOME)" >&6; }
     fi
 fi
@@ -18581,7 +25366,7 @@ fi
 
 
 if test \( "$_os" = "WINNT" \) ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DirectX SDK files" >&5
+    { $as_echo "$as_me:$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
@@ -18614,14 +25399,16 @@ $as_echo_n "checking for DirectX SDK files... " >&6; }
     fi
     if test -n "$ENABLE_DIRECTX"; then
 	    if test "$HAVE_DIRECTXSDK_H" = "yes" -a "$HAVE_DIRECTXSDK_LIB" = "yes"; then
-		    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+		    { $as_echo "$as_me:$LINENO: result: found" >&5
 $as_echo "found" >&6; }
 	    else
-		    as_fn_error "DirectX SDK files not found, please use --with-directx-home or -disable-directx." "$LINENO" 5
+		    { { $as_echo "$as_me:$LINENO: error: DirectX SDK files not found, please use --with-directx-home or -disable-directx." >&5
+$as_echo "$as_me: error: DirectX SDK files not found, please use --with-directx-home or -disable-directx." >&2;}
+   { (exit 1); exit 1; }; }
 	    fi
     else
 		DIRECTXSDK_HOME=""
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+		{ $as_echo "$as_me:$LINENO: result: disabled" >&5
 $as_echo "disabled" >&6; }
     fi
 fi
@@ -18630,13 +25417,13 @@ fi
 
 NSIS_PATH=""
 if test "$_os" = "WINNT" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSIS" >&5
+    { $as_echo "$as_me:$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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_NSIS_PATH+set}" = set; then :
+if test "${ac_cv_path_NSIS_PATH+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $NSIS_PATH in
@@ -18649,14 +25436,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -18664,10 +25451,10 @@ esac
 fi
 NSIS_PATH=$ac_cv_path_NSIS_PATH
 if test -n "$NSIS_PATH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NSIS_PATH" >&5
+  { $as_echo "$as_me:$LINENO: result: $NSIS_PATH" >&5
 $as_echo "$NSIS_PATH" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -18686,13 +25473,13 @@ fi
         NSIS_PATH="$nsistest"
     fi
     if test -z "$NSIS_PATH"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: NSIS not found, no self contained installer will be build." >&5
+        { $as_echo "$as_me:$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"`
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found ($NSIS_PATH)" >&5
+        { $as_echo "$as_me:$LINENO: result: found ($NSIS_PATH)" >&5
 $as_echo "found ($NSIS_PATH)" >&6; }
     fi
 fi
@@ -18700,9 +25487,9 @@ fi
 
 # Extract the first word of "bison", so it can be a program name with args.
 set dummy bison; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_BISON+set}" = set; then :
+if test "${ac_cv_path_BISON+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $BISON in
@@ -18715,14 +25502,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -18730,40 +25517,44 @@ esac
 fi
 BISON=$ac_cv_path_BISON
 if test -n "$BISON"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BISON" >&5
+  { $as_echo "$as_me:$LINENO: result: $BISON" >&5
 $as_echo "$BISON" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 if test -z "$BISON"; then
-   as_fn_error "no bison found in \$PATH, install bison" "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: no bison found in \$PATH, install bison" >&5
+$as_echo "$as_me: error: no bison found in \$PATH, install bison" >&2;}
+   { (exit 1); exit 1; }; }
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking the bison version" >&5
+   { $as_echo "$as_me:$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
-          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: suspect ($BISON $_bison_version)" >&5
+          { $as_echo "$as_me:$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
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked ($BISON $_bison_version)" >&5
+          { $as_echo "$as_me:$LINENO: result: checked ($BISON $_bison_version)" >&5
 $as_echo "checked ($BISON $_bison_version)" >&6; }
        fi
     else
-       as_fn_error "failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))" "$LINENO" 5
+       { { $as_echo "$as_me:$LINENO: error: failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))" >&5
+$as_echo "$as_me: error: failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))" >&2;}
+   { (exit 1); exit 1; }; }
     fi
 fi
 # Extract the first word of "flex", so it can be a program name with args.
 set dummy flex; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_FLEX+set}" = set; then :
+if test "${ac_cv_path_FLEX+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $FLEX in
@@ -18776,14 +25567,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -18791,22 +25582,24 @@ esac
 fi
 FLEX=$ac_cv_path_FLEX
 if test -n "$FLEX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLEX" >&5
+  { $as_echo "$as_me:$LINENO: result: $FLEX" >&5
 $as_echo "$FLEX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 if test -z "$FLEX"; then
-   as_fn_error "no flex found in \$PATH, install flex" "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: no flex found in \$PATH, install flex" >&5
+$as_echo "$as_me: error: no flex found in \$PATH, install flex" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 # Extract the first word of "patch", so it can be a program name with args.
 set dummy patch; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PATCH+set}" = set; then :
+if test "${ac_cv_path_PATCH+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PATCH in
@@ -18819,14 +25612,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -18834,16 +25627,18 @@ esac
 fi
 PATCH=$ac_cv_path_PATCH
 if test -n "$PATCH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATCH" >&5
+  { $as_echo "$as_me:$LINENO: result: $PATCH" >&5
 $as_echo "$PATCH" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 if test -z "$PATCH"; then
-   as_fn_error "\\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&5
+$as_echo "$as_me: error: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then
@@ -18853,17 +25648,21 @@ if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then
       if test -x "$with_gnu_patch"; then
 	GNUPATCH=$with_gnu_patch
       else
-        as_fn_error "--with-gnu-patch did not point to an executable" "$LINENO" 5
+        { { $as_echo "$as_me:$LINENO: error: --with-gnu-patch did not point to an executable" >&5
+$as_echo "$as_me: error: --with-gnu-patch did not point to an executable" >&2;}
+   { (exit 1); exit 1; }; }
       fi
    fi
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $GNUPATCH is GNU patch" >&5
+   { $as_echo "$as_me:$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
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+	{ $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
    else
-  	as_fn_error "no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" "$LINENO" 5
+  	{ { $as_echo "$as_me:$LINENO: error: no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" >&5
+$as_echo "$as_me: error: no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" >&2;}
+   { (exit 1); exit 1; }; }
    fi
 
 
@@ -18872,9 +25671,9 @@ $as_echo "yes" >&6; }
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GNUCP+set}" = set; then :
+if test "${ac_cv_path_GNUCP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $GNUCP in
@@ -18887,14 +25686,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -18902,10 +25701,10 @@ esac
 fi
 GNUCP=$ac_cv_path_GNUCP
 if test -n "$GNUCP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUCP" >&5
+  { $as_echo "$as_me:$LINENO: result: $GNUCP" >&5
 $as_echo "$GNUCP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -18914,32 +25713,38 @@ fi
 done
 
     if test -z $GNUCP; then
-      as_fn_error "Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" >&5
+$as_echo "$as_me: error: Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" >&2;}
+   { (exit 1); exit 1; }; }
     fi
   else
     if test -x "$with_gnu_cp"; then
       GNUCP=$with_gnu_cp
     else
-      as_fn_error "--with-gnu-cp did not point to an executable" "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: --with-gnu-cp did not point to an executable" >&5
+$as_echo "$as_me: error: --with-gnu-cp did not point to an executable" >&2;}
+   { (exit 1); exit 1; }; }
     fi
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $GNUCP is GNU cp" >&5
+  { $as_echo "$as_me:$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
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+	{ $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
   else
    if $GNUCP --version 2>/dev/null | grep "GNU fileutils" >/dev/null 2>/dev/null; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+	{ $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
    else
       if test "$_os" = "Darwin"; then
          GNUCP=''
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no gnucp found - using the system's cp command" >&5
+         { $as_echo "$as_me:$LINENO: result: no gnucp found - using the system's cp command" >&5
 $as_echo "no gnucp found - using the system's cp command" >&6; }
       else
-         as_fn_error "no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" "$LINENO" 5
+         { { $as_echo "$as_me:$LINENO: error: no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" >&5
+$as_echo "$as_me: error: no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" >&2;}
+   { (exit 1); exit 1; }; }
       fi
    fi
   fi
@@ -18952,9 +25757,9 @@ if test "$_os" = "WINNT"; then
     CYGWIN_PATH=""
     # Extract the first word of "bash", so it can be a program name with args.
 set dummy bash; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CYGWIN_PATH+set}" = set; then :
+if test "${ac_cv_path_CYGWIN_PATH+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $CYGWIN_PATH in
@@ -18967,14 +25772,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -18982,10 +25787,10 @@ esac
 fi
 CYGWIN_PATH=$ac_cv_path_CYGWIN_PATH
 if test -n "$CYGWIN_PATH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CYGWIN_PATH" >&5
+  { $as_echo "$as_me:$LINENO: result: $CYGWIN_PATH" >&5
 $as_echo "$CYGWIN_PATH" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -18998,7 +25803,7 @@ fi
 
 
 if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking ml.exe assembler path" >&5
+  { $as_echo "$as_me:$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"`
@@ -19006,9 +25811,9 @@ $as_echo_n "checking ml.exe assembler path... " >&6; }
   if test ! -x "$with_asm_home/ml.exe"; then
     # Extract the first word of "ml.exe", so it can be a program name with args.
 set dummy ml.exe; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ML_EXE+set}" = set; then :
+if test "${ac_cv_path_ML_EXE+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $ML_EXE in
@@ -19021,14 +25826,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -19036,10 +25841,10 @@ esac
 fi
 ML_EXE=$ac_cv_path_ML_EXE
 if test -n "$ML_EXE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ML_EXE" >&5
+  { $as_echo "$as_me:$LINENO: result: $ML_EXE" >&5
 $as_echo "$ML_EXE" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -19047,10 +25852,12 @@ fi
     if test -z "$ML_EXE"; then
       if test -x "$with_cl_home/bin/ml.exe"; then
         with_asm_home=$with_cl_home/bin
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found ($with_asm_home)" >&5
+        { $as_echo "$as_me:$LINENO: result: found ($with_asm_home)" >&5
 $as_echo "found ($with_asm_home)" >&6; }
       else
-        as_fn_error "Configure did not find ml.exe assembler." "$LINENO" 5
+        { { $as_echo "$as_me:$LINENO: error: Configure did not find ml.exe assembler." >&5
+$as_echo "$as_me: error: Configure did not find ml.exe assembler." >&2;}
+   { (exit 1); exit 1; }; }
       fi
     else
        with_asm_home="ASM_IN_PATH"
@@ -19061,7 +25868,7 @@ else
 fi
 ASM_HOME="$with_asm_home"
 if test -n "$ASM_HOME"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ASM_HOME" >&5
+  { $as_echo "$as_me:$LINENO: result: $ASM_HOME" >&5
 $as_echo "$ASM_HOME" >&6; }
 fi
 
@@ -19079,9 +25886,9 @@ if test -n "$with_zip_home" ; then
 else
     # Extract the first word of "zip", so it can be a program name with args.
 set dummy zip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ZIP+set}" = set; then :
+if test "${ac_cv_path_ZIP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $ZIP in
@@ -19094,14 +25901,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -19109,19 +25916,19 @@ esac
 fi
 ZIP=$ac_cv_path_ZIP
 if test -n "$ZIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZIP" >&5
+  { $as_echo "$as_me:$LINENO: result: $ZIP" >&5
 $as_echo "$ZIP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_UNZIP+set}" = set; then :
+if test "${ac_cv_path_UNZIP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $UNZIP in
@@ -19134,14 +25941,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -19149,10 +25956,10 @@ esac
 fi
 UNZIP=$ac_cv_path_UNZIP
 if test -n "$UNZIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNZIP" >&5
+  { $as_echo "$as_me:$LINENO: result: $UNZIP" >&5
 $as_echo "$UNZIP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -19160,43 +25967,59 @@ fi
     ZIP_HOME=`dirname "$ZIP"`
 fi
 if test -z "$ZIP" -o -z "$UNZIP"; then
-    as_fn_error "Zip/Unzip are required to build, please install or use --with-zip-home" "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: Zip/Unzip are required to build, please install or use --with-zip-home" >&5
+$as_echo "$as_me: error: Zip/Unzip are required to build, please install or use --with-zip-home" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 if test "$_os" = "WINNT"; then
     if test -n "`$ZIP -h | grep -i WinNT`" ; then
-as_fn_error "$ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." "$LINENO" 5
+{ { $as_echo "$as_me:$LINENO: error: $ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." >&5
+$as_echo "$as_me: error: $ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." >&2;}
+   { (exit 1); exit 1; }; }
     fi
 fi
 
 
 if test "$_os" = "WINNT"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unicows.dll" >&5
+   { $as_echo "$as_me:$LINENO: checking for unicows.dll" >&5
 $as_echo_n "checking for unicows.dll... " >&6; }
    if test -x ./external/unicows/unicows.dll; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+      { $as_echo "$as_me:$LINENO: result: found" >&5
 $as_echo "found" >&6; }
    else
-      as_fn_error "The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/.
+      { { $as_echo "$as_me:$LINENO: error: The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/.
+Get it from the Microsoft site and put it into external/unicows.
+(Note: Microsoft seems to enjoy changing the exact location of this file. You
+may have to search Microsoft's website.) Last time it was seen at:
+<http://download.microsoft.com/download/b/7/5/b75eace3-00e2-4aa0-9a6f-0b6882c71642/unicows.exe>." >&5
+$as_echo "$as_me: error: The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/.
 Get it from the Microsoft site and put it into external/unicows.
 (Note: Microsoft seems to enjoy changing the exact location of this file. You
 may have to search Microsoft's website.) Last time it was seen at:
-<http://download.microsoft.com/download/b/7/5/b75eace3-00e2-4aa0-9a6f-0b6882c71642/unicows.exe>." "$LINENO" 5
+<http://download.microsoft.com/download/b/7/5/b75eace3-00e2-4aa0-9a6f-0b6882c71642/unicows.exe>." >&2;}
+   { (exit 1); exit 1; }; }
    fi
 fi
 
 if test "$_os" = "WINNT"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbghelp.dll" >&5
+   { $as_echo "$as_me:$LINENO: checking for dbghelp.dll" >&5
 $as_echo_n "checking for dbghelp.dll... " >&6; }
    if test -x ./external/dbghelp/dbghelp.dll; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+      { $as_echo "$as_me:$LINENO: result: found" >&5
 $as_echo "found" >&6; }
    else
-      as_fn_error "dbghelp.dll is missing in external/dbghelp/.
+      { { $as_echo "$as_me:$LINENO: error: dbghelp.dll is missing in external/dbghelp/.
+Get it from the Microsoft site and put it into external/dbghelp.
+(Note: Microsoft seems to enjoy changing the exact location of this file. You
+may have to search Microsoft's website.) Last time it was seen at:
+<http://www.microsoft.com/downloads/release.asp?releaseid=30682>." >&5
+$as_echo "$as_me: error: dbghelp.dll is missing in external/dbghelp/.
 Get it from the Microsoft site and put it into external/dbghelp.
 (Note: Microsoft seems to enjoy changing the exact location of this file. You
 may have to search Microsoft's website.) Last time it was seen at:
-<http://www.microsoft.com/downloads/release.asp?releaseid=30682>." "$LINENO" 5
+<http://www.microsoft.com/downloads/release.asp?releaseid=30682>." >&2;}
+   { (exit 1); exit 1; }; }
    fi
 fi
 
@@ -19204,21 +26027,28 @@ if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
        if ./oowintool --msvc-copy-dlls ./external/msvcp ; then
           :
        else
-          as_fn_error "oowintool failed to copy CRT" "$LINENO" 5
+          { { $as_echo "$as_me:$LINENO: error: oowintool failed to copy CRT" >&5
+$as_echo "$as_me: error: oowintool failed to copy CRT" >&2;}
+   { (exit 1); exit 1; }; }
        fi
 fi
 
 if test "$_os" = "WINNT"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdiplus.dll" >&5
+   { $as_echo "$as_me:$LINENO: checking for gdiplus.dll" >&5
 $as_echo_n "checking for gdiplus.dll... " >&6; }
    if test -x ./external/gdiplus/gdiplus.dll; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+      { $as_echo "$as_me:$LINENO: result: found" >&5
 $as_echo "found" >&6; }
    else
-      as_fn_error "gdiplus.dll is missing in external/gdiplus/.
+      { { $as_echo "$as_me:$LINENO: error: gdiplus.dll is missing in external/gdiplus/.
 Get it from the Microsoft site and put it into external/gdiplus.
 You may have to search Microsoft's website. Last time it was seen at:
-<http://www.microsoft.com/downloads/details.aspx?familyid=6A63AB9C-DF12-4D41-933C-BE590FEAA05A&displaylang=en>." "$LINENO" 5
+<http://www.microsoft.com/downloads/details.aspx?familyid=6A63AB9C-DF12-4D41-933C-BE590FEAA05A&displaylang=en>." >&5
+$as_echo "$as_me: error: gdiplus.dll is missing in external/gdiplus/.
+Get it from the Microsoft site and put it into external/gdiplus.
+You may have to search Microsoft's website. Last time it was seen at:
+<http://www.microsoft.com/downloads/details.aspx?familyid=6A63AB9C-DF12-4D41-933C-BE590FEAA05A&displaylang=en>." >&2;}
+   { (exit 1); exit 1; }; }
    fi
 fi
 
@@ -19228,10 +26058,10 @@ fi
 
 if test "$_os" = "WINNT"; then
    if test  "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for instmsia.exe/instmsiw.exe" >&5
+   { $as_echo "$as_me:$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
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+      { $as_echo "$as_me:$LINENO: result: found" >&5
 $as_echo "found" >&6; }
    else
       MSIAPATH=`/bin/find "$COMPATH/.." -iname instmsia.exe | head -n 1`
@@ -19241,20 +26071,26 @@ $as_echo "found" >&6; }
          cp "$MSIWPATH" ./external/msi/ && chmod +x ./external/msi/instmsiw.exe && MSIWCOPY="OK"
       fi
       if test -z "$MSIACOPY" -o -z "$MSIWCOPY"; then
-         as_fn_error "instmsia.exe and/or instmsiw.exe are/is missing in the default location.
+         { { $as_echo "$as_me:$LINENO: error: instmsia.exe and/or instmsiw.exe are/is missing in the default location.
+These programs are part of the Visual Studio installation and should be found in a
+directory similar to:
+\"c:\\Program Files\\Microsoft Visual Studio .NET 2003\\Common7\\Tools\\Deployment\\MsiRedist\\\"
+As the automatic detection fails please copy the files to external/msi/." >&5
+$as_echo "$as_me: error: instmsia.exe and/or instmsiw.exe are/is missing in the default location.
 These programs are part of the Visual Studio installation and should be found in a
 directory similar to:
 \"c:\\Program Files\\Microsoft Visual Studio .NET 2003\\Common7\\Tools\\Deployment\\MsiRedist\\\"
-As the automatic detection fails please copy the files to external/msi/." "$LINENO" 5
+As the automatic detection fails please copy the files to external/msi/." >&2;}
+   { (exit 1); exit 1; }; }
       else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: found and copied" >&5
+         { $as_echo "$as_me:$LINENO: result: found and copied" >&5
 $as_echo "found and copied" >&6; }
       fi
    fi
 fi
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which VCLplugs shall be built" >&5
+{ $as_echo "$as_me:$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
@@ -19278,20 +26114,20 @@ fi
 
 
 if test -z "$R"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+	{ $as_echo "$as_me:$LINENO: result: none" >&5
 $as_echo "none" >&6; }
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $R" >&5
+	{ $as_echo "$as_me:$LINENO: result: $R" >&5
 $as_echo "$R" >&6; }
 fi
 
 
 ENABLE_GCONF=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable GConf support" >&5
+{ $as_echo "$as_me:$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"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+    { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 
   succeeded=no
@@ -19299,9 +26135,9 @@ $as_echo "yes" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -19314,14 +26150,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -19330,10 +26166,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -19348,24 +26184,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gconf-2.0 " >&5
+        { $as_echo "$as_me:$LINENO: checking for gconf-2.0 " >&5
 $as_echo_n "checking for gconf-2.0 ... " >&6; }
 
         if $PKG_CONFIG --exists "gconf-2.0 " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GCONF_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5
 $as_echo_n "checking GCONF_CFLAGS... " >&6; }
             GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONF_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5
 $as_echo "$GCONF_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GCONF_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking GCONF_LIBS" >&5
 $as_echo_n "checking GCONF_LIBS... " >&6; }
             GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONF_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5
 $as_echo "$GCONF_LIBS" >&6; }
         else
             GCONF_CFLAGS=""
@@ -19387,22 +26223,24 @@ $as_echo "$GCONF_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error "Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     { { $as_echo "$as_me:$LINENO: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+$as_echo "$as_me: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
   fi
 
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+    { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 
 ENABLE_GNOMEVFS=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable GNOME VFS support" >&5
+{ $as_echo "$as_me:$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"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+    { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 
   succeeded=no
@@ -19410,9 +26248,9 @@ $as_echo "yes" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -19425,14 +26263,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -19441,10 +26279,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -19459,24 +26297,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnome-vfs-2.0 >= 2.6.0 " >&5
+        { $as_echo "$as_me:$LINENO: checking for gnome-vfs-2.0 >= 2.6.0 " >&5
 $as_echo_n "checking for gnome-vfs-2.0 >= 2.6.0 ... " >&6; }
 
         if $PKG_CONFIG --exists "gnome-vfs-2.0 >= 2.6.0 " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNOMEVFS_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking GNOMEVFS_CFLAGS" >&5
 $as_echo_n "checking GNOMEVFS_CFLAGS... " >&6; }
             GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= 2.6.0 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNOMEVFS_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $GNOMEVFS_CFLAGS" >&5
 $as_echo "$GNOMEVFS_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNOMEVFS_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking GNOMEVFS_LIBS" >&5
 $as_echo_n "checking GNOMEVFS_LIBS... " >&6; }
             GNOMEVFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= 2.6.0 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNOMEVFS_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $GNOMEVFS_LIBS" >&5
 $as_echo "$GNOMEVFS_LIBS" >&6; }
         else
             GNOMEVFS_CFLAGS=""
@@ -19498,7 +26336,9 @@ $as_echo "$GNOMEVFS_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error "Library requirements (gnome-vfs-2.0 >= 2.6.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     { { $as_echo "$as_me:$LINENO: error: Library requirements (gnome-vfs-2.0 >= 2.6.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+$as_echo "$as_me: error: Library requirements (gnome-vfs-2.0 >= 2.6.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
   fi
 
     if test "$ENABLE_GCONF" != "TRUE"; then
@@ -19508,9 +26348,9 @@ $as_echo "$GNOMEVFS_LIBS" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -19523,14 +26363,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -19539,10 +26379,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -19557,24 +26397,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gconf-2.0 " >&5
+        { $as_echo "$as_me:$LINENO: checking for gconf-2.0 " >&5
 $as_echo_n "checking for gconf-2.0 ... " >&6; }
 
         if $PKG_CONFIG --exists "gconf-2.0 " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GCONF_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5
 $as_echo_n "checking GCONF_CFLAGS... " >&6; }
             GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONF_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5
 $as_echo "$GCONF_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GCONF_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking GCONF_LIBS" >&5
 $as_echo_n "checking GCONF_LIBS... " >&6; }
             GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONF_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5
 $as_echo "$GCONF_LIBS" >&6; }
         else
             GCONF_CFLAGS=""
@@ -19596,12 +26436,14 @@ $as_echo "$GCONF_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error "Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     { { $as_echo "$as_me:$LINENO: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+$as_echo "$as_me: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
   fi
 
     fi
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+    { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -19620,9 +26462,9 @@ if test  "$test_gtk" = "yes"; then
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -19635,14 +26477,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -19651,10 +26493,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -19669,24 +26511,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 " >&5
+        { $as_echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 " >&5
 $as_echo_n "checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 ... " >&6; }
 
         if $PKG_CONFIG --exists "gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK_CFLAGS" >&5
+            { $as_echo "$as_me:$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 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5
 $as_echo "$GTK_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK_LIBS" >&5
+            { $as_echo "$as_me:$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 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $GTK_LIBS" >&5
 $as_echo "$GTK_LIBS" >&6; }
         else
             GTK_CFLAGS=""
@@ -19708,7 +26550,9 @@ $as_echo "$GTK_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error "requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages" "$LINENO" 5
+     { { $as_echo "$as_me:$LINENO: error: requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages" >&5
+$as_echo "$as_me: error: requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages" >&2;}
+   { (exit 1); exit 1; }; }
   fi
 
       BUILD_TYPE="$BUILD_TYPE GTK"
@@ -19718,11 +26562,11 @@ $as_echo "$GTK_LIBS" >&6; }
          BUILD_TYPE="$BUILD_TYPE SYSTRAY_GTK"
       fi
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable DBUS support" >&5
+      { $as_echo "$as_me:$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"
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+          { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 
   succeeded=no
@@ -19730,9 +26574,9 @@ $as_echo "yes" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -19745,14 +26589,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -19761,10 +26605,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -19779,24 +26623,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus-glib-1 >= 0.70 " >&5
+        { $as_echo "$as_me:$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
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking DBUS_CFLAGS" >&5
 $as_echo_n "checking DBUS_CFLAGS... " >&6; }
             DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= 0.70 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $DBUS_CFLAGS" >&5
 $as_echo "$DBUS_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking DBUS_LIBS" >&5
 $as_echo_n "checking DBUS_LIBS... " >&6; }
             DBUS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= 0.70 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $DBUS_LIBS" >&5
 $as_echo "$DBUS_LIBS" >&6; }
         else
             DBUS_CFLAGS=""
@@ -19818,22 +26662,26 @@ $as_echo "$DBUS_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error "Library requirements (dbus-glib-1 >= 0.70 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     { { $as_echo "$as_me:$LINENO: error: Library requirements (dbus-glib-1 >= 0.70 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+$as_echo "$as_me: error: Library requirements (dbus-glib-1 >= 0.70 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
   fi
 
       else
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+          { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
       fi
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable GIO support" >&5
+      { $as_echo "$as_me:$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
-             as_fn_error "please use --enable-gio only together with --disable-gnome-vfs." "$LINENO" 5
+             { { $as_echo "$as_me:$LINENO: error: please use --enable-gio only together with --disable-gnome-vfs." >&5
+$as_echo "$as_me: error: please use --enable-gio only together with --disable-gnome-vfs." >&2;}
+   { (exit 1); exit 1; }; }
           fi
           ENABLE_GIO="TRUE"
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+          { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 
   succeeded=no
@@ -19841,9 +26689,9 @@ $as_echo "yes" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -19856,14 +26704,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -19872,10 +26720,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -19890,24 +26738,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-2.0 " >&5
+        { $as_echo "$as_me:$LINENO: checking for gio-2.0 " >&5
 $as_echo_n "checking for gio-2.0 ... " >&6; }
 
         if $PKG_CONFIG --exists "gio-2.0 " ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GIO_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking GIO_CFLAGS" >&5
 $as_echo_n "checking GIO_CFLAGS... " >&6; }
             GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIO_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $GIO_CFLAGS" >&5
 $as_echo "$GIO_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GIO_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking GIO_LIBS" >&5
 $as_echo_n "checking GIO_LIBS... " >&6; }
             GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIO_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $GIO_LIBS" >&5
 $as_echo "$GIO_LIBS" >&6; }
         else
             GIO_CFLAGS=""
@@ -19929,11 +26777,13 @@ $as_echo "$GIO_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error "Library requirements (gio-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     { { $as_echo "$as_me:$LINENO: error: Library requirements (gio-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+$as_echo "$as_me: error: Library requirements (gio-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
   fi
 
       else
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+          { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
       fi
 
@@ -19953,17 +26803,17 @@ SYSTEM_CAIRO=""
 
 if test  "$test_cairo" = "yes"; then
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use cairo" >&5
+    { $as_echo "$as_me:$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"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+	{ $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking which cairo to use" >&5
+        { $as_echo "$as_me:$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
-           { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+           { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
            SYSTEM_CAIRO=YES
 
@@ -19973,9 +26823,9 @@ $as_echo "external" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -19988,14 +26838,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -20004,10 +26854,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -20022,24 +26872,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cairo >= 1.0.2 " >&5
+        { $as_echo "$as_me:$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
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking CAIRO_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking CAIRO_CFLAGS" >&5
 $as_echo_n "checking CAIRO_CFLAGS... " >&6; }
             CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 1.0.2 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CAIRO_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $CAIRO_CFLAGS" >&5
 $as_echo "$CAIRO_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking CAIRO_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking CAIRO_LIBS" >&5
 $as_echo_n "checking CAIRO_LIBS... " >&6; }
             CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= 1.0.2 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CAIRO_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $CAIRO_LIBS" >&5
 $as_echo "$CAIRO_LIBS" >&6; }
         else
             CAIRO_CFLAGS=""
@@ -20061,22 +26911,33 @@ $as_echo "$CAIRO_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error "Library requirements (cairo >= 1.0.2 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     { { $as_echo "$as_me:$LINENO: error: Library requirements (cairo >= 1.0.2 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+$as_echo "$as_me: error: Library requirements (cairo >= 1.0.2 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
   fi
 
 	   if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$ENABLE_FONTCONFIG" != "TRUE" ; then
-	      as_fn_error "Cairo library requires fontconfig." "$LINENO" 5
+	      { { $as_echo "$as_me:$LINENO: error: Cairo library requires fontconfig." >&5
+$as_echo "$as_me: error: Cairo library requires fontconfig." >&2;}
+   { (exit 1); exit 1; }; }
 	   fi
            if test "$with_system_xrender_headers" = "yes"; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Xrender.h defines PictStandardA8" >&5
+              { $as_echo "$as_me:$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
+              if test "$cross_compiling" = yes; then
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_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
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <X11/extensions/Xrender.h>
@@ -20090,27 +26951,56 @@ int main(int argc, char **argv) {
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  as_fn_error "no, X headers too old." "$LINENO" 5
+  $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
+
+( exit $ac_status )
+{ { $as_echo "$as_me:$LINENO: error: no, X headers too old." >&5
+$as_echo "$as_me: error: no, X headers too old." >&2;}
+   { (exit 1); exit 1; }; }
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+
            fi
         else
            BUILD_TYPE="$BUILD_TYPE CAIRO"
 	   	   if test "$build_cpu" != "x86_64"; then
 	      BUILD_PIXMAN=YES
 	   fi
-           { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+           { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
         fi
     else
-	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
     fi
 fi
@@ -20122,29 +27012,162 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the OpenGL Transitions component" >&5
+{ $as_echo "$as_me:$LINENO: checking whether to build the OpenGL Transitions component" >&5
 $as_echo_n "checking whether to build the OpenGL Transitions component... " >&6; }
 ENABLE_OPENGL=
 
 if test "x$enable_opengl" != "xno" ; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:$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 :
+   if test "${ac_cv_header_GL_gl_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for GL/gl.h" >&5
+$as_echo_n "checking for GL/gl.h... " >&6; }
+if test "${ac_cv_header_GL_gl_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5
+$as_echo "$ac_cv_header_GL_gl_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking GL/gl.h usability" >&5
+$as_echo_n "checking GL/gl.h usability... " >&6; }
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking GL/gl.h presence" >&5
+$as_echo_n "checking GL/gl.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <GL/gl.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: GL/gl.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: GL/gl.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: GL/gl.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: GL/gl.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: GL/gl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&2;}
 
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for GL/gl.h" >&5
+$as_echo_n "checking for GL/gl.h... " >&6; }
+if test "${ac_cv_header_GL_gl_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_GL_gl_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5
+$as_echo "$ac_cv_header_GL_gl_h" >&6; }
+
+fi
+if test "x$ac_cv_header_GL_gl_h" = x""yes; then
+  :
 else
-  as_fn_error "OpenGL headers not found" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: OpenGL headers not found" >&5
+$as_echo "$as_me: error: OpenGL headers not found" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lGL" >&5
+
+{ $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 
@@ -20156,18 +27179,43 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_GL_main=yes
 else
-  ac_cv_lib_GL_main=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_GL_main=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_main" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_GL_main" >&5
 $as_echo "$ac_cv_lib_GL_main" >&6; }
-if test "x$ac_cv_lib_GL_main" = x""yes; then :
+if test "x$ac_cv_lib_GL_main" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBGL 1
 _ACEOF
@@ -20175,17 +27223,24 @@ _ACEOF
   LIBS="-lGL $LIBS"
 
 else
-  as_fn_error "libGL not installed or functional" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: libGL not installed or functional" >&5
+$as_echo "$as_me: error: libGL not installed or functional" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lGLU" >&5
+
+{ $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 
@@ -20197,18 +27252,43 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_GLU_main=yes
 else
-  ac_cv_lib_GLU_main=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_GLU_main=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLU_main" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_main" >&5
 $as_echo "$ac_cv_lib_GLU_main" >&6; }
-if test "x$ac_cv_lib_GLU_main" = x""yes; then :
+if test "x$ac_cv_lib_GLU_main" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBGLU 1
 _ACEOF
@@ -20216,68 +27296,70 @@ _ACEOF
   LIBS="-lGLU $LIBS"
 
 else
-  as_fn_error "libGLU not installed or functional" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: libGLU not installed or functional" >&5
+$as_echo "$as_me: error: libGLU not installed or functional" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
    ENABLE_OPENGL=TRUE
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build extra presenter ui" >&5
+{ $as_echo "$as_me:$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 "$as_me:$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 "$as_me:$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 "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
    ENABLE_MINIMIZER=YES
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
    ENABLE_MINIMIZER=NO
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the Presenter Screen extension" >&5
+{ $as_echo "$as_me:$LINENO: checking whether to build the Presenter Screen extension" >&5
 $as_echo_n "checking whether to build the Presenter Screen extension... " >&6; }
 if test -n "$enable_presenter_console" -a "$enable_presenter_screen" != "no"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
    ENABLE_PRESENTER_SCREEN=YES
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
    ENABLE_PRESENTER_SCREEN=NO
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the PDF Import extension" >&5
+{ $as_echo "$as_me:$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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
   ENABLE_PDFIMPORT=YES
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking which pdf backend to use" >&5
+        { $as_echo "$as_me:$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
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+      { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
       SYSTEM_POPPLER=YES
 
@@ -20286,9 +27368,9 @@ $as_echo "external" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -20301,14 +27383,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -20317,10 +27399,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -20335,24 +27417,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for poppler >= 0.8.0 " >&5
+        { $as_echo "$as_me:$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
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking POPPLER_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking POPPLER_CFLAGS" >&5
 $as_echo_n "checking POPPLER_CFLAGS... " >&6; }
             POPPLER_CFLAGS=`$PKG_CONFIG --cflags "poppler >= 0.8.0 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $POPPLER_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $POPPLER_CFLAGS" >&5
 $as_echo "$POPPLER_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking POPPLER_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking POPPLER_LIBS" >&5
 $as_echo_n "checking POPPLER_LIBS... " >&6; }
             POPPLER_LIBS=`$PKG_CONFIG --libs "poppler >= 0.8.0 "`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $POPPLER_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $POPPLER_LIBS" >&5
 $as_echo "$POPPLER_LIBS" >&6; }
         else
             POPPLER_CFLAGS=""
@@ -20374,25 +27456,29 @@ $as_echo "$POPPLER_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error "Library requirements (poppler >= 0.8.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     { { $as_echo "$as_me:$LINENO: error: Library requirements (poppler >= 0.8.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+$as_echo "$as_me: error: Library requirements (poppler >= 0.8.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
   fi
 
   else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+      { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
       SYSTEM_POPPLER=NO
       BUILD_TYPE="$BUILD_TYPE XPDF"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xpdf module" >&5
+      { $as_echo "$as_me:$LINENO: checking for xpdf module" >&5
 $as_echo_n "checking for xpdf module... " >&6; }
       if test -d ./xpdf; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
+       { $as_echo "$as_me:$LINENO: result: OK" >&5
 $as_echo "OK" >&6; }
       else
-        as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
+        { { $as_echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5
+$as_echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;}
+   { (exit 1); exit 1; }; }
       fi
   fi
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
    ENABLE_PDFIMPORT=NO
 fi
@@ -20402,75 +27488,85 @@ fi
 
 
 if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sdext module" >&5
+  { $as_echo "$as_me:$LINENO: checking for sdext module" >&5
 $as_echo_n "checking for sdext module... " >&6; }
   if test -d ./sdext; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
+   { $as_echo "$as_me:$LINENO: result: OK" >&5
 $as_echo "OK" >&6; }
   else
-   as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5
+$as_echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;}
+   { (exit 1); exit 1; }; }
   fi
   BUILD_TYPE="$BUILD_TYPE SDEXT"
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the Wiki Publisher extension" >&5
+{ $as_echo "$as_me:$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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for swext module" >&5
+  { $as_echo "$as_me:$LINENO: checking for swext module" >&5
 $as_echo_n "checking for swext module... " >&6; }
   if test -d ./swext; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
+   { $as_echo "$as_me:$LINENO: result: OK" >&5
 $as_echo "OK" >&6; }
   else
-   as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5
+$as_echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;}
+   { (exit 1); exit 1; }; }
   fi
   ENABLE_MEDIAWIKI=YES
   BUILD_TYPE="$BUILD_TYPE SWEXT"
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
   ENABLE_MEDIAWIKI=NO
 fi
 
 
 if test "$ENABLE_MEDIAWIKI" == "YES"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which Servlet API Jar to use" >&5
+  { $as_echo "$as_me:$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
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+    { $as_echo "$as_me:$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=`$as_echo "ac_cv_file_$SERVLETAPI_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SERVLETAPI_JAR" >&5
+{ $as_echo "$as_me:$LINENO: checking for $SERVLETAPI_JAR" >&5
 $as_echo_n "checking for $SERVLETAPI_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$SERVLETAPI_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   if test "x$as_val" = x""yes; then :
-
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  :
 else
-  as_fn_error "servlet-api.jar not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: servlet-api.jar not found." >&5
+$as_echo "$as_me: error: servlet-api.jar not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+    { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
     SYSTEM_SERVLETAPI=NO
     BUILD_TYPE="$BUILD_TYPE TOMCAT"
@@ -20479,93 +27575,107 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the Report Builder extension" >&5
+{ $as_echo "$as_me:$LINENO: checking whether to build the Report Builder extension" >&5
 $as_echo_n "checking whether to build the Report Builder extension... " >&6; }
 if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test "$WITH_JAVA" != "no"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
   ENABLE_REPORTBUILDER=YES
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for reportbuilder module" >&5
+  { $as_echo "$as_me:$LINENO: checking for reportbuilder module" >&5
 $as_echo_n "checking for reportbuilder module... " >&6; }
   if test -d ./reportbuilder; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
+    { $as_echo "$as_me:$LINENO: result: OK" >&5
 $as_echo "OK" >&6; }
   else
-    as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5
+$as_echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;}
+   { (exit 1); exit 1; }; }
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which jfreereport libs to use" >&5
+  { $as_echo "$as_me:$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
-  	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+  	   { $as_echo "$as_me:$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=`$as_echo "ac_cv_file_$SAC_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SAC_JAR" >&5
+{ $as_echo "$as_me:$LINENO: checking for $SAC_JAR" >&5
 $as_echo_n "checking for $SAC_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$SAC_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   if test "x$as_val" = x""yes; then :
-
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  :
 else
-  as_fn_error "sac.jar not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: sac.jar not found." >&5
+$as_echo "$as_me: error: sac.jar not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
       if test -z $LIBXML_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libxml-1.0.0.jar" >&5
+        { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libxml-1.0.0.jar" >&5
 $as_echo_n "checking for /usr/share/java/libxml-1.0.0.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_libxml_1_0_0_jar+set}" = set; then :
+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 &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libxml-1.0.0.jar"; then
   ac_cv_file__usr_share_java_libxml_1_0_0_jar=yes
 else
   ac_cv_file__usr_share_java_libxml_1_0_0_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libxml_1_0_0_jar" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libxml_1_0_0_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_libxml_1_0_0_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libxml_1_0_0_jar" = x""yes; then :
+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
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libxml.jar" >&5
+            { $as_echo "$as_me:$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 :
+if test "${ac_cv_file__usr_share_java_libxml_jar+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libxml.jar"; then
   ac_cv_file__usr_share_java_libxml_jar=yes
 else
   ac_cv_file__usr_share_java_libxml_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libxml_jar" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libxml_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_libxml_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libxml_jar" = x""yes; then :
+if test "x$ac_cv_file__usr_share_java_libxml_jar" = x""yes; then
    LIBXML_JAR=/usr/share/java/libxml.jar
 else
-  as_fn_error "libxml.jar replacement not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: libxml.jar replacement not found." >&5
+$as_echo "$as_me: error: libxml.jar replacement not found." >&2;}
+   { (exit 1); exit 1; }; }
 
 fi
 
@@ -20575,70 +27685,82 @@ fi
 
       else
         as_ac_File=`$as_echo "ac_cv_file_$LIBXML_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBXML_JAR" >&5
+{ $as_echo "$as_me:$LINENO: checking for $LIBXML_JAR" >&5
 $as_echo_n "checking for $LIBXML_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$LIBXML_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   if test "x$as_val" = x""yes; then :
-
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  :
 else
-  as_fn_error "libxml.jar not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: libxml.jar not found." >&5
+$as_echo "$as_me: error: libxml.jar not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
       fi
 
       if test -z $FLUTE_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/flute-1.3.0.jar" >&5
+        { $as_echo "$as_me:$LINENO: checking for /usr/share/java/flute-1.3.0.jar" >&5
 $as_echo_n "checking for /usr/share/java/flute-1.3.0.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_flute_1_3_0_jar+set}" = set; then :
+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 &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/flute-1.3.0.jar"; then
   ac_cv_file__usr_share_java_flute_1_3_0_jar=yes
 else
   ac_cv_file__usr_share_java_flute_1_3_0_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_flute_1_3_0_jar" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flute_1_3_0_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_flute_1_3_0_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_flute_1_3_0_jar" = x""yes; then :
+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
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/flute.jar" >&5
+            { $as_echo "$as_me:$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 :
+if test "${ac_cv_file__usr_share_java_flute_jar+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/flute.jar"; then
   ac_cv_file__usr_share_java_flute_jar=yes
 else
   ac_cv_file__usr_share_java_flute_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_flute_jar" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flute_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_flute_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_flute_jar" = x""yes; then :
+if test "x$ac_cv_file__usr_share_java_flute_jar" = x""yes; then
    FLUTE_JAR=/usr/share/java/flute.jar
 else
-   as_fn_error "flute-1.3.0.jar replacement not found." "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: flute-1.3.0.jar replacement not found." >&5
+$as_echo "$as_me: error: flute-1.3.0.jar replacement not found." >&2;}
+   { (exit 1); exit 1; }; }
 
 fi
 
@@ -20648,70 +27770,82 @@ fi
 
       else
         as_ac_File=`$as_echo "ac_cv_file_$FLUTE_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $FLUTE_JAR" >&5
+{ $as_echo "$as_me:$LINENO: checking for $FLUTE_JAR" >&5
 $as_echo_n "checking for $FLUTE_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$FLUTE_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   if test "x$as_val" = x""yes; then :
-
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  :
 else
-  as_fn_error "flute-1.3.0.jar not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: flute-1.3.0.jar not found." >&5
+$as_echo "$as_me: error: flute-1.3.0.jar not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
       fi
 
       if test -z $JFREEREPORT_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/flow-engine-0.9.2.jar" >&5
+        { $as_echo "$as_me:$LINENO: checking for /usr/share/java/flow-engine-0.9.2.jar" >&5
 $as_echo_n "checking for /usr/share/java/flow-engine-0.9.2.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_flow_engine_0_9_2_jar+set}" = set; then :
+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 &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/flow-engine-0.9.2.jar"; then
   ac_cv_file__usr_share_java_flow_engine_0_9_2_jar=yes
 else
   ac_cv_file__usr_share_java_flow_engine_0_9_2_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" = x""yes; then :
+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
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/flow-engine.jar" >&5
+            { $as_echo "$as_me:$LINENO: checking for /usr/share/java/flow-engine.jar" >&5
 $as_echo_n "checking for /usr/share/java/flow-engine.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_flow_engine_jar+set}" = set; then :
+if test "${ac_cv_file__usr_share_java_flow_engine_jar+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/flow-engine.jar"; then
   ac_cv_file__usr_share_java_flow_engine_jar=yes
 else
   ac_cv_file__usr_share_java_flow_engine_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_flow_engine_jar" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flow_engine_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_flow_engine_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_flow_engine_jar" = x""yes; then :
+if test "x$ac_cv_file__usr_share_java_flow_engine_jar" = x""yes; then
    JFREEREPORT_JAR=/usr/share/java/flow-engine.jar
 else
-  as_fn_error "jfreereport.jar replacement not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: jfreereport.jar replacement not found." >&5
+$as_echo "$as_me: error: jfreereport.jar replacement not found." >&2;}
+   { (exit 1); exit 1; }; }
 
 fi
 
@@ -20721,70 +27855,82 @@ fi
 
       else
         as_ac_File=`$as_echo "ac_cv_file_$JFREEREPORT_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $JFREEREPORT_JAR" >&5
+{ $as_echo "$as_me:$LINENO: checking for $JFREEREPORT_JAR" >&5
 $as_echo_n "checking for $JFREEREPORT_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$JFREEREPORT_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   if test "x$as_val" = x""yes; then :
-
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  :
 else
-  as_fn_error "jfreereport.jar not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: jfreereport.jar not found." >&5
+$as_echo "$as_me: error: jfreereport.jar not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
       fi
 
       if test -z $LIBLAYOUT_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/liblayout-0.2.9.jar" >&5
+        { $as_echo "$as_me:$LINENO: checking for /usr/share/java/liblayout-0.2.9.jar" >&5
 $as_echo_n "checking for /usr/share/java/liblayout-0.2.9.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_liblayout_0_2_9_jar+set}" = set; then :
+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 &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/liblayout-0.2.9.jar"; then
   ac_cv_file__usr_share_java_liblayout_0_2_9_jar=yes
 else
   ac_cv_file__usr_share_java_liblayout_0_2_9_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_liblayout_0_2_9_jar" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_liblayout_0_2_9_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_liblayout_0_2_9_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_liblayout_0_2_9_jar" = x""yes; then :
+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
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/liblayout.jar" >&5
+            { $as_echo "$as_me:$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 :
+if test "${ac_cv_file__usr_share_java_liblayout_jar+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/liblayout.jar"; then
   ac_cv_file__usr_share_java_liblayout_jar=yes
 else
   ac_cv_file__usr_share_java_liblayout_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_liblayout_jar" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_liblayout_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_liblayout_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_liblayout_jar" = x""yes; then :
+if test "x$ac_cv_file__usr_share_java_liblayout_jar" = x""yes; then
    LIBLAYOUT_JAR=/usr/share/java/liblayout.jar
 else
-  as_fn_error "liblayout.jar replacement not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: liblayout.jar replacement not found." >&5
+$as_echo "$as_me: error: liblayout.jar replacement not found." >&2;}
+   { (exit 1); exit 1; }; }
 
 fi
 
@@ -20794,70 +27940,82 @@ fi
 
       else
         as_ac_File=`$as_echo "ac_cv_file_$LIBLAYOUT_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBLAYOUT_JAR" >&5
+{ $as_echo "$as_me:$LINENO: checking for $LIBLAYOUT_JAR" >&5
 $as_echo_n "checking for $LIBLAYOUT_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$LIBLAYOUT_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   if test "x$as_val" = x""yes; then :
-
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  :
 else
-  as_fn_error "liblayout.jar not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: liblayout.jar not found." >&5
+$as_echo "$as_me: error: liblayout.jar not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
       fi
 
       if test -z $LIBLOADER_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libloader-1.0.0.jar" >&5
+        { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libloader-1.0.0.jar" >&5
 $as_echo_n "checking for /usr/share/java/libloader-1.0.0.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_libloader_1_0_0_jar+set}" = set; then :
+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 &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libloader-1.0.0.jar"; then
   ac_cv_file__usr_share_java_libloader_1_0_0_jar=yes
 else
   ac_cv_file__usr_share_java_libloader_1_0_0_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libloader_1_0_0_jar" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libloader_1_0_0_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_libloader_1_0_0_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libloader_1_0_0_jar" = x""yes; then :
+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
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libloader.jar" >&5
+            { $as_echo "$as_me:$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 :
+if test "${ac_cv_file__usr_share_java_libloader_jar+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libloader.jar"; then
   ac_cv_file__usr_share_java_libloader_jar=yes
 else
   ac_cv_file__usr_share_java_libloader_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libloader_jar" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libloader_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_libloader_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libloader_jar" = x""yes; then :
+if test "x$ac_cv_file__usr_share_java_libloader_jar" = x""yes; then
    LIBLOADER_JAR=/usr/share/java/libloader.jar
 else
-  as_fn_error "libloader.jar replacement not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: libloader.jar replacement not found." >&5
+$as_echo "$as_me: error: libloader.jar replacement not found." >&2;}
+   { (exit 1); exit 1; }; }
 
 fi
 
@@ -20867,70 +28025,82 @@ fi
 
       else
         as_ac_File=`$as_echo "ac_cv_file_$LIBLOADER_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBLOADER_JAR" >&5
+{ $as_echo "$as_me:$LINENO: checking for $LIBLOADER_JAR" >&5
 $as_echo_n "checking for $LIBLOADER_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$LIBLOADER_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   if test "x$as_val" = x""yes; then :
-
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  :
 else
-  as_fn_error "libloader.jar not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: libloader.jar not found." >&5
+$as_echo "$as_me: error: libloader.jar not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
       fi
 
       if test -z $LIBFORMULA_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libformula-0.2.0.jar" >&5
+        { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libformula-0.2.0.jar" >&5
 $as_echo_n "checking for /usr/share/java/libformula-0.2.0.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_libformula_0_2_0_jar+set}" = set; then :
+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 &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libformula-0.2.0.jar"; then
   ac_cv_file__usr_share_java_libformula_0_2_0_jar=yes
 else
   ac_cv_file__usr_share_java_libformula_0_2_0_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libformula_0_2_0_jar" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libformula_0_2_0_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_libformula_0_2_0_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libformula_0_2_0_jar" = x""yes; then :
+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
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libformula.jar" >&5
+            { $as_echo "$as_me:$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 :
+if test "${ac_cv_file__usr_share_java_libformula_jar+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libformula.jar"; then
   ac_cv_file__usr_share_java_libformula_jar=yes
 else
   ac_cv_file__usr_share_java_libformula_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libformula_jar" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libformula_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_libformula_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libformula_jar" = x""yes; then :
+if test "x$ac_cv_file__usr_share_java_libformula_jar" = x""yes; then
    LIBFORMULA_JAR=/usr/share/java/libformula.jar
 else
-  as_fn_error "libformula.jar replacement not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: libformula.jar replacement not found." >&5
+$as_echo "$as_me: error: libformula.jar replacement not found." >&2;}
+   { (exit 1); exit 1; }; }
 
 fi
 
@@ -20940,70 +28110,82 @@ fi
 
       else
         as_ac_File=`$as_echo "ac_cv_file_$LIBFORMULA_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBFORMULA_JAR" >&5
+{ $as_echo "$as_me:$LINENO: checking for $LIBFORMULA_JAR" >&5
 $as_echo_n "checking for $LIBFORMULA_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$LIBFORMULA_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   if test "x$as_val" = x""yes; then :
-
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  :
 else
-  as_fn_error "libformula.jar not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: libformula.jar not found." >&5
+$as_echo "$as_me: error: libformula.jar not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
       fi
 
       if test -z $LIBREPOSITORY_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/librepository-1.0.0.jar" >&5
+        { $as_echo "$as_me:$LINENO: checking for /usr/share/java/librepository-1.0.0.jar" >&5
 $as_echo_n "checking for /usr/share/java/librepository-1.0.0.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_librepository_1_0_0_jar+set}" = set; then :
+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 &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/librepository-1.0.0.jar"; then
   ac_cv_file__usr_share_java_librepository_1_0_0_jar=yes
 else
   ac_cv_file__usr_share_java_librepository_1_0_0_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_librepository_1_0_0_jar" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_librepository_1_0_0_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_librepository_1_0_0_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_librepository_1_0_0_jar" = x""yes; then :
+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
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/librepository.jar" >&5
+            { $as_echo "$as_me:$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 :
+if test "${ac_cv_file__usr_share_java_librepository_jar+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/librepository.jar"; then
   ac_cv_file__usr_share_java_librepository_jar=yes
 else
   ac_cv_file__usr_share_java_librepository_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_librepository_jar" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_librepository_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_librepository_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_librepository_jar" = x""yes; then :
+if test "x$ac_cv_file__usr_share_java_librepository_jar" = x""yes; then
    LIBREPOSITORY_JAR=/usr/share/java/librepository.jar
 else
-  as_fn_error "librepository.jar replacement not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: librepository.jar replacement not found." >&5
+$as_echo "$as_me: error: librepository.jar replacement not found." >&2;}
+   { (exit 1); exit 1; }; }
 
 fi
 
@@ -21013,70 +28195,82 @@ fi
 
       else
         as_ac_File=`$as_echo "ac_cv_file_$LIBREPOSITORY_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBREPOSITORY_JAR" >&5
+{ $as_echo "$as_me:$LINENO: checking for $LIBREPOSITORY_JAR" >&5
 $as_echo_n "checking for $LIBREPOSITORY_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$LIBREPOSITORY_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   if test "x$as_val" = x""yes; then :
-
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  :
 else
-  as_fn_error "librepository.jar not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: librepository.jar not found." >&5
+$as_echo "$as_me: error: librepository.jar not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
       fi
 
       if test -z $LIBFONTS_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libfonts-1.0.0.jar" >&5
+        { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libfonts-1.0.0.jar" >&5
 $as_echo_n "checking for /usr/share/java/libfonts-1.0.0.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_libfonts_1_0_0_jar+set}" = set; then :
+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 &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libfonts-1.0.0.jar"; then
   ac_cv_file__usr_share_java_libfonts_1_0_0_jar=yes
 else
   ac_cv_file__usr_share_java_libfonts_1_0_0_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libfonts_1_0_0_jar" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libfonts_1_0_0_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_libfonts_1_0_0_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libfonts_1_0_0_jar" = x""yes; then :
+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
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libfonts.jar" >&5
+            { $as_echo "$as_me:$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 :
+if test "${ac_cv_file__usr_share_java_libfonts_jar+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libfonts.jar"; then
   ac_cv_file__usr_share_java_libfonts_jar=yes
 else
   ac_cv_file__usr_share_java_libfonts_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libfonts_jar" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libfonts_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_libfonts_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libfonts_jar" = x""yes; then :
+if test "x$ac_cv_file__usr_share_java_libfonts_jar" = x""yes; then
    LIBFONTS_JAR=/usr/share/java/libfonts.jar
 else
-  as_fn_error "libfonts.jar replacement not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: libfonts.jar replacement not found." >&5
+$as_echo "$as_me: error: libfonts.jar replacement not found." >&2;}
+   { (exit 1); exit 1; }; }
 
 fi
 
@@ -21086,70 +28280,82 @@ fi
 
       else
         as_ac_File=`$as_echo "ac_cv_file_$LIBFONTS_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBFONTS_JAR" >&5
+{ $as_echo "$as_me:$LINENO: checking for $LIBFONTS_JAR" >&5
 $as_echo_n "checking for $LIBFONTS_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$LIBFONTS_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   if test "x$as_val" = x""yes; then :
-
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  :
 else
-  as_fn_error "libfonts.jar not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: libfonts.jar not found." >&5
+$as_echo "$as_me: error: libfonts.jar not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
       fi
 
       if test -z $LIBSERIALIZER_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libserializer-1.0.0.jar" >&5
+        { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libserializer-1.0.0.jar" >&5
 $as_echo_n "checking for /usr/share/java/libserializer-1.0.0.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_libserializer_1_0_0_jar+set}" = set; then :
+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 &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libserializer-1.0.0.jar"; then
   ac_cv_file__usr_share_java_libserializer_1_0_0_jar=yes
 else
   ac_cv_file__usr_share_java_libserializer_1_0_0_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libserializer_1_0_0_jar" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libserializer_1_0_0_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_libserializer_1_0_0_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libserializer_1_0_0_jar" = x""yes; then :
+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
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libserializer.jar" >&5
+            { $as_echo "$as_me:$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 :
+if test "${ac_cv_file__usr_share_java_libserializer_jar+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libserializer.jar"; then
   ac_cv_file__usr_share_java_libserializer_jar=yes
 else
   ac_cv_file__usr_share_java_libserializer_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libserializer_jar" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libserializer_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_libserializer_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libserializer_jar" = x""yes; then :
+if test "x$ac_cv_file__usr_share_java_libserializer_jar" = x""yes; then
    LIBSERIALIZER_JAR=/usr/share/java/libserializer.jar
 else
-  as_fn_error "libserializer.jar replacement not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: libserializer.jar replacement not found." >&5
+$as_echo "$as_me: error: libserializer.jar replacement not found." >&2;}
+   { (exit 1); exit 1; }; }
 
 fi
 
@@ -21159,71 +28365,83 @@ fi
 
       else
         as_ac_File=`$as_echo "ac_cv_file_$LIBSERIALIZER_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBSERIALIZER_JAR" >&5
+{ $as_echo "$as_me:$LINENO: checking for $LIBSERIALIZER_JAR" >&5
 $as_echo_n "checking for $LIBSERIALIZER_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$LIBSERIALIZER_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   if test "x$as_val" = x""yes; then :
-
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  :
 else
-  as_fn_error "libserializer.jar not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: libserializer.jar not found." >&5
+$as_echo "$as_me: error: libserializer.jar not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
       fi
 
 
       if test -z $LIBBASE_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libbase-1.0.0.jar" >&5
+        { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libbase-1.0.0.jar" >&5
 $as_echo_n "checking for /usr/share/java/libbase-1.0.0.jar... " >&6; }
-if test "${ac_cv_file__usr_share_java_libbase_1_0_0_jar+set}" = set; then :
+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 &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libbase-1.0.0.jar"; then
   ac_cv_file__usr_share_java_libbase_1_0_0_jar=yes
 else
   ac_cv_file__usr_share_java_libbase_1_0_0_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libbase_1_0_0_jar" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libbase_1_0_0_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_libbase_1_0_0_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libbase_1_0_0_jar" = x""yes; then :
+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
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libbase.jar" >&5
+            { $as_echo "$as_me:$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 :
+if test "${ac_cv_file__usr_share_java_libbase_jar+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/libbase.jar"; then
   ac_cv_file__usr_share_java_libbase_jar=yes
 else
   ac_cv_file__usr_share_java_libbase_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libbase_jar" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libbase_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_libbase_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_libbase_jar" = x""yes; then :
+if test "x$ac_cv_file__usr_share_java_libbase_jar" = x""yes; then
    LIBBASE_JAR=/usr/share/java/libbase.jar
 else
-  as_fn_error "libbase.jar replacement not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: libbase.jar replacement not found." >&5
+$as_echo "$as_me: error: libbase.jar replacement not found." >&2;}
+   { (exit 1); exit 1; }; }
 
 fi
 
@@ -21233,48 +28451,56 @@ fi
 
       else
         as_ac_File=`$as_echo "ac_cv_file_$LIBBASE_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBBASE_JAR" >&5
+{ $as_echo "$as_me:$LINENO: checking for $LIBBASE_JAR" >&5
 $as_echo_n "checking for $LIBBASE_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$LIBBASE_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   if test "x$as_val" = x""yes; then :
-
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  :
 else
-  as_fn_error "libbase.jar not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: libbase.jar not found." >&5
+$as_echo "$as_me: error: libbase.jar not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
       fi
 
   else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+     { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jfreereport module" >&5
+     { $as_echo "$as_me:$LINENO: checking for jfreereport module" >&5
 $as_echo_n "checking for jfreereport module... " >&6; }
      if test -d ./jfreereport; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
+      { $as_echo "$as_me:$LINENO: result: OK" >&5
 $as_echo "OK" >&6; }
      else
-      as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5
+$as_echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;}
+   { (exit 1); exit 1; }; }
      fi
      SYSTEM_JFREEREPORT=NO
      BUILD_TYPE="$BUILD_TYPE JFREEREPORT"
   fi
   BUILD_TYPE="$BUILD_TYPE REPORTBUILDER"
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
   ENABLE_REPORTBUILDER=NO
   SYSTEM_JFREEREPORT=NO
@@ -21296,52 +28522,58 @@ fi
 # this has to be here because both the wiki publisher and the SRB use
 # commons-logging
 if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which Apache commons-* libs to use" >&5
+  { $as_echo "$as_me:$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
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+    { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
     if test "$ENABLE_MEDIAWIKI" = "YES"; then
       if test -z $COMMONS_CODEC_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-codec-1.3.jar" >&5
+        { $as_echo "$as_me:$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 :
+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 &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/commons-codec-1.3.jar"; then
   ac_cv_file__usr_share_java_commons_codec_1_3_jar=yes
 else
   ac_cv_file__usr_share_java_commons_codec_1_3_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_codec_1_3_jar" >&5
+{ $as_echo "$as_me:$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 :
+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
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-codec.jar" >&5
+            { $as_echo "$as_me:$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 :
+if test "${ac_cv_file__usr_share_java_commons_codec_jar+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/commons-codec.jar"; then
   ac_cv_file__usr_share_java_commons_codec_jar=yes
 else
   ac_cv_file__usr_share_java_commons_codec_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_codec_jar" >&5
+{ $as_echo "$as_me:$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 :
+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
-  as_fn_error "commons-codec.jar replacement not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: commons-codec.jar replacement not found." >&5
+$as_echo "$as_me: error: commons-codec.jar replacement not found." >&2;}
+   { (exit 1); exit 1; }; }
 
 fi
 
@@ -21351,70 +28583,82 @@ fi
 
       else
         as_ac_File=`$as_echo "ac_cv_file_$COMMONS_CODEC_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $COMMONS_CODEC_JAR" >&5
+{ $as_echo "$as_me:$LINENO: checking for $COMMONS_CODEC_JAR" >&5
 $as_echo_n "checking for $COMMONS_CODEC_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$COMMONS_CODEC_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   if test "x$as_val" = x""yes; then :
-
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  :
 else
-  as_fn_error "commons-codec.jar not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: commons-codec.jar not found." >&5
+$as_echo "$as_me: error: commons-codec.jar not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
       fi
 
       if test -z $COMMONS_LANG_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-lang-2.3.jar" >&5
+        { $as_echo "$as_me:$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 :
+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 &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/commons-lang-2.3.jar"; then
   ac_cv_file__usr_share_java_commons_lang_2_3_jar=yes
 else
   ac_cv_file__usr_share_java_commons_lang_2_3_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_lang_2_3_jar" >&5
+{ $as_echo "$as_me:$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 :
+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
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-lang.jar" >&5
+            { $as_echo "$as_me:$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 :
+if test "${ac_cv_file__usr_share_java_commons_lang_jar+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/commons-lang.jar"; then
   ac_cv_file__usr_share_java_commons_lang_jar=yes
 else
   ac_cv_file__usr_share_java_commons_lang_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_lang_jar" >&5
+{ $as_echo "$as_me:$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 :
+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
-  as_fn_error "commons-lang.jar replacement not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: commons-lang.jar replacement not found." >&5
+$as_echo "$as_me: error: commons-lang.jar replacement not found." >&2;}
+   { (exit 1); exit 1; }; }
 
 fi
 
@@ -21424,70 +28668,82 @@ fi
 
       else
         as_ac_File=`$as_echo "ac_cv_file_$COMMONS_LANG_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $COMMONS_LANG_JAR" >&5
+{ $as_echo "$as_me:$LINENO: checking for $COMMONS_LANG_JAR" >&5
 $as_echo_n "checking for $COMMONS_LANG_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$COMMONS_LANG_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   if test "x$as_val" = x""yes; then :
-
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  :
 else
-  as_fn_error "commons-lang.jar not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: commons-lang.jar not found." >&5
+$as_echo "$as_me: error: commons-lang.jar not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
       fi
 
       if test -z $COMMONS_HTTPCLIENT_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-httpclient-3.1.jar" >&5
+        { $as_echo "$as_me:$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 :
+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 &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/commons-httpclient-3.1.jar"; then
   ac_cv_file__usr_share_java_commons_httpclient_3_1_jar=yes
 else
   ac_cv_file__usr_share_java_commons_httpclient_3_1_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_httpclient_3_1_jar" >&5
+{ $as_echo "$as_me:$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 :
+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
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-httpclient.jar" >&5
+            { $as_echo "$as_me:$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 :
+if test "${ac_cv_file__usr_share_java_commons_httpclient_jar+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/commons-httpclient.jar"; then
   ac_cv_file__usr_share_java_commons_httpclient_jar=yes
 else
   ac_cv_file__usr_share_java_commons_httpclient_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_httpclient_jar" >&5
+{ $as_echo "$as_me:$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 :
+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
-  as_fn_error "commons-httpclient.jar replacement not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: commons-httpclient.jar replacement not found." >&5
+$as_echo "$as_me: error: commons-httpclient.jar replacement not found." >&2;}
+   { (exit 1); exit 1; }; }
 
 fi
 
@@ -21497,71 +28753,83 @@ fi
 
       else
         as_ac_File=`$as_echo "ac_cv_file_$COMMONS_HTTPCLIENT_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $COMMONS_HTTPCLIENT_JAR" >&5
+{ $as_echo "$as_me:$LINENO: checking for $COMMONS_HTTPCLIENT_JAR" >&5
 $as_echo_n "checking for $COMMONS_HTTPCLIENT_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$COMMONS_HTTPCLIENT_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   if test "x$as_val" = x""yes; then :
-
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  :
 else
-  as_fn_error "commons-httpclient.jar not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: commons-httpclient.jar not found." >&5
+$as_echo "$as_me: error: commons-httpclient.jar not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
       fi
     fi
     if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
       if test -z $COMMONS_LOGGING_JAR; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-logging-1.1.1.jar" >&5
+        { $as_echo "$as_me:$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 :
+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 &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/commons-logging-1.1.1.jar"; then
   ac_cv_file__usr_share_java_commons_logging_1_1_1_jar=yes
 else
   ac_cv_file__usr_share_java_commons_logging_1_1_1_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" >&5
+{ $as_echo "$as_me:$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 :
+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
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-logging.jar" >&5
+            { $as_echo "$as_me:$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 :
+if test "${ac_cv_file__usr_share_java_commons_logging_jar+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "/usr/share/java/commons-logging.jar"; then
   ac_cv_file__usr_share_java_commons_logging_jar=yes
 else
   ac_cv_file__usr_share_java_commons_logging_jar=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_logging_jar" >&5
+{ $as_echo "$as_me:$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 :
+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
-  as_fn_error "commons-logging.jar replacement not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: commons-logging.jar replacement not found." >&5
+$as_echo "$as_me: error: commons-logging.jar replacement not found." >&2;}
+   { (exit 1); exit 1; }; }
 
 fi
 
@@ -21571,33 +28839,39 @@ fi
 
       else
         as_ac_File=`$as_echo "ac_cv_file_$COMMONS_LOGGING_JAR" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $COMMONS_LOGGING_JAR" >&5
+{ $as_echo "$as_me:$LINENO: checking for $COMMONS_LOGGING_JAR" >&5
 $as_echo_n "checking for $COMMONS_LOGGING_JAR... " >&6; }
-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
 if test -r "$COMMONS_LOGGING_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
 fi
 fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_File
-   if test "x$as_val" = x""yes; then :
-
+as_val=`eval 'as_val=${'$as_ac_File'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  :
 else
-  as_fn_error "commons-logging.jar not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: commons-logging.jar not found." >&5
+$as_echo "$as_me: error: commons-logging.jar not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
       fi
     fi
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+    { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
     SYSTEM_APACHE_COMMONS=NO
     BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
@@ -21650,7 +28924,7 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
     kde_test_include="ksharedptr.h"
     kde_test_library="libkdeui.so"
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt headers" >&5
+        { $as_echo "$as_me:$LINENO: checking for Qt headers" >&5
 $as_echo_n "checking for Qt headers... " >&6; }
     qt_incdir="no"
     for kde_check in $qt_incdirs ; do
@@ -21659,14 +28933,17 @@ $as_echo_n "checking for Qt headers... " >&6; }
             break
         fi
     done
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt_incdir" >&5
+    { $as_echo "$as_me:$LINENO: result: $qt_incdir" >&5
 $as_echo "$qt_incdir" >&6; }
     if test "x$qt_incdir" = "xno" ; then
-        as_fn_error "Qt headers not found.  Please specify the root of
-your Qt installation by exporting QTDIR before running \"configure\"." "$LINENO" 5
+        { { $as_echo "$as_me:$LINENO: error: Qt headers not found.  Please specify the root of
+your Qt installation by exporting QTDIR before running \"configure\"." >&5
+$as_echo "$as_me: error: Qt headers not found.  Please specify the root of
+your Qt installation by exporting QTDIR before running \"configure\"." >&2;}
+   { (exit 1); exit 1; }; }
     fi
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt libraries" >&5
+        { $as_echo "$as_me:$LINENO: checking for Qt libraries" >&5
 $as_echo_n "checking for Qt libraries... " >&6; }
     qt_libdir="no"
     for qt_check in $qt_libdirs ; do
@@ -21675,18 +28952,21 @@ $as_echo_n "checking for Qt libraries... " >&6; }
             break
         fi
     done
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt_libdir" >&5
+    { $as_echo "$as_me:$LINENO: result: $qt_libdir" >&5
 $as_echo "$qt_libdir" >&6; }
     if test "x$qt_libdir" = "xno" ; then
-        as_fn_error "Qt libraries not found.  Please specify the root of
-your Qt installation by exporting QTDIR before running \"configure\"." "$LINENO" 5
+        { { $as_echo "$as_me:$LINENO: error: Qt libraries not found.  Please specify the root of
+your Qt installation by exporting QTDIR before running \"configure\"." >&5
+$as_echo "$as_me: error: Qt libraries not found.  Please specify the root of
+your Qt installation by exporting QTDIR before running \"configure\"." >&2;}
+   { (exit 1); exit 1; }; }
     fi
 
         # Extract the first word of "moc", so it can be a program name with args.
 set dummy moc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MOC+set}" = set; then :
+if test "${ac_cv_path_MOC+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $MOC in
@@ -21700,14 +28980,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -21716,20 +28996,23 @@ esac
 fi
 MOC=$ac_cv_path_MOC
 if test -n "$MOC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOC" >&5
+  { $as_echo "$as_me:$LINENO: result: $MOC" >&5
 $as_echo "$MOC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
     if test "$MOC" = "no" ; then
-        as_fn_error "Qt Meta Object Compiler not found.  Please specify
-the root of your Qt installation by exporting QTDIR before running \"configure\"." "$LINENO" 5
+        { { $as_echo "$as_me:$LINENO: error: Qt Meta Object Compiler not found.  Please specify
+the root of your Qt installation by exporting QTDIR before running \"configure\"." >&5
+$as_echo "$as_me: error: Qt Meta Object Compiler not found.  Please specify
+the root of your Qt installation by exporting QTDIR before running \"configure\"." >&2;}
+   { (exit 1); exit 1; }; }
     fi
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KDE headers" >&5
+        { $as_echo "$as_me:$LINENO: checking for KDE headers" >&5
 $as_echo_n "checking for KDE headers... " >&6; }
     kde_incdir="no"
     for kde_check in $kde_incdirs ; do
@@ -21738,14 +29021,17 @@ $as_echo_n "checking for KDE headers... " >&6; }
             break
         fi
     done
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kde_incdir" >&5
+    { $as_echo "$as_me:$LINENO: result: $kde_incdir" >&5
 $as_echo "$kde_incdir" >&6; }
     if test "x$kde_incdir" = "xno" ; then
-        as_fn_error "KDE headers not found.  Please specify the root of
-your KDE installation by exporting KDEDIR before running \"configure\"." "$LINENO" 5
+        { { $as_echo "$as_me:$LINENO: error: KDE headers not found.  Please specify the root of
+your KDE installation by exporting KDEDIR before running \"configure\"." >&5
+$as_echo "$as_me: error: KDE headers not found.  Please specify the root of
+your KDE installation by exporting KDEDIR before running \"configure\"." >&2;}
+   { (exit 1); exit 1; }; }
     fi
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KDE libraries" >&5
+        { $as_echo "$as_me:$LINENO: checking for KDE libraries" >&5
 $as_echo_n "checking for KDE libraries... " >&6; }
     kde_libdir="no"
     for kde_check in $kde_libdirs ; do
@@ -21754,11 +29040,14 @@ $as_echo_n "checking for KDE libraries... " >&6; }
             break
         fi
     done
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kde_libdir" >&5
+    { $as_echo "$as_me:$LINENO: result: $kde_libdir" >&5
 $as_echo "$kde_libdir" >&6; }
     if test "x$kde_libdir" = "xno" ; then
-        as_fn_error "KDE libraries not found.  Please specify the root of
-your KDE installation by exporting KDEDIR before running \"configure\"." "$LINENO" 5
+        { { $as_echo "$as_me:$LINENO: error: KDE libraries not found.  Please specify the root of
+your KDE installation by exporting KDEDIR before running \"configure\"." >&5
+$as_echo "$as_me: error: KDE libraries not found.  Please specify the root of
+your KDE installation by exporting KDEDIR before running \"configure\"." >&2;}
+   { (exit 1); exit 1; }; }
     fi
 
         KDE_CFLAGS="-I$qt_incdir -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
@@ -21798,7 +29087,7 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
    kde_test_include="ksharedptr.h"
    kde_test_library="libkdeui.so"
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt4 headers" >&5
+   { $as_echo "$as_me:$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
@@ -21808,13 +29097,15 @@ $as_echo_n "checking for Qt4 headers... " >&6; }
       fi
    done
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt_header_dir" >&5
+   { $as_echo "$as_me:$LINENO: result: $qt_header_dir" >&5
 $as_echo "$qt_header_dir" >&6; }
    if test "x$qt_header_dir" = "xno" ; then
-      as_fn_error "Qt4 headers not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: Qt4 headers not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." >&5
+$as_echo "$as_me: error: Qt4 headers not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." >&2;}
+   { (exit 1); exit 1; }; }
    fi
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt4 libraries" >&5
+   { $as_echo "$as_me:$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
@@ -21824,18 +29115,20 @@ $as_echo_n "checking for Qt4 libraries... " >&6; }
       fi
    done
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt_lib_dir" >&5
+   { $as_echo "$as_me:$LINENO: result: $qt_lib_dir" >&5
 $as_echo "$qt_lib_dir" >&6; }
 
    if test "x$qt_lib_dir" = "xno" ; then
-      as_fn_error "Qt4 libraries not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: Qt4 libraries not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." >&5
+$as_echo "$as_me: error: Qt4 libraries not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." >&2;}
+   { (exit 1); exit 1; }; }
    fi
 
       # Extract the first word of "moc", so it can be a program name with args.
 set dummy moc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MOC4+set}" = set; then :
+if test "${ac_cv_path_MOC4+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $MOC4 in
@@ -21849,14 +29142,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -21865,20 +29158,23 @@ esac
 fi
 MOC4=$ac_cv_path_MOC4
 if test -n "$MOC4"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOC4" >&5
+  { $as_echo "$as_me:$LINENO: result: $MOC4" >&5
 $as_echo "$MOC4" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
    if test "$MOC4" = "no" ; then
-      as_fn_error "Qt Meta Object Compiler not found.  Please specify
-the root of your Qt installation by exporting QT4DIR before running \"configure\"." "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: Qt Meta Object Compiler not found.  Please specify
+the root of your Qt installation by exporting QT4DIR before running \"configure\"." >&5
+$as_echo "$as_me: error: Qt Meta Object Compiler not found.  Please specify
+the root of your Qt installation by exporting QT4DIR before running \"configure\"." >&2;}
+   { (exit 1); exit 1; }; }
    fi
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KDE4 headers" >&5
+      { $as_echo "$as_me:$LINENO: checking for KDE4 headers" >&5
 $as_echo_n "checking for KDE4 headers... " >&6; }
    kde_incdir="no"
    for kde_check in $kde_incdirs ; do
@@ -21887,13 +29183,15 @@ $as_echo_n "checking for KDE4 headers... " >&6; }
          break
       fi
    done
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kde_incdir" >&5
+   { $as_echo "$as_me:$LINENO: result: $kde_incdir" >&5
 $as_echo "$kde_incdir" >&6; }
    if test "x$kde_incdir" = "xno" ; then
-      as_fn_error "KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." >&5
+$as_echo "$as_me: error: KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." >&2;}
+   { (exit 1); exit 1; }; }
    fi
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KDE4 libraries" >&5
+      { $as_echo "$as_me:$LINENO: checking for KDE4 libraries" >&5
 $as_echo_n "checking for KDE4 libraries... " >&6; }
    kde_libdir="no"
    for kde_check in $kde_libdirs ; do
@@ -21903,10 +29201,12 @@ $as_echo_n "checking for KDE4 libraries... " >&6; }
       fi
    done
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kde_libdir" >&5
+   { $as_echo "$as_me:$LINENO: result: $kde_libdir" >&5
 $as_echo "$kde_libdir" >&6; }
    if test "x$kde_libdir" = "xno" ; then
-      as_fn_error "KDE4 libraries not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: KDE4 libraries not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." >&5
+$as_echo "$as_me: error: KDE4 libraries not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." >&2;}
+   { (exit 1); exit 1; }; }
    fi
 
    KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
@@ -21916,23 +29216,23 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the lockdown pieces" >&5
+{ $as_echo "$as_me:$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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable evolution 2 support" >&5
+{ $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 
   succeeded=no
@@ -21940,9 +29240,9 @@ $as_echo "yes" >&6; }
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -21955,14 +29255,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$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"
@@ -21971,10 +29271,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -21989,24 +29289,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-2.0" >&5
+        { $as_echo "$as_me:$LINENO: checking for gobject-2.0" >&5
 $as_echo_n "checking for gobject-2.0... " >&6; }
 
         if $PKG_CONFIG --exists "gobject-2.0" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GOBJECT_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: checking GOBJECT_CFLAGS" >&5
 $as_echo_n "checking GOBJECT_CFLAGS... " >&6; }
             GOBJECT_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GOBJECT_CFLAGS" >&5
+            { $as_echo "$as_me:$LINENO: result: $GOBJECT_CFLAGS" >&5
 $as_echo "$GOBJECT_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GOBJECT_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: checking GOBJECT_LIBS" >&5
 $as_echo_n "checking GOBJECT_LIBS... " >&6; }
             GOBJECT_LIBS=`$PKG_CONFIG --libs "gobject-2.0"`
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GOBJECT_LIBS" >&5
+            { $as_echo "$as_me:$LINENO: result: $GOBJECT_LIBS" >&5
 $as_echo "$GOBJECT_LIBS" >&6; }
         else
             GOBJECT_CFLAGS=""
@@ -22028,23 +29328,25 @@ $as_echo "$GOBJECT_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error "Library requirements (gobject-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     { { $as_echo "$as_me:$LINENO: error: Library requirements (gobject-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+$as_echo "$as_me: error: Library requirements (gobject-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
   fi
 
    ENABLE_EVOAB2="TRUE"
 else
    ENABLE_EVOAB2=""
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable KDE address book support" >&5
+{ $as_echo "$as_me:$LINENO: checking whether to enable KDE address book support" >&5
 $as_echo_n "checking whether to enable KDE address book support... " >&6; }
 if test "$enable_kdeab" = "yes" && test "$enable_kde" = "yes"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
    ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -22054,15 +29356,22 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
    save_CXXFLAGS=$CXXFLAGS
    CXXFLAGS="$CXXFLAGS $KDE_CFLAGS"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether KDE is between 3.2 and 3.6" >&5
+   { $as_echo "$as_me:$LINENO: checking whether KDE is between 3.2 and 3.6" >&5
 $as_echo_n "checking whether KDE is between 3.2 and 3.6... " >&6; }
-       if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+       if test "$cross_compiling" = yes; then
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_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
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <kdeversion.h>
@@ -22073,16 +29382,45 @@ int main(int argc, char **argv) {
 }
 
 _ACEOF
-if ac_fn_cxx_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  as_fn_error "KDE version too old or too recent, please use another version of KDE or disable KDE address book support" "$LINENO" 5
+  $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
+
+( exit $ac_status )
+{ { $as_echo "$as_me:$LINENO: error: KDE version too old or too recent, please use another version of KDE or disable KDE address book support" >&5
+$as_echo "$as_me: error: KDE version too old or too recent, please use another version of KDE or disable KDE address book support" >&2;}
+   { (exit 1); exit 1; }; }
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+
    CXXFLAGS=$save_CXXFLAGS
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -22092,65 +29430,65 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
    ENABLE_KAB=TRUE
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
    ENABLE_KAB=
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include MathMLDTD" >&5
+{ $as_echo "$as_me:$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
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+    { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
     SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD"
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+    { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
     BUILD_TYPE="$BUILD_TYPE MATHMLDTD"
   fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
   SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD"
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include Bitstream Vera fonts" >&5
+{ $as_echo "$as_me:$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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
   WITH_FONTS=YES
   BUILD_TYPE="$BUILD_TYPE BITSTREAM_VERA_FONTS"
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
   WITH_FONTS=NO
   SCPDEFS="$SCPDEFS -DWITHOUT_FONTS"
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include PPDs" >&5
+{ $as_echo "$as_me:$LINENO: checking whether to include PPDs" >&5
 $as_echo_n "checking whether to include PPDs... " >&6; }
 if test "$with_ppds" != "no"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
   WITHOUT_PPDS=YES
   SCPDEFS="$SCPDEFS -DWITHOUT_PPDS"
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include AFMs" >&5
+{ $as_echo "$as_me:$LINENO: checking whether to include AFMs" >&5
 $as_echo_n "checking whether to include AFMs... " >&6; }
 if test "$with_afms" != "no"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
   WITHOUT_AFMS=YES
   SCPDEFS="$SCPDEFS -DWITHOUT_AFMS"
@@ -22159,12 +29497,12 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether and how to use Xinerama" >&5
+{ $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:$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
@@ -22195,13 +29533,141 @@ elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
       XINERAMA_LINK=none
    fi
    if test "$USE_XINERAMA" = "YES"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, with $XINERAMA_LINK linking" >&5
+      { $as_echo "$as_me:$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 :
+      if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5
+$as_echo_n "checking for X11/extensions/Xinerama.h... " >&6; }
+if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5
+$as_echo "$ac_cv_header_X11_extensions_Xinerama_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xinerama.h usability" >&5
+$as_echo_n "checking X11/extensions/Xinerama.h usability... " >&6; }
+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 { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xinerama.h presence" >&5
+$as_echo_n "checking X11/extensions/Xinerama.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <X11/extensions/Xinerama.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5
+$as_echo_n "checking for X11/extensions/Xinerama.h... " >&6; }
+if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_X11_extensions_Xinerama_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5
+$as_echo "$ac_cv_header_X11_extensions_Xinerama_h" >&6; }
+
+fi
+if test "x$ac_cv_header_X11_extensions_Xinerama_h" = x""yes; then
+  :
 else
-  as_fn_error "Xinerama header not found." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: Xinerama header not found." >&5
+$as_echo "$as_me: error: Xinerama header not found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
@@ -22212,14 +29678,19 @@ fi
       if test "$_os" = "Linux"; then
           XINERAMA_EXTRA_LIBS="$XINERAMA_EXTRA_LIBS -ldl"
       fi
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XineramaIsActive in -lXinerama" >&5
+
+{ $as_echo "$as_me:$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 :
+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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -22237,18 +29708,43 @@ return XineramaIsActive ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_Xinerama_XineramaIsActive=yes
 else
-  ac_cv_lib_Xinerama_XineramaIsActive=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_Xinerama_XineramaIsActive=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xinerama_XineramaIsActive" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaIsActive" >&5
 $as_echo "$ac_cv_lib_Xinerama_XineramaIsActive" >&6; }
-if test "x$ac_cv_lib_Xinerama_XineramaIsActive" = x""yes; then :
+if test "x$ac_cv_lib_Xinerama_XineramaIsActive" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBXINERAMA 1
 _ACEOF
@@ -22256,15 +29752,17 @@ _ACEOF
   LIBS="-lXinerama $LIBS"
 
 else
-  as_fn_error "Xinerama not functional?" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: Xinerama not functional?" >&5
+$as_echo "$as_me: error: Xinerama not functional?" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, libXinerama not found or wrong architecture." >&5
+      { $as_echo "$as_me:$LINENO: result: no, libXinerama not found or wrong architecture." >&5
 $as_echo "no, libXinerama not found or wrong architecture." >&6; }
    fi
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -22279,9 +29777,9 @@ if test -z "$with_ant_home"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ANT+set}" = set; then :
+if test "${ac_cv_path_ANT+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $ANT in
@@ -22294,14 +29792,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -22309,10 +29807,10 @@ esac
 fi
 ANT=$ac_cv_path_ANT
 if test -n "$ANT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ANT" >&5
+  { $as_echo "$as_me:$LINENO: result: $ANT" >&5
 $as_echo "$ANT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -22328,9 +29826,9 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ANT+set}" = set; then :
+if test "${ac_cv_path_ANT+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $ANT in
@@ -22344,14 +29842,14 @@ 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
+  for ac_exec_ext in '' $ac_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"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -22359,10 +29857,10 @@ esac
 fi
 ANT=$ac_cv_path_ANT
 if test -n "$ANT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ANT" >&5
+  { $as_echo "$as_me:$LINENO: result: $ANT" >&5
 $as_echo "$ANT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -22375,7 +29873,9 @@ done
 fi
 
 if test -z "$ANT"; then
-  as_fn_error "Ant not found - Make sure it's in the path or use --with-ant-home" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: Ant not found - Make sure it's in the path or use --with-ant-home" >&5
+$as_echo "$as_me: error: Ant not found - Make sure it's in the path or use --with-ant-home" >&2;}
+   { (exit 1); exit 1; }; }
 else
   # resolve relative or absolute symlink
   while test -h "$ANT"; do
@@ -22400,7 +29900,7 @@ else
   fi
   ant_minminor1=`echo $ant_minver | cut -d"." -f2`
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ant is >= $ant_minver" >&5
+  { $as_echo "$as_me:$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`
@@ -22409,15 +29909,17 @@ echo "configure: ant_version $ant_version " >&5
 echo "configure: ant_version_major $ant_version_major " >&5
 echo "configure: ant_version_minor $ant_version_minor " >&5
   if test "$ant_version_major" -ge "2"; then
-  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, $ant_version" >&5
+  	{ $as_echo "$as_me:$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
-  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, $ant_version" >&5
+  	{ $as_echo "$as_me:$LINENO: result: yes, $ant_version" >&5
 $as_echo "yes, $ant_version" >&6; }
   else
-  	as_fn_error "no, you need at least ant >= $ant_minver" "$LINENO" 5
+  	{ { $as_echo "$as_me:$LINENO: error: no, you need at least ant >= $ant_minver" >&5
+$as_echo "$as_me: error: no, you need at least ant >= $ant_minver" >&2;}
+   { (exit 1); exit 1; }; }
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $ANT works" >&5
+  { $as_echo "$as_me:$LINENO: checking if $ANT works" >&5
 $as_echo_n "checking if $ANT works... " >&6; }
 cat > conftest.java << EOF
     public class conftest {
@@ -22442,13 +29944,13 @@ EOF
   else
     ant_cmd="$ANT -buildfile conftest.xml 1>&2"
   fi
-  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ant_cmd\""; } >&5
+  { (eval echo "$as_me:$LINENO: \"$ant_cmd\"") >&5
   (eval $ant_cmd) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
   if test $? = 0 && test -f ./conftest.class ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Ant works" >&5
+    { $as_echo "$as_me:$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"`
@@ -22462,7 +29964,7 @@ $as_echo "Ant works" >&6; }
     echo "configure: Ant test failed" >&5
     cat conftest.java >&5
     cat conftest.xml >&5
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ant does not work - Some Java projects will not build!" >&5
+    { $as_echo "$as_me:$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
@@ -22476,7 +29978,7 @@ fi
 
 
 if test "$ANT_HOME" != "NO_ANT_HOME"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking Ant lib directory" >&5
+   { $as_echo "$as_me:$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"
@@ -22493,20 +29995,22 @@ $as_echo_n "checking Ant lib directory... " >&6; }
                 if test -f $ANT_HOME/lib/ant/ant.jar; then
                     ANT_LIB="$ANT_HOME/lib/ant"
                 else
-                    as_fn_error "Ant libraries not found!" "$LINENO" 5
+                    { { $as_echo "$as_me:$LINENO: error: Ant libraries not found!" >&5
+$as_echo "$as_me: error: Ant libraries not found!" >&2;}
+   { (exit 1); exit 1; }; }
                 fi
              fi
           fi
       fi
    fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: Ant lib directory found." >&5
+   { $as_echo "$as_me:$LINENO: result: Ant lib directory found." >&5
 $as_echo "Ant lib directory found." >&6; }
 fi
 
 fi
 
 if test "$ENABLE_MEDIAWIKI" = "YES"; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ant supports mapper type=\"regexp\"" >&5
+{ $as_echo "$as_me:$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
@@ -22539,13 +30043,13 @@ EOF
   else
     ant_cmd="$ANT -buildfile conftest.xml 1>&2"
   fi
-  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ant_cmd\""; } >&5
+  { (eval echo "$as_me:$LINENO: \"$ant_cmd\"") >&5
   (eval $ant_cmd) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
   if test $? = 0 && test -f ./conftest.class ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+    { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
     rm -rf confdir
   else
@@ -22553,14 +30057,16 @@ $as_echo "yes" >&6; }
     cat conftest.java >&5
     cat conftest.xml >&5
     rm -rf confdir
-    as_fn_error "no. Did you install ant-apache-regexp?" "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: no. Did you install ant-apache-regexp?" >&5
+$as_echo "$as_me: error: no. Did you install ant-apache-regexp?" >&2;}
+   { (exit 1); exit 1; }; }
   fi
 fi
 rm -f conftest* core core.* *.core
 
 OOO_JUNIT_JAR=
 if test "$SOLAR_JAVA" != "" && test "$with_junit" != "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JUnit 4" >&5
+    { $as_echo "$as_me:$LINENO: checking for JUnit 4" >&5
 $as_echo_n "checking for JUnit 4... " >&6; }
     if test "$with_junit" == "yes"; then
         if test -e /usr/share/java/junit4.jar; then
@@ -22577,149 +30083,153 @@ $as_echo_n "checking for JUnit 4... " >&6; }
     "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" 2>&5 | \
         grep org/junit/Before.class > /dev/null 2>&5
     if test $? -eq 0; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OOO_JUNIT_JAR" >&5
+        { $as_echo "$as_me:$LINENO: result: $OOO_JUNIT_JAR" >&5
 $as_echo "$OOO_JUNIT_JAR" >&6; }
     else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
-        as_fn_error "cannot find JUnit 4 jar at $OOO_JUNIT_JAR;
+        { { $as_echo "$as_me:$LINENO: error: cannot find JUnit 4 jar at $OOO_JUNIT_JAR;
+please install one and/or specify its pathname via --with-junit=...,
+or disable it via --without-junit" >&5
+$as_echo "$as_me: error: cannot find JUnit 4 jar at $OOO_JUNIT_JAR;
 please install one and/or specify its pathname via --with-junit=...,
-or disable it via --without-junit" "$LINENO" 5
+or disable it via --without-junit" >&2;}
+   { (exit 1); exit 1; }; }
     fi
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which languages to be built" >&5
+{ $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: en-US" >&5
+   { $as_echo "$as_me:$LINENO: result: en-US" >&5
 $as_echo "en-US" >&6; }
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WITH_LANG" >&5
+   { $as_echo "$as_me:$LINENO: result: $WITH_LANG" >&5
 $as_echo "$WITH_LANG" >&6; }
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which languages have poor help localizations" >&5
+{ $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+   { $as_echo "$as_me:$LINENO: result: none" >&5
 $as_echo "none" >&6; }
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WITH_POOR_HELP_LOCALIZATIONS" >&5
+   { $as_echo "$as_me:$LINENO: result: $WITH_POOR_HELP_LOCALIZATIONS" >&5
 $as_echo "$WITH_POOR_HELP_LOCALIZATIONS" >&6; }
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which dictionaries to include" >&5
+{ $as_echo "$as_me:$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,
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ALL" >&5
+   { $as_echo "$as_me:$LINENO: result: ALL" >&5
 $as_echo "ALL" >&6; }
 else
    WITH_DICT=","$with_dict","
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dict" >&5
+   { $as_echo "$as_me:$LINENO: result: $with_dict" >&5
 $as_echo "$with_dict" >&6; }
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for additional 'intro' bitmaps" >&5
+{ $as_echo "$as_me:$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=
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+   { $as_echo "$as_me:$LINENO: result: none" >&5
 $as_echo "none" >&6; }
 else
    for bitmap in `echo $with_intro_bitmaps | tr ',' ' '` ; do
       case "$bitmap" in
          *.bmp) ;;
-         *)     bitmap= ; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Intro bitmaps should be .bmp files!" >&5
+         *)     bitmap= ; { $as_echo "$as_me:$LINENO: WARNING: Intro bitmaps should be .bmp files!" >&5
 $as_echo "$as_me: WARNING: Intro bitmaps should be .bmp files!" >&2;} ;;
       esac
       if test -n "$bitmap" ; then
          INTRO_BITMAPS="$INTRO_BITMAPS $bitmap"
       fi
    done
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTRO_BITMAPS" >&5
+   { $as_echo "$as_me:$LINENO: result: $INTRO_BITMAPS" >&5
 $as_echo "$INTRO_BITMAPS" >&6; }
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for additional 'about' bitmaps" >&5
+{ $as_echo "$as_me:$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=
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+   { $as_echo "$as_me:$LINENO: result: none" >&5
 $as_echo "none" >&6; }
 else
    for bitmap in `echo $with_about_bitmaps | tr ',' ' '` ; do
       case "$bitmap" in
          *.bmp) ;;
-         *)     bitmap= ; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: About bitmaps should be .bmp files!" >&5
+         *)     bitmap= ; { $as_echo "$as_me:$LINENO: WARNING: About bitmaps should be .bmp files!" >&5
 $as_echo "$as_me: WARNING: About bitmaps should be .bmp files!" >&2;} ;;
       esac
       if test -n "$bitmap" ; then
          ABOUT_BITMAPS="$ABOUT_BITMAPS $bitmap"
       fi
    done
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ABOUT_BITMAPS" >&5
+   { $as_echo "$as_me:$LINENO: result: $ABOUT_BITMAPS" >&5
 $as_echo "$ABOUT_BITMAPS" >&6; }
 fi
 
 
 OOO_VENDOR=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for vendor" >&5
+{ $as_echo "$as_me:$LINENO: checking for vendor" >&5
 $as_echo_n "checking for vendor... " >&6; }
 if test -z "$with_vendor" -o "$with_vendor" = "no" ; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5
+   { $as_echo "$as_me:$LINENO: result: not set" >&5
 $as_echo "not set" >&6; }
 else
    OOO_VENDOR="$with_vendor"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OOO_VENDOR" >&5
+   { $as_echo "$as_me:$LINENO: result: $OOO_VENDOR" >&5
 $as_echo "$OOO_VENDOR" >&6; }
 fi
 
 
 UNIXWRAPPERNAME=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UNIX wrapper name" >&5
+{ $as_echo "$as_me:$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
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5
+   { $as_echo "$as_me:$LINENO: result: not set" >&5
 $as_echo "not set" >&6; }
 else
    UNIXWRAPPERNAME="$with_unix_wrapper"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNIXWRAPPERNAME" >&5
+   { $as_echo "$as_me:$LINENO: result: $UNIXWRAPPERNAME" >&5
 $as_echo "$UNIXWRAPPERNAME" >&6; }
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to statically link to Gtk" >&5
+{ $as_echo "$as_me:$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"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 else
    ENABLE_STATIC_GTK="FALSE"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use layout dialogs" >&5
+{ $as_echo "$as_me:$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"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 else
    ENABLE_LAYOUT="FALSE"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -22727,21 +30237,21 @@ fi
 # ===================================================================
 # De- or increase default verbosity of build process
 # ===================================================================
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build verbosity" >&5
+{ $as_echo "$as_me:$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"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: high" >&5
+      { $as_echo "$as_me:$LINENO: result: high" >&5
 $as_echo "high" >&6; }
    fi
    if test "$enable_verbose" == "no"; then
       VERBOSE="FALSE"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: low" >&5
+      { $as_echo "$as_me:$LINENO: result: low" >&5
 $as_echo "low" >&6; }
    fi
 else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5
+   { $as_echo "$as_me:$LINENO: result: not set" >&5
 $as_echo "not set" >&6; }
 fi
 
@@ -22753,19 +30263,21 @@ echo "*                                                                  *"
 echo "********************************************************************"
 
 if test -z "$COMPATH"; then
-   as_fn_error "No compiler found." "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: No compiler found." >&5
+$as_echo "$as_me: error: No compiler found." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking solver path" >&5
+{ $as_echo "$as_me:$LINENO: checking solver path" >&5
 $as_echo_n "checking solver path... " >&6; }
 if test -z "$with_local_solver"; then
    LOCAL_SOLVER="DEFAULT"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: default" >&5
+   { $as_echo "$as_me:$LINENO: result: default" >&5
 $as_echo "default" >&6; }
 else
    LOCAL_SOLVER=$with_local_solver
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_local_solver" >&5
+   { $as_echo "$as_me:$LINENO: result: $with_local_solver" >&5
 $as_echo "$with_local_solver" >&6; }
 fi
 
@@ -22804,13 +30316,13 @@ _ACEOF
     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
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
+      *) $as_unset $ac_var ;;
       esac ;;
     esac
   done
@@ -22818,8 +30330,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      # `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"
@@ -22842,11 +30354,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 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:$LINENO: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
@@ -22902,8 +30414,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
@@ -22916,10 +30428,9 @@ LTLIBOBJS=$ac_ltlibobjs
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+{ $as_echo "$as_me:$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
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -22929,18 +30440,17 @@ cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
-
 SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_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 :
+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
@@ -22948,15 +30458,23 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
 esac
+
 fi
 
 
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
 as_nl='
 '
 export as_nl
@@ -22964,13 +30482,7 @@ export as_nl
 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
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -22981,7 +30493,7 @@ else
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in #(
+      case $arg in
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -23004,6 +30516,13 @@ if test "${PATH_SEPARATOR+set}" != set; then
   }
 fi
 
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -23013,15 +30532,15 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in #((
+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
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
 IFS=$as_save_IFS
 
      ;;
@@ -23033,16 +30552,12 @@ if test "x$as_myself" = x; then
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
+  { (exit 1); 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 || :
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
 done
 PS1='$ '
 PS2='> '
@@ -23054,89 +30569,7 @@ 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
-  $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 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -23150,12 +30583,8 @@ 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_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
@@ -23175,25 +30604,76 @@ $as_echo X/"$0" |
 	  }
 	  s/.*/./; q'`
 
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+# CDPATH.
+$as_unset CDPATH
+
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
 
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
+case `echo -n x` in
 -n*)
-  case `echo 'xy\c'` in
+  case `echo 'x\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='	';;
+  *)   ECHO_C='\c';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -23222,56 +30702,8 @@ fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
+  as_mkdir_p=:
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -23290,10 +30722,10 @@ else
       if test -d "$1"; then
 	test -d "$1/.";
       else
-	case $1 in #(
+	case $1 in
 	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -23308,19 +30740,13 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
+# 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.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -23347,15 +30773,13 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
+\`$as_me' instantiates files from templates according to the
+current configuration.
 
-Usage: $0 [OPTION]... [TAG]...
+Usage: $0 [OPTION]... [FILE]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
-      --config     print configuration, then exit
   -q, --quiet, --silent
                    do not print progress messages
   -d, --debug      don't remove temporary files
@@ -23366,17 +30790,16 @@ Usage: $0 [OPTION]... [TAG]...
 Configuration files:
 $config_files
 
-Report bugs to the package provider."
+Report bugs to <bug-autoconf@gnu.org>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.65,
-  with options \\"\$ac_cs_config\\"
+configured by $0, generated by GNU Autoconf 2.63,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -23410,8 +30833,6 @@ do
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     $as_echo "$ac_cs_version"; exit ;;
-  --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
@@ -23419,7 +30840,7 @@ do
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h |  --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
@@ -23428,10 +30849,11 @@ do
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; } ;;
 
-  *) as_fn_append ac_config_targets " $1"
+  *) ac_config_targets="$ac_config_targets $1"
      ac_need_defaults=false ;;
 
   esac
@@ -23480,7 +30902,9 @@ do
     "set_soenv") CONFIG_FILES="$CONFIG_FILES set_soenv" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
 
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
   esac
 done
 
@@ -23505,7 +30929,7 @@ $debug ||
   trap 'exit_status=$?
   { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
 ' 0
-  trap 'as_fn_exit 1' 1 2 13 15
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
 }
 # Create a (secure) tmp directory for tmp files.
 
@@ -23516,7 +30940,11 @@ $debug ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} ||
+{
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
+   { (exit 1); exit 1; }
+}
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -23524,16 +30952,10 @@ $debug ||
 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_cr='
+'
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
+  ac_cs_awk_cr='\\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
@@ -23547,18 +30969,24 @@ _ACEOF
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
 ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -23580,7 +31008,7 @@ s/'"$ac_delim"'$//
 t delim
 :nl
 h
-s/\(.\{148\}\)..*/\1/
+s/\(.\{148\}\).*/\1/
 t more1
 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 p
@@ -23594,7 +31022,7 @@ s/.\{148\}//
 t nl
 :delim
 h
-s/\(.\{148\}\)..*/\1/
+s/\(.\{148\}\).*/\1/
 t more2
 s/["\\]/\\&/g; s/^/"/; s/$/"/
 p
@@ -23647,7 +31075,9 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
 else
   cat
 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
 _ACEOF
 
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
@@ -23678,7 +31108,9 @@ do
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
+   { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -23706,10 +31138,12 @@ do
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+   { (exit 1); exit 1; }; };;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
@@ -23720,7 +31154,7 @@ do
 	`' 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:$LINENO: creating $ac_file" >&5
 $as_echo "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
@@ -23733,7 +31167,9 @@ $as_echo "$as_me: creating $ac_file" >&6;}
 
     case $ac_tag in
     *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -23761,7 +31197,47 @@ $as_echo X"$ac_file" |
 	    q
 	  }
 	  s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
+  { as_dir="$ac_dir"
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$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_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
@@ -23809,6 +31285,7 @@ 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
@@ -23818,11 +31295,12 @@ ac_sed_dataroot='
 /@docdir@/p
 /@infodir@/p
 /@localedir@/p
-/@mandir@/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:$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
@@ -23832,7 +31310,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   s&@infodir@&$infodir&g
   s&@localedir@&$localedir&g
   s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
+    s&\\\${datarootdir}&$datarootdir&g' ;;
 esac
 _ACEOF
 
@@ -23859,12 +31337,14 @@ 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
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
@@ -23874,7 +31354,9 @@ which seems to be undefined.  Please make sure it is defined." >&2;}
   -) 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
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
 
 
@@ -23884,12 +31366,15 @@ which seems to be undefined.  Please make sure it is defined." >&2;}
 done # for ac_tag
 
 
-as_fn_exit 0
+{ (exit 0); exit 0; }
 _ACEOF
+chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -23910,10 +31395,10 @@ if test "$no_create" != yes; then
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
+  $ac_cs_success || { (exit 1); exit 1; }
 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:$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 34e9c206b8c8..c6d124b52bae 100644
--- a/configure.in
+++ b/configure.in
@@ -546,6 +546,9 @@ AC_ARG_WITH(system-lpsolve,
 AC_ARG_WITH(system-cppunit,
 [  --with-system-cppunit         Use cppunit already on system
 ],,)
+AC_ARG_WITH(system-redland,
+[  --with-system-redland   Use redland library already on system
+],,)
 AC_ARG_WITH(system-mozilla,
 [  --with-system-mozilla   Use mozilla already on system. Note that some
                           components cannot be built against a contemporary
@@ -4999,16 +5002,12 @@ dnl ===================================================================
 dnl Check for system redland
 dnl ===================================================================
 AC_MSG_CHECKING([which redland library to use])
-dnl if test -n "$with_system_redland" -o -n "$with_system_libs" && \
-dnl	test "$with_system_redland" != "no"; then
-dnl mst: NOTE: right now we need patches against redland
-dnl            so we only enable system redland if explicitly requested
-dnl            if next version includes patches, insert version check here
-if test -n "$with_system_redland" && \
+if test -n "$with_system_redland" -o -n "$with_system_libs" && \
 	test "$with_system_redland" != "no"; then
 	AC_MSG_RESULT([external])
 	SYSTEM_REDLAND=YES
-	PKG_CHECK_MODULES(REDLAND, redland)
+   dnl versions before 1.0.8 write RDF/XML that is useless for ODF (@xml:base)
+   PKG_CHECK_MODULES(REDLAND, redland >= 1.0.8)
 else
 	AC_MSG_RESULT([internal])
 	BUILD_TYPE="$BUILD_TYPE REDLAND"
diff --git a/fetch_tarballs.sh b/fetch_tarballs.sh
index 87c2c80e4be3..e08b553f8171 100755
--- a/fetch_tarballs.sh
+++ b/fetch_tarballs.sh
@@ -3,14 +3,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -65,25 +61,31 @@ for i in wget /usr/bin/wget /usr/local/bin/wget /usr/sfw/bin/wget /opt/sfw/bin/w
     fi
 done
 
-for i in curl /usr/bin/curl /usr/local/bin/curl /usr/sfw/bin/curl /opt/sfw/bin/curl /opt/local/bin/curl; do
-# mac curl returns "2" on --version
-#    eval "$i --version" > /dev/null 2>&1
-#    ret=$?
-#    if [ $ret -eq 0 ]; then
-    if [ -x $i ]; then
-        curl=$i
-        echo found curl: $curl
-        break 2
-    fi
-done
+if [ -z "$wget" ]; then
+    for i in curl /usr/bin/curl /usr/local/bin/curl /usr/sfw/bin/curl /opt/sfw/bin/curl /opt/local/bin/curl; do
+    # mac curl returns "2" on --version
+    #    eval "$i --version" > /dev/null 2>&1
+    #    ret=$?
+    #    if [ $ret -eq 0 ]; then
+        if [ -x $i ]; then
+            curl=$i
+            echo found curl: $curl
+            break 2
+        fi
+    done
+fi
 
 if [ -z "$wget" -a -z "$curl" ]; then
     echo "ERROR: neither  wget nor curl found!"
     exit
 fi
 
-for i in md5sum /usr/local/bin/md5sum gmd5sum /usr/sfw/bin/md5sum /opt/sfw/bin/gmd5sum /opt/local/bin/md5sum; do
-    eval "$i --version" > /dev/null 2>&1
+for i in md5 md5sum /usr/local/bin/md5sum gmd5sum /usr/sfw/bin/md5sum /opt/sfw/bin/gmd5sum /opt/local/bin/md5sum; do
+    if [ "$i" = "md5" ]; then
+        eval "$i -x" > /dev/null 2>&1
+    else
+        eval "$i --version" > /dev/null 2>&1
+    fi
     ret=$?
     if [ $ret -eq 0 ]; then
         md5sum=$i
@@ -92,44 +94,61 @@ for i in md5sum /usr/local/bin/md5sum gmd5sum /usr/sfw/bin/md5sum /opt/sfw/bin/g
     fi
 done
 
+if [ "$md5sum" = "md5" ]; then
+    md5special=-r
+fi
+
 if [ -z "$md5sum" ]; then
     echo "Warning: no md5sum: found!"
 fi
 
 start_dir=`pwd`
+logfile=$TARFILE_LOCATION/fetch.log
+date >> $logfile
+
 filelist=`cat $1`
-cd $TARFILE_LOCATION
+mkdir -p $TARFILE_LOCATION/tmp
+cd $TARFILE_LOCATION/tmp
+echo $$ > fetch-running
 for i in $filelist ; do
-#   echo $i
+#    echo $i
     if [ "$i" != `echo $i | sed "s/^http:\///"` ]; then
         tarurl=$i
     # TODO: check for comment
     else
         if [ "$tarurl" != "" ]; then
-            if [ ! -f "$i" ]; then
+            if [ ! -f "../$i" ]; then
+                echo $i
                 if [ ! -z "$wget" ]; then
-                    $wget -nv -N $tarurl/$i
+                    $wget -nv -N $tarurl/$i 2>&1 | tee -a $logfile
                 else
                     echo fetching $i
-                    $curl $file_date_check -O $tarurl/$i
+                    $curl $file_date_check -O $tarurl/$i 2>&1 | tee -a $logfile
                 fi
                 wret=$?
                 if [ $wret -ne 0 ]; then
+                    mv $i ${i}_broken
                     failed="$failed $i"
                     wret=0
                 fi
                 if [ -f $i -a -n "$md5sum" ]; then
-                    sum=`$md5sum $i | sed "s/ [ *].*//"`
+                    sum=`$md5sum $md5special $i | sed "s/ .*//"`
                     sum2=`echo $i | sed "s/-.*//"`
                     if [ "$sum" != "$sum2" ]; then
-                        echo checksum failure for $i
+                        echo checksum failure for $i 2>&1 | tee -a $logfile
                         failed="$failed $i"
+                        mv $i ${i}_broken
+                    else
+                        mv $i ..
                     fi
+                else
+                    mv $i ..
                 fi
             fi
         fi
     fi
 done
+rm $TARFILE_LOCATION/tmp/*-*
 cd $start_dir
 
 if [ ! -z "$failed" ]; then
diff --git a/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Banner.bmp
new file mode 100644
index 000000000000..9b367631b65c
--- /dev/null
+++ b/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Banner.bmp
diff --git a/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Image.bmp
new file mode 100644
index 000000000000..8b160e68ec8c
--- /dev/null
+++ b/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Image.bmp
diff --git a/instsetoo_native/macosx/application/PostInstall.applescript b/instsetoo_native/macosx/application/PostInstall.applescript
deleted file mode 100644
index 3c302ab2daad..000000000000
--- a/instsetoo_native/macosx/application/PostInstall.applescript
+++ /dev/null
@@ -1,290 +0,0 @@
-(*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- *************************************************************************)
-
--- This is the PostInstall -script for .pkg installation
--- 
--- Currently this script does the following things:
---   1) Uses fondu to extract and convert .dfont -fonts from Mac OS X system to .ttf -fonts for OpenOffice.org
-
-
-(*==== (global variables as get-functions) ====*)
-
-on getOOInstallPath()
-	return (((path to me) as string) & "Contents:")
-end getOOInstallPath
-
-on getOOResourcesPath()
-	return (((path to me) as string) & "Contents:Resources:")
-end getOOResourcesPath
-
-on getOOProgramPath()
-	return (getOOInstallPath() & "MacOS:")
-end getOOProgramPath
-
--- OSXSystemFontPathList : {"/System/Library/Fonts/", "/Library/Fonts/"}
--- OSXUserFontPathList : {"~/Library/Fonts/"}
-
-on getOSXSystemFontPathList()
-	return {(path to fonts folder from system domain) as string, �
-		(path to fonts folder from local domain) as string}
-end getOSXSystemFontPathList
-
-on getOSXUserFontPathList()
-	return {(path to fonts folder from user domain) as string}
-end getOSXUserFontPathList
-
-on getOOSystemFontPath()
-	return (getOOInstallPath() & "share:fonts:truetype:")
-end getOOSystemFontPath
-
-on getOOUserSettingsPath()
-	return (((path to home folder) as string) & "Library:Application Support:OpenOffice.org:%USERDIRPRODUCTVERSION:")
-end getOOUserSettingsPath
-
-on getOOUserFontPath()
-	return (getOOUserSettingsPath() & "user:fonts:")
-end getOOUserFontPath
-
-
-on getOOCookieSystemFondu()
-	-- nosystemfondu : file does exist if user does not want to use fondu for system fonts
-	return "no_system_fondu"
-end getOOCookieSystemFondu
-
-on getOOCookieSystemFonduDone()
-	-- systemfondudone : file does exist if native fonts already extracted from system fonts
-	return "system_fondu_done"
-end getOOCookieSystemFonduDone
-
-on getOOCookieUserFondu()
-	-- nouserfondu : file does exist if user does not want to use fondu for user fonts
-	return "no_user_fondu"
-end getOOCookieUserFondu
-
-on getOOCookieUserFonduDone()
-	-- userfondudone : file does exist if native fonts already extracted from user fonts
-	return "user_fondu_done"
-end getOOCookieUserFonduDone
-
---
--- the default handler: run
---
-
-on run
-	-- Check for that OOo can be found
-	if (not isRealPath(getOOProgramPath())) then
-		logEvent("(scripts/PostInstall) ERROR: could not find OOo installation from " & POSIX path of getOOProgramPath())
-		return
-	end if
-	
-	-- checks are ok, now we can start doing the real stuff
-	firstLaunch()
-	runSystemFondu()
-	runUserFondu()
-	
-	return
-end run
-
-
--------------------------------------------------------------
-
-
-on runSystemFondu()
-	-- check if user does not want font conversion 
-	if (isRealPath(getOOSystemFontPath() & getOOCookieSystemFondu())) then
-		return
-	end if
-	
-	-- check if font conversion was already run
-	if (isRealPath(getOOSystemFontPath() & getOOCookieSystemFonduDone())) then
-		return
-	end if
-	
-	logEvent("(scripts/PostInstall) Extracting system fonts...")
-	-- else try to create footprint
-	if (setCookie(getOOSystemFontPath(), getOOCookieSystemFonduDone())) then
-		-- call fondu for each font (i.e. without wildcard), so if it crashes only one font is missing
-		fonduConvertFonts(getOOSystemFontPath(), getOSXSystemFontPathList())
-	end if
-	logEvent("(scripts/PostInstall) Extracting system fonts completed.")
-end runSystemFondu
-
-
-on runUserFondu()
-	-- check if user does not want font conversion 
-	if (isRealPath(getOOUserFontPath() & getOOCookieUserFondu())) then
-		return
-	end if
-	
-	-- check if font conversion was already run
-	if (isRealPath(getOOUserFontPath() & getOOCookieUserFonduDone())) then
-		return
-	end if
-	
-	logEvent("(scripts/PostInstall) Extracting user fonts...")
-	-- try to create footprint
-	if (setCookie(getOOUserFontPath(), getOOCookieUserFonduDone())) then
-		-- call fondu for each font (i.e. without wildcard), so if it crashes only one font is missing
-		fonduConvertFonts(getOOUserFontPath(), getOSXUserFontPathList())
-	end if
-	logEvent("(scripts/PostInstall) Extracting user fonts completed.")
-end runUserFondu
-
-
-on firstLaunch()
-	-- continue only if OOSysFontdir exists	
-	if (not isRealPath(getOOSystemFontPath())) then
-		logEvent("(scripts/PostInstall) ERROR: could not find System font folder from " & POSIX path of getOOSystemFontPath())
-		return
-	end if
-	
-	if (setCookie(getOOSystemFontPath(), getOOCookieSystemFondu() & ".in_progress")) then
-		-- Has user already decided that he does not want to extract system fonts ?
-		if (not isRealPath(getOOSystemFontPath() & getOOCookieSystemFondu())) then
-			-- Are system fonts already extracted ?
-			if (not isRealPath(getOOSystemFontPath() & getOOCookieSystemFonduDone())) then
-				-- ask if the user wants to use fondu to extract system fonts
-				set yesKey to getMessage("YES_KEY")
-				set noKey to getMessage("NO_KEY")
-				display dialog getMessage("OOO_EXTRACT_NATIVE_SYSFONTS") buttons {noKey, yesKey} default button yesKey
-				set theResult to the button returned of the result
-				if theResult is noKey then
-					-- not use fondu for system fonts extraction !
-					setCookie(getOOSystemFontPath(), getOOCookieSystemFondu())
-					logEvent("(scripts/PostInstall) Setting: no system fonts")
-				end if
-			end if
-		end if
-	end if
-	
-	-- continue only if OOUserFontdir exists	
-	if (not isRealPath(getOOUserFontPath())) then
-		logEvent("(scripts/PostInstall) ERROR: could not find User font folder from " & POSIX path of getOOUserFontPath())
-		return
-	end if
-	
-	-- Has user already decided that he does not want to extract user fonts ?
-	if (not isRealPath(getOOUserFontPath() & getOOCookieUserFondu())) then
-		-- Are system fonts already extracted ?
-		if (not isRealPath(getOOUserFontPath() & getOOCookieUserFonduDone())) then
-			-- ask if the user wants to use fondu to extract user fonts
-			set yesKey to getMessage("YES_KEY")
-			set noKey to getMessage("NO_KEY")
-			display dialog getMessage("OOO_EXTRACT_NATIVE_USERFONTS") buttons {noKey, yesKey} default button yesKey
-			set theResult to the button returned of the result
-			if theResult is noKey then
-				-- not use fondu for user fonts extraction !
-				setCookie(getOOUserFontPath(), getOOCookieUserFondu())
-				logEvent("(scripts/PostInstall) Setting: no user fonts")
-			end if
-		end if
-	end if
-	
-end firstLaunch
-
-
-on fonduConvertFonts(targetPath, sourcePathList)
-	
-	-- define the location of fondu
-	set fondu to quoted form of (POSIX path of getOOProgramPath() & "fondu")
-	
-	-- first go to the target directory
-	set fonduCmd to "cd " & (quoted form of POSIX path of targetPath) & "; "
-	
-	repeat with q from 1 to number of items in sourcePathList
-		set aPath to POSIX path of (item q of sourcePathList)
-		set fonduCmd to fonduCmd & "for i in " & aPath & "*; do " & fondu & " -force \"$i\" >> /dev/null 2>&1; done; "
-	end repeat
-	try
-		-- ignore errors
-		-- with admin privileges does not work well on panther
-		do shell script "sh -c " & quoted form of fonduCmd
-	end try
-	logEvent("fonduCMD: " & fonduCmd)
-	
-end fonduConvertFonts
-
-
-(* ===== (Helper functions) ======= *)
-
--- set a cookiefile. The content is empty.
-on setCookie(aPath, cookieFile)
-	try
-		if (isRealPath(aPath)) then
-			set newFile to (aPath & cookieFile)
-			open for access file newFile
-			close access file newFile
-			return true
-		else
-			return false
-		end if
-	on error
-		return false
-	end try
-end setCookie
-
--- get a localized string
-on getMessage(aKey)
-	try
-		if (aKey is equal to "YES_KEY") then
-			return "Yes"
-		end if
-		
-		if (aKey is equal to "NO_KEY") then
-			return "No"
-		end if
-		
-		if (aKey is equal to "OOO_EXTRACT_NATIVE_SYSFONTS") then
-			return "Do you want OpenOffice.org to use the Apple system fonts?"
-		end if
-		
-		if (aKey is equal to "OOO_EXTRACT_NATIVE_USERFONTS") then
-			return "Do you want OpenOffice.org to use the fonts you have installed on this system?"
-		end if
-	end try
-end getMessage
-
--- function for checking if a path exists
-on isRealPath(aPath)
-	try
-		alias aPath
-		return true
-	on error
-		-- error number -43 from aPath
-		-- display dialog "NotRP -- " & aPath
-		return false
-	end try
-end isRealPath
-
--- function for logging script messages
-on logEvent(themessage)
-	set theLine to (do shell script �
-		"date  +'%Y-%m-%d %H:%M:%S'" as string) �
-		& " " & themessage
-	do shell script "echo " & quoted form of theLine & �
-		" >> ~/Library/Logs/OpenOffice%USERDIRPRODUCTVERSION.log"
-end logEvent
diff --git a/instsetoo_native/macosx/application/main.applescript b/instsetoo_native/macosx/application/main.applescript
deleted file mode 100644
index c5c100004ac8..000000000000
--- a/instsetoo_native/macosx/application/main.applescript
+++ /dev/null
@@ -1,363 +0,0 @@
-(*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- *************************************************************************)
-
-(*==== (global variables as get-functions) ====*)
-
-on getOOInstallPath()
-	return (((path to me) as string) & "Contents:")
-end getOOInstallPath
-
-on getOOResourcesPath()
-	return (((path to me) as string) & "Contents:Resources:")
-end getOOResourcesPath
-
-on getOOProgramPath()
-	return (getOOInstallPath() & "MacOS:")
-end getOOProgramPath
-
-on getScriptPath()
-	-- set this to absolute path when debugging
-	return (((path to me) as string) & "Contents:Resources:Scripts:")
-end getScriptPath
-
-on getOOUserSettingsPath()
-	return (((path to home folder) as string) & "Library:Application Support:OpenOffice.org:%USERDIRPRODUCTVERSION:")
-end getOOUserSettingsPath
-
-on getOOUserFontPath()
-	return (getOOUserSettingsPath() & "user:fonts:")
-end getOOUserFontPath
-
-on getUserLogsPath()
-	return (((path to home folder) as string) & "Library:Logs:")
-end getUserLogsPath
-
-on shellTerminator()
-	return (" &>/dev/null & echo $!") as string
-end shellTerminator
-
---
--- the default handlers: run, open, idle, quit
---
-
-on run
-	if (preRun()) then
-		logEvent("(Scripts/main) Running OpenOffice.org")
-		openSoffice("-")
-	end if
-end run
-
-on open (theFiles)
-	if (preRun()) then
-		openFiles(theFiles)
-	end if
-end open
-
-on idle
-	-- close icon only if ooo has terminated
-	if (hasOOoQuit()) then
-		tell me to quit
-	end if
-	-- check all x seconds if ok to quit
-	return 3
-end idle
-
-on quit
-	if (hasOOoQuit()) then
-		continue quit
-	end if
-end quit
-
--------------------------------------------------------------
-
-on preRun()
-	
-	
-	-- Check for the required version of Mac OS X
-	if (not atLeastOSXVersion(10, 3, 0)) then
-		display dialog getMessage("ERROR_NEED_PANTHER")
-		return false
-	end if
-	
-	-- Check for that OOo can be found
-	if (not isRealPath(getOOProgramPath())) then
-		display dialog getMessage("ERROR_OOO_NOT_FOUND")
-		return false
-	end if
-	
-	if (not isRealPath(getOOUserFontPath())) then
-		set createUserFont to "mkdir -p " & (quoted form of POSIX path of getOOUserFontPath()) & "; "
-		do shell script createUserFont
-	end if
-
-	-- If no crash occured before, ~/Library/Logs does not exist, and OpenOffice.org cannot be started
-	if (not isRealPath(getUserLogsPath())) then
-		set createUserLogsPath to "mkdir -p " & (quoted form of POSIX path of getUserLogsPath()) & "; "
-		do shell script createUserLogsPath
-	end if
-
-	-- Checks are ok, now do the PostInstall stuff (e.g. fondu)
-	
-	-- load helper library
-	set postinstall to load script alias �
-		(getScriptPath() & "PostInstall.scpt")
-	-- execute the postinstall script
-	run of postinstall
-	
-	
-	return true
-end preRun
-
-
-on hasOOoQuit()
-	if (isRealPath(getOOProgramPath())) then
-		-- set the location of soffice binary
-		set soffice to (quoted form of (POSIX path of getOOProgramPath() & "soffice"))
-		
-		set isRunning to do shell script "_FOUND_=`ps -wx -o command | grep " & soffice & " | grep -v grep`; echo $_FOUND_"
-		if isRunning � "" then
-			return false
-		else
-			return true
-		end if
-	else
-		return true
-	end if
-end hasOOoQuit
-
-
-on openSoffice(aFile)
-	set theDisplay to startXServer()
-	if (theDisplay is equal to "error") then
-		return
-	end if
-	set theEnv to "DISPLAY=" & theDisplay & " ; export DISPLAY; "
-	set theCmd to "sh " & (quoted form of (POSIX path of getOOProgramPath() & "soffice")) & " "
-	do shell script theEnv & theCmd & aFile & shellTerminator()
-	-- logEvent("open CMD: " & theEnv & theCmd & aFile)
-end openSoffice
-
-
--- helper function to start X11 server
-on startXServer()
-	
-	-- get X settings
-	set XSettingsList to findXServer()
-	set whichserver to item 1 of XSettingsList
-	set Xserverloc to item 2 of XSettingsList
-	
-	-- debug:
-	-- logEvent("(scripts/main) X settings: " & whichserver & "--" & POSIX path of Xserverloc)
-	-- set whichserver to "NOXSERVER"
-	
-	-- if nothing really was found, display an error message.
-	if (whichserver is equal to "NOXSERVER") then
-		
-		display dialog getMessage("ERROR_NEED_X11") buttons {"Quit", "More Info"} default button "More Info"
-		if the button returned of the result is "Quit" then
-			quit
-		else
-			-- if more info is chosen, then open a help web page
-			do shell script "open http://porting.openoffice.org/mac/faq/installing/X11.html"
-			-- cannot continue, so quit the script
-			return "error"
-		end if
-		
-	end if
-	
-	set now_running to ""
-	set now_running to do shell script "INX=`ps -wcx | grep  " & quoted form of (whichserver & "$") & "`; echo $INX"
-	if whichserver = "NOXSERVER" then
-		-- display dialog "No XServer Found"
-		set now_running to "Skip"
-	end if
-	if now_running = "" then
-		if whichserver = "X11" then
-			set x11cmd to quoted form of (Xserverloc & "/Contents/MacOS/X11") & shellTerminator()
-			do shell script x11cmd
-			-- save process id
-			set x11pid to the result
-			-- wait until the window manager is started which is the second child process of x11
-			set numchildrencmd to "ps -x -o ppid | grep " & x11pid & " | wc -l"
-			set numchildren to 0
-			set d to current date
-			set t1 to time of d
-			repeat while numchildren � 2
-				set d to current date
-				set t2 to time of d
-				-- give up after 30 seconds
-				if t2 - t1 > 30 then
-					display dialog "Command timed out"
-					exit repeat
-				end if
-				set result to do shell script numchildrencmd
-				set numchildren to result as integer
-			end repeat
-		else -- startup XDarwin
-			do shell script "open " & quoted form of Xserverloc & shellTerminator()
-			do shell script "sleep 4"
-		end if
-	end if
-	if whichserver is equal to "X11" then
-		-- the DISPLAY variable is different for every user currently logged in
-		-- X11 passes the DISPLAY as the last command line parameter to its child process
-		-- we can use ps to read the command line and parse the trailing :0, :1, or whatever
-		set xdisplay to do shell script "ps -wx -o command | grep X11.app | grep \":.$\" | sed \"s/^.*:/:/g\""
-		--display dialog xdisplay
-		return xdisplay
-	else
-		-- TODO: find out how XDarwin does it
-		return ":0"
-	end if
-end startXServer
-
-
-on openFiles(fileList)
-	if (count of fileList) > 0 then
-		repeat with i from 1 to the count of fileList
-			set theDocument to (item i of fileList)
-			set theFilePath to (quoted form of POSIX path of theDocument)
-			set theFileInfo to (info for theDocument)
-			openSoffice(theFilePath)
-			logEvent("(Scripts/main) Open file: " & theFilePath)
-		end repeat
-	end if
-end openFiles
-
-
-(* ===== (Helper functions) ======= *)
-
--- get a localized string
-on getMessage(aKey)
-	try
-		if (aKey is equal to "YES_KEY") then
-			return "Yes"
-		end if
-		
-		if (aKey is equal to "NO_KEY") then
-			return "No"
-		end if
-		
-		if (aKey is equal to "ERROR_OOO_NOT_FOUND") then
-			return "OpenOffice.org was not found on your system. Please (re-)install OpenOffice.org first."
-		end if
-		
-		if (aKey is equal to "ERROR_NEED_PANTHER") then
-			return "This build of OpenOffice.org cannot be run on this system, OpenOffice.org requires MacOSX 10.3 (Panther) or newer system"
-		end if
-		
-		if (aKey is equal to "ERROR_NEED_X11") then
-			return "OpenOffice.org for Mac OS X cannot be started, because the X11 software is not installed. Please install Apple X11 first from the Mac OS X install DVD. More information: http://porting.openoffice.org/mac/faq/installing/X11.html"
-		end if
-	end try
-end getMessage
-
-
--- function for logging script messages
-on logEvent(themessage)
-	set theLine to (do shell script �
-		"date  +'%Y-%m-%d %H:%M:%S'" as string) �
-		& " " & themessage
-	do shell script "echo " & quoted form of theLine & �
-		" >> ~/Library/Logs/OpenOffice%USERDIRPRODUCTVERSION.log"
-end logEvent
-
-
--- function for checking if a path exists
-on isRealPath(aPath)
-	try
-		alias aPath
-		return true
-	on error
-		-- error number -43 from aPath
-		-- display dialog "NotRP -- " & aPath
-		return false
-	end try
-end isRealPath
-
--- try to find X11 server on the Mac OS X system
--- return value: the found server or "NOXSERVER"
-on findXServer()
-	-- First try standard X11 location, then try standard XDarwin location
-	
-	set whichserver to "NOXSERVER"
-	--Utilities folder of system
-	set Xserverloc to ((path to utilities folder from system domain) as string) & "X11.app:"
-	--display dialog " Xserverloc" & Xserverloc
-	if (isRealPath(Xserverloc)) then
-		set whichserver to "X11"
-		set Xserverloc to (POSIX path of Xserverloc)
-	else
-		--Applications folder of system
-		set Xserverloc to ((path to applications folder from system domain) as string) & "XDarwin.app:"
-		if (isRealPath(Xserverloc)) then
-			set whichserver to "XDarwin"
-			set Xserverloc to (POSIX path of Xserverloc)
-		end if
-	end if
-	
-	-- if nothing found yet try using locate, first with X11.app and then with XDarwin.app
-	if (whichserver is equal to "NOXSERVER") then
-		set Xserverloc to do shell script "locate X11.app/Contents/MacOS/X11 | sed -e 's-/Contents/MacOS/X11--g'"
-		if Xserverloc � "" then
-			set whichserver to "X11"
-		end if
-	end if
-	
-	if (whichserver is equal to "NOXSERVER") then
-		set Xserverloc to do shell script "locate XDarwin.app/Contents/MacOS/XDarwin | sed -e 's-/Contents/MacOS/XDarwin--g'"
-		if Xserverloc � "" then
-			set whichserver to "XDarwin"
-		end if
-	end if
-	
-	return {whichserver, Xserverloc}
-end findXServer
-
-
--- Test for a minimum version of Mac OS X
-on atLeastOSXVersion(verMajor, verMinor, verStep)
-	-- The StandardAdditions's 'system attribute' used to be the Finder's 'computer' command.
-	tell application "Finder" to set sysv to (system attribute "sysv")
-	
-	-- Generate sysv-compatible number from given version
-	set reqVer to ((verMajor div 10) * 4096 + (verMajor mod 10) * 256 + verMinor * 16 + verStep)
-	
-	-- DEBUGGING:	
-	-- display dialog ("RV:" & reqVer & " < " & sysv as string)
-	
-	-- set major to ((sysv div 4096) * 10 + (sysv mod 4096 div 256))
-	-- set minor to (sysv mod 256 div 16)
-	-- set step to (sysv mod 16)
-	-- display dialog ("Your Mac OS X version: " & major & "." & minor & "." & step)
-	
-	if (reqVer > sysv) then
-		return false
-	else
-		return true
-	end if
-end atLeastOSXVersion
diff --git a/instsetoo_native/macosx/delzip b/instsetoo_native/macosx/delzip
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/instsetoo_native/macosx/delzip
+++ /dev/null
diff --git a/instsetoo_native/macosx/make_versioned.sh b/instsetoo_native/macosx/make_versioned.sh
deleted file mode 100755
index 04dbfb062d58..000000000000
--- a/instsetoo_native/macosx/make_versioned.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-#
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-#
-# Make versioned
-# Uses openoffice.lst to create versioned files for Mac OS X
-#
-
-# version commands, similar to other OOo code
-MAJOR=`sed -n '/^OpenOffice$/,/^}$/ s/.*USERDIRPRODUCTVERSION //p' ../util/openoffice.lst`
-MAJOR_MINOR=`sed -n '/^OpenOffice$/,/PRODUCTVERSION/ s/.*PRODUCTVERSION //p' ../util/openoffice.lst`
-MAJOR_MINOR_STEP=`sed -n '/^OpenOffice$/,/^}$/ s/.*ABOUTBOXPRODUCTVERSION //p' ../util/openoffice.lst`
-
-
-if [ -z "$1" -o -z "$2" ]; then
-  echo "ERROR: missing argument(s):";
-  echo ""
-  echo "USAGE: $0 <source file> <target file>"
-  echo "   <source file>    File to be versioned"
-  echo "   <target file>    Path and filename where to put the versioned file"
-  exit
-fi
-
-if [ ! -e "$1" ]; then
-  echo "ERROR: source file not found"
-  exit
-fi
-
-TARGET_PATH=`dirname "$2"`
-mkdir -p "$TARGET_PATH"
-
-echo "make_versioned.sh: Using versions $MAJOR - $MAJOR_MINOR - $MAJOR_MINOR_STEP for $1, storing to $TARGET_PATH"
-
-sed -e "s/\%USERDIRPRODUCTVERSION/${MAJOR}/g" "$1" |           \
-sed -e "s/\%PRODUCTVERSION/${MAJOR_MINOR}/g" |                 \
-sed -e "s/\%ABOUTBOXPRODUCTVERSION/${MAJOR_MINOR_STEP}/g" >"$2"
diff --git a/instsetoo_native/macosx/makefile.mk b/instsetoo_native/macosx/makefile.mk
deleted file mode 100644
index 66b558d1038e..000000000000
--- a/instsetoo_native/macosx/makefile.mk
+++ /dev/null
@@ -1,85 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-TARGET=osxbundle
-
-# --- Settings -------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files ----------------------------------------------------
-
-.IF "$(OS)"!="MACOSX" || "$(GUIBASE)"=="aqua"
-
-dummy:
-        @echo "Nothing to build for OS $(OS) and GUIBASE $(GUIBASE)"
-
-.ELSE           # "$(OS)"!="MACOSX"
-
-BUNDLE = $(MISC)$/OpenOffice.org.app
-CONTENTS = $(BUNDLE)$/Contents
-VERSIONED = $(MISC)$/versioned
-
-scriptfiles = \
-    $(CONTENTS)$/Resources$/Scripts$/main.scpt	\
-    $(CONTENTS)$/Resources$/Scripts$/PostInstall.scpt
-
-ZIPFLAGS = -r
-ZIP1TARGET = osxbundle
-ZIP1DIR = $(CONTENTS)
-ZIP1LIST = * -x Info.plist -x PkgInfo
-
-# --- Targets --------------------------------------------------
-
-.INCLUDE : target.mk
-
-$(ZIP1TARGETN) : $(scriptfiles) 
-
-# create application bundle from apple script source
-$(CONTENTS)$/Resources$/Scripts$/main.scpt : application/main.applescript
-    $(RM) -r $(BUNDLE)
-    make_versioned.sh "$<" "$(VERSIONED)/$<"
-    osacompile -o $(BUNDLE) -c OOo2 -s "$(VERSIONED)/$<"
-
-$(CONTENTS)$/Resources$/Scripts$/%.scpt : application/%.applescript
-    make_versioned.sh "$<" "$(VERSIONED)/$<"
-    osacompile -d -o "$@" "$(VERSIONED)/$<"
-    $(RM) "$(VERSIONED)/$<"
-
-# The InfoPlist.strings file has to be in UTF-16, thus a back-and-forth conversion
-# is needed for versioning
-#
-# THIS CODE IS PRESERVED FOR FUTURE LOCALIZATION EFFORTS
-#$(CONTENTS)$/Resources$/InfoPlist.strings : application/InfoPlist.strings	
-#	iconv -f UTF-16 -t UTF-8 "$<" > "$(VERSIONED)/tmp.utf8"
-#	make_versioned.sh "$(VERSIONED)/tmp.utf8" "$(VERSIONED)/$<"
-#	iconv -f UTF-8 -t UTF-16 "$(VERSIONED)/$<" > "$@"
-#	$(RM) "$(VERSIONED)/tmp.utf8" "$(VERSIONED)/$<"
-    
-.ENDIF		# "$(OS)"!="MACOSX"
-
diff --git a/instsetoo_native/prj/build.lst b/instsetoo_native/prj/build.lst
index 8e8079d64720..68edddfe9b28 100644
--- a/instsetoo_native/prj/build.lst
+++ b/instsetoo_native/prj/build.lst
@@ -1,6 +1,5 @@
-oon	instsetoo_native	::	l10n postprocess packimages testautomation NULL
+oon	instsetoo_native	::	l10n postprocess packimages testautomation ooo_custom_images NULL
 oon	instsetoo_native						usr1	-	all	oon_mkout NULL
 oon	instsetoo_native\inc_openoffice\unix	nmake	-	u	oon_unix NULL
 oon	instsetoo_native\inc_openoffice\windows\msi_languages	nmake	-	all	oon_msilang NULL
-oon	instsetoo_native\macosx					nmake	-	u	oon_macosx_bundle NULL
-oon	instsetoo_native\util					nmake	-	all	oon_util oon_macosx_bundle.u oon_msilang oon_unix.u NULL
+oon	instsetoo_native\util					nmake	-	all	oon_util oon_msilang oon_unix.u NULL
diff --git a/instsetoo_native/res/DS_Store b/instsetoo_native/res/DS_Store
deleted file mode 100644
index 632e6aff95be..000000000000
--- a/instsetoo_native/res/DS_Store
+++ /dev/null
diff --git a/instsetoo_native/res/DS_Store_Langpack b/instsetoo_native/res/DS_Store_Langpack
deleted file mode 100644
index 1b53eba75b74..000000000000
--- a/instsetoo_native/res/DS_Store_Langpack
+++ /dev/null
diff --git a/instsetoo_native/res/osxdndinstall.png b/instsetoo_native/res/osxdndinstall.png
deleted file mode 100644
index 1d981820b8b2..000000000000
--- a/instsetoo_native/res/osxdndinstall.png
+++ /dev/null
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 09334fdc98c0..b2f014f6ad58 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -157,13 +157,16 @@ MSISDKOOTEMPLATEDIR=$(MSISDKOOTEMPLATESOURCE)
 NOLOGOSPLASH:=$(BIN)$/intro.zip
 DEVNOLOGOSPLASH:=$(BIN)$/dev$/intro.zip
 BROFFICENOLOGOSPLASH:=$(BIN)$/broffice$/intro.zip
+BROFFICENOLOGOBRAND:=$(BIN)$/broffice$/images_brand.zip
 BROFFICEDEVNOLOGOSPLASH:=$(BIN)$/broffice_dev$/intro.zip
+BROFFICENDEVOLOGOBRAND:=$(BIN)$/broffice_dev$/images_brand.zip
 MSIOFFICETEMPLATEDIR=$(MISC)$/openoffice$/msi_templates
 MSILANGPACKTEMPLATEDIR=$(MISC)$/ooolangpack$/msi_templates
 MSIURETEMPLATEDIR=$(MISC)$/ure$/msi_templates
 MSISDKOOTEMPLATEDIR=$(MISC)$/sdkoo$/msi_templates
 
-ADDDEPS=$(NOLOGOSPLASH) $(DEVNOLOGOSPLASH) $(BROFFICENOLOGOSPLASH) $(BROFFICEDEVNOLOGOSPLASH)
+ADDDEPS=$(NOLOGOSPLASH) $(DEVNOLOGOSPLASH) $(BROFFICENOLOGOSPLASH) $(BROFFICEDEVNOLOGOSPLASH) \
+    $(BROFFICENOLOGOBRAND) $(BROFFICEDEVNOLOGOBRAND)
 .IF "$(OS)" == "WNT"
 ADDDEPS+=hack_msitemplates
 .ENDIF
@@ -198,11 +201,6 @@ $(MAKETARGETS) : $(ADDDEPS)
 
 .ENDIF			# "$(BUILD_SPECIAL)"!=""
 
-.IF "$(OS)" == "MACOSX"
-DMGDEPS=$(BIN)$/{osxdndinstall.png DS_Store DS_Store_Langpack}
-$(foreach,i,$(alllangiso) {openoffice openofficedev openofficewithjre ooolanguagepack broffice brofficedev brofficewithjre}_$i) : $(DMGDEPS)
-.ENDIF # "$(OS)" == "MACOSX"
-
 $(foreach,i,$(alllangiso) openoffice_$i) : $$@{$(PKGFORMAT:^".")}
 .IF "$(MAKETARGETS)"!=""
 .IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
@@ -314,8 +312,9 @@ $(BIN)$/broffice$/intro.zip : $(SOLARCOMMONPCKDIR)$/broffice_nologo$/intro.zip
     @-$(MKDIR) $(@:d)
     $(COPY) $< $@
 
-$(BIN)$/{osxdndinstall.png DS_Store DS_Store_Langpack} : $(PRJ)$/res$/$$(@:f)
-    @$(COPY) $< $@
+$(BIN)$/broffice$/images_brand.zip : $(SOLARCOMMONBINDIR)$/broffice_nologo$/images_brand.zip
+    @-$(MKDIR) $(@:d)
+    $(COPY) $< $@
 
 hack_msitemplates .PHONY:
     -$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 1dfdeb95321e..5ce50111d519 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -37,9 +37,10 @@ Globals
             UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
  			PACKAGEMAP package_names.txt,package_names_ext.txt
 			WINDOWSPATCHLEVEL 6
-			OPENSOURCE 1
 			OOODOWNLOADNAME 1
 			STARTCENTER_LAYOUT_STYLE 0
+			BUILDIDCWS {buildidcws}
+            OPENSOURCE 1
 		}
 	}
 }
@@ -92,6 +93,7 @@ OpenOffice
 			DOWNLOADBANNER	ooobanner.bmp
 			DOWNLOADBITMAP	ooobitmap.bmp
 			DOWNLOADSETUPICO	ooosetup.ico
+			WINDOWSBITMAPDIRECTORY ..\inc_broffice\windows\msi_templates\Binary
 			RELATIVE_PATHES_IN_DDF 1
             STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
@@ -158,6 +160,7 @@ OpenOffice_wJRE
 			DOWNLOADBANNER	ooobanner.bmp
 			DOWNLOADBITMAP	ooobitmap.bmp
 			DOWNLOADSETUPICO	ooosetup.ico
+			WINDOWSBITMAPDIRECTORY ..\inc_broffice\windows\msi_templates\Binary
 			RELATIVE_PATHES_IN_DDF 1
             STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
@@ -210,6 +213,7 @@ OpenOffice_Dev
 			PACKAGEREVISION {milestone}
 			LICENSENAME LGPL
 			SERVICESPROJEKT 1
+			WITHJREPRODUCT 1
 			GLOBALFILEGID gid_File_Lib_Vcl
 			GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
 			SPELLCHECKERFILE spellchecker_selection.txt
@@ -229,6 +233,7 @@ OpenOffice_Dev
 			DOWNLOADBANNER	ooobanner.bmp
 			DOWNLOADBITMAP	ooobitmap.bmp
 			DOWNLOADSETUPICO	ooosetup.ico
+			WINDOWSBITMAPDIRECTORY ..\inc_broffice\windows\msi_templates\Binary
 			LOCALUSERDIR $ORIGIN/..
 			RELATIVE_PATHES_IN_DDF 1
             STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
@@ -436,6 +441,7 @@ BrOffice
 			DOWNLOADBANNER	brobanner.bmp
 			DOWNLOADBITMAP	brobitmap.bmp
 			DOWNLOADSETUPICO	ooosetup.ico
+			WINDOWSBITMAPDIRECTORY ..\inc_broffice\windows\msi_templates\Binary
 			RELATIVE_PATHES_IN_DDF 1
             STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/BrOffice/extensions.jsp?cid=920794
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp
@@ -449,7 +455,7 @@ BrOffice
 		script			setup_osl
 		downloadname	BrOo_{productversion}_{os}_install_{languages}
 		langpackdownloadname	BrOo_{productversion}_languagepack_{os}_install_{languages}
-		include			{solarenvpath}/{os}/loader2,.,{localpath}/bin/broffice,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/broffice,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/broffice,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+		include			{solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/broffice,{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/broffice,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 	}
 }
 
@@ -507,6 +513,7 @@ BrOffice_wJRE
 			DOWNLOADBANNER	brobanner.bmp
 			DOWNLOADBITMAP	brobitmap.bmp
 			DOWNLOADSETUPICO	ooosetup.ico
+			WINDOWSBITMAPDIRECTORY ..\inc_broffice\windows\msi_templates\Binary
 			RELATIVE_PATHES_IN_DDF 1
             STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/BrOffice/extensions.jsp?cid=920794
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp
@@ -519,7 +526,7 @@ BrOffice_wJRE
 		compression		5
 		script			setup_osljre
 		downloadname	BrOo_{productversion}_{os}_installwjre_{languages}
-		include			{solarenvpath}/{os}/loader2,.,{localpath}/bin/broffice,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/broffice,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/broffice,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+		include			{solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/broffice,{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/broffice,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 	}
 }
 
@@ -542,11 +549,6 @@ BrOffice_Dev
 			USERDIRPRODUCTVERSION 3
 			ABOUTBOXPRODUCTVERSION 3.3.0
 			DEVELOPMENTPRODUCT 1
-			PROGRESSBARCOLOR 
-			PROGRESSSIZE 
-			PROGRESSPOSITION 
-			PROGRESSFRAMECOLOR 
-			NATIVEPROGRESS
 			BASISPACKAGEPREFIX ooobasis-dev
 			UREPACKAGEPREFIX ooodev
 			SOLSUREPACKAGEPREFIX ooodev
@@ -563,6 +565,7 @@ BrOffice_Dev
 			PACKAGEREVISION {milestone}
 			LICENSENAME LGPL
 			SERVICESPROJEKT 1
+			WITHJREPRODUCT 1
 			SETSTATICPATH 1
 			GLOBALFILEGID gid_File_Lib_Vcl
 			GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
@@ -582,6 +585,7 @@ BrOffice_Dev
 			DOWNLOADBANNER	brobanner.bmp
 			DOWNLOADBITMAP	brobitmap.bmp
 			DOWNLOADSETUPICO	ooosetup.ico
+			WINDOWSBITMAPDIRECTORY ..\inc_broffice\windows\msi_templates\Binary
 			LOCALUSERDIR $ORIGIN/..
 			RELATIVE_PATHES_IN_DDF 1
             STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/BrOffice/extensions.jsp?cid=920794
@@ -596,6 +600,6 @@ BrOffice_Dev
 		script			setup_osljre
 		downloadname	BrOo-dev_{productversion}_{os}_install_{languages}
 		langpackdownloadname	BrOo_{productversion}_languagepack_{os}_install_{languages}
-		include			{solarenvpath}/{os}/loader2,.,{localpath}/bin/broffice_dev,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/broffice,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/broffice_dev,{solarcommonpath}/pck.{minor}/broffice,{solarcommonpath}/pck.{minor}/openoffice_dev,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+		include			{solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice_dev,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/broffice,{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/broffice_dev,{solarcommonpath}/pck.{minor}/broffice,{solarcommonpath}/pck.{minor}/openoffice_dev,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 	}
 }
diff --git a/ooo.lst b/ooo.lst
index 8cf0936d31ad..a2f41b8a609b 100644
--- a/ooo.lst
+++ b/ooo.lst
@@ -14,7 +14,6 @@ http://hg.services.openoffice.org/binaries
 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-2dfbbf27a5822eeabaeacdf16d7c41e7-fondu_src-051010.tar.gz
 2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz
 30102daecfb3a6aa022d2691dc075180-liberation-fonts-1.05.zip
 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
diff --git a/scp2/source/crashrep/file_crashrep.scp b/scp2/source/crashrep/file_crashrep.scp
index f92f93f0b1d8..53ec1ac245eb 100644
--- a/scp2/source/crashrep/file_crashrep.scp
+++ b/scp2/source/crashrep/file_crashrep.scp
@@ -31,11 +31,7 @@
 
 File gid_Brand_File_Bin_Crashreport
     BIN_FILE_BODY;
-  #ifdef UNX
-    Name = "crash_report.bin";
-  #else
-    Name = "crashrep.exe";
-  #endif
+    Name = EXENAME(crashrep);
     Dir = gid_Brand_Dir_Program;
   #ifdef WNT
     FileDescription = "%PRODUCTNAME Crashreporter";
@@ -66,15 +62,3 @@ File gid_Brand_File_Lib_Dbghelp
 End
 
 #endif
-
-#ifdef UNX
- 
-File gid_Brand_File_Bin_Crashreport_Script
-    BIN_FILE_BODY;
-    Name = "crash_report";
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED);
-End
-
-#endif
-
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index f2f305181786..b2023aabecd7 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -119,19 +119,22 @@ Module gid_Module_Langpack_Brand_Template
             gid_Brand_Dir_Share_Readme);
     Files = (gid_Brand_File_Res_Iso,
              gid_Brand_File_Res_Ooo,
-             gid_Brand_File_Entitlement,
              gid_Brand_File_Help_C05_Sdatabase_Zip,
              gid_Brand_File_Help_C05_Scalc_Zip,
              gid_Brand_File_Help_C05_Sdraw_Zip,
              gid_Brand_File_Help_C05_Swriter_Zip,
              gid_Brand_File_License_License,
+             gid_Brand_File_License_License_Small,
              gid_Brand_File_License_License_Html,
+             gid_Brand_File_License_License_Html_Small,
              gid_Brand_File_Readme_Readme,
              gid_Brand_File_Readme_Readme_Html,
              gid_Brand_File_Share_Registry_Cjk_Xcd,
              gid_Brand_File_Share_Registry_Korea_Xcd,
              gid_Brand_File_Txt_License,
+             gid_Brand_File_Txt_License_Small,
              gid_Brand_File_Txt_License_Html,
+             gid_Brand_File_Txt_License_Html_Small,
              gid_Brand_File_Txt_Readme,
              gid_Brand_File_Txt_Readme_Html);
 End
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 400baaa5ef04..3ebe0396dabb 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -100,10 +100,10 @@ File gid_File_Lib_Ldapbe2
 End
 #endif
 
-STD_UNO_LIB_FILE(gid_File_Lib_Chartcontroller, chartcontroller)
-STD_UNO_LIB_FILE(gid_File_Lib_Chartmodel, chartmodel)
-STD_UNO_LIB_FILE(gid_File_Lib_Charttools, charttools)
-STD_UNO_LIB_FILE(gid_File_Lib_Chartview, chartview)
+STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Chartcontroller, chartcontroller)
+STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Chartmodel, chartmodel)
+STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Charttools, charttools)
+STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Chartview, chartview)
 
 
 #if defined WNT && defined _MSC
@@ -228,7 +228,7 @@ End
 File gid_File_Lib_QStart_Gtk
     Name = LIBNAME(qstart_gtk);
     TXT_FILE_BODY;
-    Styles = (PACKED);
+    Styles = (PACKED,PATCH);
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@@ -505,7 +505,7 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Fileacc,fileacc)
 
 File gid_File_Lib_Filterconfig1
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED,UNO_COMPONENT,PATCH);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
     Name = SPECIAL_NAME(filterconfig1);
@@ -653,7 +653,7 @@ STD_LIB_FILE( gid_File_Lib_Fwi , fwi)
 File gid_File_Lib_Fwk
     Name = LIBNAME(fwk);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH,UNO_COMPONENT);
+    Styles = (PACKED,UNO_COMPONENT,PATCH);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -1126,13 +1126,13 @@ SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistr
 File gid_File_Lib_Desktop_Detector
     Name = LIBNAME(desktop_detector);
     TXT_FILE_BODY;
-    Styles = (PACKED);
+    Styles = (PACKED,PATCH);
     Dir = SCP2_OOO_BIN_DIR;
 End
 File gid_File_Lib_Vclplug_Gen
     Name = LIBNAME(vclplug_gen);
     TXT_FILE_BODY;
-    Styles = (PACKED);
+    Styles = (PACKED,PATCH);
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@@ -1142,7 +1142,7 @@ End
 File gid_File_Lib_Vclplug_Gtk
     Name = LIBNAME(vclplug_gtk);
     TXT_FILE_BODY;
-    Styles = (PACKED);
+    Styles = (PACKED,PATCH);
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@@ -1151,7 +1151,7 @@ End
 File gid_File_Lib_Vclplug_Kde
     Name = LIBNAME(vclplug_kde);
     TXT_FILE_BODY;
-    Styles = (PACKED);
+    Styles = (PACKED,PATCH);
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@@ -1161,7 +1161,7 @@ End
 File gid_File_Lib_Vclplug_Kde4
     Name = LIBNAME(vclplug_kde4);
     TXT_FILE_BODY;
-    Styles = (PACKED);
+    Styles = (PACKED,PATCH);
     Dir = gid_Dir_Program;
 End
 #endif
@@ -1172,7 +1172,7 @@ End
 File gid_File_Lib_AppleRemote
     Name = LIBNAME(AppleRemote);
     TXT_FILE_BODY;
-    Styles = (PACKED);
+    Styles = (PACKED,PATCH);
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@@ -1181,13 +1181,13 @@ End
 File gid_File_Lib_Basebmp
     Name = LIBNAME(basebmp);
     TXT_FILE_BODY;
-    Styles = (PACKED);
+    Styles = (PACKED,PATCH);
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
 
 #if defined UNX && ! defined QUARTZ
-STD_LIB_FILE( gid_File_Lib_Vclplug_Svp, vclplug_svp )
+STD_LIB_FILE_PATCH( gid_File_Lib_Vclplug_Svp, vclplug_svp )
 STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
 #endif
 
@@ -1195,7 +1195,7 @@ STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
 
 File gid_File_Lib_Recentfile
     TXT_FILE_BODY;
-    Styles = (PACKED);
+    Styles = (PACKED,PATCH);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(librecentfile,UNXSUFFIX));
 End
@@ -1238,7 +1238,7 @@ End
 File gid_File_Lib_Res
     Name = LIBNAME(res);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED,UNO_COMPONENT,PATCH);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -1512,7 +1512,7 @@ STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx )
 File gid_File_Lib_Vcl
     Name = LIBNAME(vcl);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED,UNO_COMPONENT,PATCH);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 19a15f7fcc11..d72fda64f6f2 100755
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1732,15 +1732,6 @@ File gid_File_App_InfoPlist
 End
 #endif
 
-#if defined MACOSX && !defined QUARTZ
-File gid_File_App_Bundle
-    ARCHIVE_TXT_FILE_BODY;
-    Dir = gid_Dir_Bundle_Contents;
-    Name = "osxbundle.zip";
-    Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
-End
-#endif
-
 #ifdef MACOSX
 File gid_File_Icns_Bundle
     ARCHIVE_TXT_FILE_BODY;
@@ -1777,15 +1768,6 @@ File gid_File_Spotlight_Bundle
 End
 #endif
 
-#if defined MACOSX && !defined QUARTZ
-File gid_File_Bin_Fondu
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = "fondu";
-    Styles = (PACKED);
-End
-#endif
-
 File gid_File_Config_Javasettingsunopkginstall
     USER_FILE_BODY;
     Dir = gid_Dir_Config;
@@ -1911,7 +1893,7 @@ End
 File gid_File_Extension_Dictionary_Da
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-da.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@@ -1920,7 +1902,7 @@ End
 File gid_File_Extension_Dictionary_De_AT
 	Dir = gid_Brand_Dir_Share_Extension_Install;
     Name = "dict-de-AT.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@@ -1929,7 +1911,7 @@ End
 File gid_File_Extension_Dictionary_De_CH
     Dir = gid_Brand_Dir_Share_Extension_Install;
     Name = "dict-de-CH.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK);
+    Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
     UnixRights = 444;
 End
 #endif
@@ -1938,7 +1920,7 @@ End
 File gid_File_Extension_Dictionary_De_DE
     Dir = gid_Brand_Dir_Share_Extension_Install;
     Name = "dict-de-DE.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK);
+    Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
     UnixRights = 444;
 End
 #endif
@@ -1947,7 +1929,7 @@ End
 File gid_File_Extension_Dictionary_En
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-en.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@@ -1965,7 +1947,7 @@ End
 File gid_File_Extension_Dictionary_Et
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-et.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@@ -1974,7 +1956,7 @@ End
 File gid_File_Extension_Dictionary_Fr
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-fr.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@@ -2001,7 +1983,7 @@ End
 File gid_File_Extension_Dictionary_Hu
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-hu.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@@ -2010,7 +1992,16 @@ End
 File gid_File_Extension_Dictionary_It
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-it.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Ku_Tr
+	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Name = "dict-ku-TR.oxt";
+	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@@ -2046,7 +2037,7 @@ End
 File gid_File_Extension_Dictionary_No
     Dir = gid_Brand_Dir_Share_Extension_Install;
     Name = "dict-no.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK);
+    Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
     UnixRights = 444;
 End
 #endif
@@ -2055,7 +2046,7 @@ End
 File gid_File_Extension_Dictionary_Pl
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-pl.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@@ -2064,7 +2055,7 @@ End
 File gid_File_Extension_Dictionary_Pt
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-pt.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@@ -2073,7 +2064,7 @@ End
 File gid_File_Extension_Dictionary_Ro
     Dir = gid_Brand_Dir_Share_Extension_Install;
     Name = "dict-ro.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK);
+    Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
     UnixRights = 444;
 End
 #endif
@@ -2091,7 +2082,7 @@ End
 File gid_File_Extension_Dictionary_Sk
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-sk.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@@ -2118,7 +2109,7 @@ End
 File gid_File_Extension_Dictionary_Sv
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-sv.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index bd0182f95c49..a91114de03d7 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -968,6 +968,17 @@ Module gid_Module_Root_Extension_Dictionary_It
 	Styles = (HIDDEN_ROOT);
 End
 
+Module gid_Module_Root_Extension_Dictionary_Ku_Tr
+	Name = "gid_Module_Root_Extension_Dictionary_Ku_Tr";
+	Description = "gid_Module_Root_Extension_Dictionary_Ku_Tr";
+	Files = (gid_File_Extension_Dictionary_Ku_Tr);
+	InstallOrder = "2000";
+	Spellcheckerlanguage = "ku-TR";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Root;
+	Styles = (HIDDEN_ROOT);
+End
+
 Module gid_Module_Root_Extension_Dictionary_Lt
 	Name = "gid_Module_Root_Extension_Dictionary_Lt";
 	Description = "gid_Module_Root_Extension_Dictionary_Lt";
diff --git a/scp2/source/xsltfilter/file_xsltfilter.scp b/scp2/source/xsltfilter/file_xsltfilter.scp
index 848b1c707ff7..e044a3dee90d 100644
--- a/scp2/source/xsltfilter/file_xsltfilter.scp
+++ b/scp2/source/xsltfilter/file_xsltfilter.scp
@@ -57,7 +57,7 @@ End
 
 File gid_File_Xsl_Export_Xhtml_Body
     TXT_FILE_BODY;
-    Styles = (PACKED);
+    Styles = (PACKED,PATCH);
     Dir = gid_Dir_Share_Xslt_Export_Xhtml;
     Name = "/xslt/export/xhtml/body.xsl";
 End
diff --git a/set_soenv.in b/set_soenv.in
index 64815d418f99..58c81ee568f1 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -510,9 +510,9 @@ elsif ( $platform =~ m/linux/ )
    elsif ($platform =~ m/^alpha/) 
    {  print "Setting Linux Alpha specific values... ";
       $outfile        = "LinuxAlphaEnv.Set"; 
-      $CPU            = "A";
-      $CPUNAME        = "ALPHA_";
-      $OUTPATH        = "unxlnga";
+      $CPU            = "L";
+      $CPUNAME        = "AXP";
+      $OUTPATH        = "unxlngaxp";
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha";
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."server";
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."native_threads";
diff --git a/solenv/bin/cws.pl b/solenv/bin/cws.pl
index f3abc0a7a320..f24db23897af 100644
--- a/solenv/bin/cws.pl
+++ b/solenv/bin/cws.pl
@@ -2206,6 +2206,7 @@ sub do_fetch
     my $ooo_svn_server = $config->get_ooo_svn_server();
     my $so_svn_server = $config->get_so_svn_server();
     my $prebuild_dir = $config->get_prebuild_binaries_location();
+    my $external_tarball_source = $prebuild_dir;
     # Check early for platforms so we can bail out before anything time consuming is done
     # in case of a missing platform
     my @platforms;
@@ -2368,10 +2369,10 @@ sub do_fetch
         }
     }
 
-    if ( !$onlysolver ) {
+    if ( !$onlysolver && defined($external_tarball_source) ) {
         my $source_root_dir = "$workspace/$masterws";
-        my $external_tarball_source = "$prebuild_dir/$masterws/ext_sources";
-        if ( -e "$source_root_dir/ooo/ooo.lst" && defined($prebuild_dir) && -d $external_tarball_source ) {
+        $external_tarball_source .= "/$masterws/ext_sources";
+        if ( -e "$source_root_dir/ooo/ooo.lst" && -d $external_tarball_source ) {
             fetch_external_tarballs($source_root_dir, $external_tarball_source);
         }
     }
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 143f60d986db..197f985bbf83 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -1348,6 +1348,9 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
             # Debian allows no underline in package name
             if ( $installer::globals::debian ) { $packagename =~ s/_/-/g; }
 
+            # Debian allows no underline in package name
+            if ( $installer::globals::debian ) { $packagename =~ s/_/-/g; }
+
             my $linkaddon = "";
             my $linkpackage = 0;
             $installer::globals::add_required_package = "";
@@ -2126,17 +2129,19 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
 
             # include the license text into the table Control.idt
 
-            # my $licensefilesource = installer::windows::idtglobal::get_licensefilesource($onelanguage, $filesinproductlanguageresolvedarrayref);
-            my $licensefilesource = installer::windows::idtglobal::get_rtflicensefilesource($onelanguage, $includepatharrayref_lang);
-            my $licensefile = installer::files::read_file($licensefilesource);
-            installer::scpzipfiles::replace_all_ziplistvariables_in_rtffile($licensefile, $allvariablesarrayref, $onelanguage, $loggingdir);
-            my $controltablename = $languageidtdir . $installer::globals::separator . "Control.idt";
-            my $controltable = installer::files::read_file($controltablename);
-            installer::windows::idtglobal::add_licensefile_to_database($licensefile, $controltable);
-            installer::files::save_file($controltablename, $controltable);
-
-            $infoline = "Added licensefile $licensefilesource into database $controltablename\n";
-            push(@installer::globals::logfileinfo, $infoline);
+            if ( ! $allvariableshashref->{'HIDELICENSEDIALOG'} )
+            {
+                my $licensefilesource = installer::windows::idtglobal::get_rtflicensefilesource($onelanguage, $includepatharrayref_lang);
+                my $licensefile = installer::files::read_file($licensefilesource);
+                installer::scpzipfiles::replace_all_ziplistvariables_in_rtffile($licensefile, $allvariablesarrayref, $onelanguage, $loggingdir);
+                my $controltablename = $languageidtdir . $installer::globals::separator . "Control.idt";
+                my $controltable = installer::files::read_file($controltablename);
+                installer::windows::idtglobal::add_licensefile_to_database($licensefile, $controltable);
+                installer::files::save_file($controltablename, $controltable);
+
+                $infoline = "Added licensefile $licensefilesource into database $controltablename\n";
+                push(@installer::globals::logfileinfo, $infoline);
+            }
 
             # include office directory in CustomAction table
 
diff --git a/solenv/bin/mhids.pl b/solenv/bin/mhids.pl
index f2d0acc649f6..a1229c398551 100644
--- a/solenv/bin/mhids.pl
+++ b/solenv/bin/mhids.pl
@@ -155,7 +155,9 @@ $filebase =~ s/\..*?$//;
 # now stript it to something that doesn't togger vista execution prevention :(
 $flbs = $filebase;
 $flbs =~ s/[aeiou]//g;
-$workfile = "$tmpdir/${flbs}_".$$;
+# call srand ony once per script!
+srand();
+$workfile = "$tmpdir/${flbs}_".$$.rand();
 #$workfile =~ s/setup/set_up/;
 
 # now get $workfile ready for shell usage...
@@ -171,7 +173,7 @@ unlink "$workfile.obj";
 
 if ( -f "$workfile.hid" )
 {
-    unlink "$workfile.hid" or die "ERRROR - cannot remove $workfile.hid\n";;
+    unlink "$workfile.hid" or die "ERRROR - cannot remove $workfile.hid\n";
 }
 
 # hack to quit for files which cannot be handled
diff --git a/solenv/bin/modules/CreatePDBRelocators.pm b/solenv/bin/modules/CreatePDBRelocators.pm
index 8f272fe896f8..c6e4f81a660f 100644
--- a/solenv/bin/modules/CreatePDBRelocators.pm
+++ b/solenv/bin/modules/CreatePDBRelocators.pm
@@ -106,8 +106,8 @@ sub create_pdb_relocators
     }
 
     # collect files
-    my @pdb_files;
     foreach my $repository (@{$self->{REPOSITORIES}}) {
+        my @pdb_files;
         my $o = $self->{SOLARVERSION} . "/$repository";
         $repository =~ s/(.*?)\.(.*)/$1/;
         $self->collect_files( $o, $inpath, \@pdb_files);
diff --git a/solenv/bin/modules/installer/archivefiles.pm b/solenv/bin/modules/installer/archivefiles.pm
index 80c468b61db2..4a9586c9fdd4 100644
--- a/solenv/bin/modules/installer/archivefiles.pm
+++ b/solenv/bin/modules/installer/archivefiles.pm
@@ -50,18 +50,26 @@ sub put_language_into_name
     my $filename = "";
     my $extension = "";
 
-    if ( $oldname =~ /^\s*(.*)(\..*?)\s*$/ )    # files with extension
+    if ( $oldname =~ /en-US/ )  # files, that contain the language in the file name
     {
-        $filename = $1;
-        $extension = $2;
+        $newname = $oldname;
+        $newname =~ s/en-US/$onelanguage/;
     }
-    else
+    else    # files, that do not contain the language in the file name
     {
-        $filename = $oldname;
-        $extension = "";
-    }
+        if ( $oldname =~ /^\s*(.*)(\..*?)\s*$/ )    # files with extension
+        {
+            $filename = $1;
+            $extension = $2;
+        }
+        else
+        {
+            $filename = $oldname;
+            $extension = "";
+        }
 
-    $newname = $1 . "_" . $onelanguage . $2;
+        $newname = $1 . "_" . $onelanguage . $2;
+    }
 
     return $newname;
 }
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index ffe79136b57e..136eca913dd9 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -426,6 +426,17 @@ sub create_epm_header
         }
     }
 
+    # Process for Linux packages, in which only a very basic license file is
+    # included into the package.
+
+    if ( $installer::globals::islinuxbuild )
+    {
+        if ( $variableshashref->{'COPYRIGHT_INTO_LINUXPACKAGE'} )
+        {
+            $licensefilename = "linuxcopyrightfile";
+            $license_in_package_defined = 1;
+        }
+    }
     # searching for and readme file
 
     for ( my $i = 0; $i <= $#{$filesinproduct}; $i++ )
@@ -447,7 +458,7 @@ sub create_epm_header
     {
         my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, "" , 0);
 
-        if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find license file $licensefilename!", "create_epm_header"); }
+        if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find license file $licensefilename (A)!", "create_epm_header"); }
 
         # Special handling to add the content of the file "license_en-US" to the solaris copyrightfile. But not for all products
 
@@ -500,12 +511,12 @@ sub create_epm_header
 
     if (!($foundlicensefile))
     {
-        installer::exiter::exit_program("ERROR: Could not find license file $licensefilename", "create_epm_header");
+        installer::exiter::exit_program("ERROR: Could not find license file $licensefilename (B)", "create_epm_header");
     }
 
     if (!($foundreadmefile))
     {
-        installer::exiter::exit_program("ERROR: Could not find readme file $readmefilename", "create_epm_header");
+        installer::exiter::exit_program("ERROR: Could not find readme file $readmefilename (C)", "create_epm_header");
     }
 
     # including %replaces
@@ -1436,6 +1447,8 @@ sub set_autoprovreq_in_specfile
         $autoreqprovline = "AutoReqProv\: no\n";
     }
 
+    $autoreqprovline .= "%define _binary_filedigest_algorithm 1\n%define _binary_payload w9.gzdio\n";
+
     for ( my $i = 0; $i <= $#{$changefile}; $i++ )
     {
         # Adding "autoreqprov" behind the line beginning with: Group:
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 72ab0215dbcf..564df06e79e2 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -78,6 +78,7 @@ BEGIN
         "dgo",
         "kok",
         "mni",
+        "ca-XV",
         "sat",
         "ug",
         "om",
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index 778ca23e740a..ecda4f9a4e0b 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -1507,6 +1507,20 @@ sub add_License_Files_into_Installdir
             $newfile->{'specificlanguage'} = "";
             $newfile->{'haslanguagemodule'} = "0";
 
+            if ( defined $newfile->{'InstallName'} )
+            {
+                if ( $newfile->{'InstallName'} =~ /^\s*(.*?)_$defaultlanguage\.?(\w*?)\s*$/ )
+                {
+                    my $localfilename = $1;
+                    my $localextension = $2;
+
+                    if ( $localextension eq "" ) { $newfile->{'InstallName'} = $localfilename; }
+                    else { $newfile->{'InstallName'} = $localfilename . "\." . $localextension; }
+                }
+            }
+
+            $newfile->{'removelangfromfile'} = "1"; # Important for files with an InstallName, because language also has to be removed there.
+
             if ( $foundofficedir )
             {
                 $newfile->{'Dir'} = $officedirectorygid;
@@ -1529,6 +1543,12 @@ sub add_License_Files_into_Installdir
             $infoline = "New files: Adding file $newfilename for the installation root to the file list. Language: $defaultlanguage\n";
             push( @installer::globals::logfileinfo, $infoline);
 
+            if ( defined $newfile->{'InstallName'} )
+            {
+                $infoline = "New files: Using installation name: $newfile->{'InstallName'}\n";
+                push( @installer::globals::logfileinfo, $infoline);
+            }
+
             # Collecting license and readme file for the installation set
 
             push(@installer::globals::installsetfiles, $newfile);
diff --git a/solenv/bin/modules/installer/setupscript.pm b/solenv/bin/modules/installer/setupscript.pm
index 9da5340f915f..a3bf5abf50a9 100644
--- a/solenv/bin/modules/installer/setupscript.pm
+++ b/solenv/bin/modules/installer/setupscript.pm
@@ -155,6 +155,12 @@ sub add_lowercase_productname_setupscriptvariable
                 $newline = "\%LCONEWORDPRODUCTNAME " . lc($value) . "\n";
                 push(@{$variablesref} ,$newline);
                 $value = $original;
+                $value =~ s/\s*$//g;
+                $value =~ s/^\s*//g;
+                $value =~ s/ /\%20/g;
+                $newline = "\%MASKEDPRODUCTNAME " . $value . "\n";
+                push(@{$variablesref} ,$newline);
+                $value = $original;
                 $value =~ s/\s/\_/g;
                 # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $1 . $2 . $4; }
                 $newline = "\%UNIXPRODUCTNAME " . lc($value) . "\n";
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 9666ef3e1af5..08f6eacf9e24 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -407,7 +407,12 @@ sub create_package
         }
 
         my $sla = 'sla.r';
-        my $ref = installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$sla, $includepatharrayref, 0);
+        my $ref = "";
+
+        if ( ! $allvariables->{'HIDELICENSEDIALOG'} )
+        {
+            installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$sla, $includepatharrayref, 0);
+        }
 
         my $localtempdir = $tempdir;
 
@@ -518,7 +523,7 @@ sub create_package
         }
 
         $systemcall = "cd $localtempdir && hdiutil makehybrid -hfs -hfs-openfolder $folder $folder -hfs-volume-name \"$volume_name\" -ov -o $installdir/tmp && hdiutil convert -ov -format UDZO $installdir/tmp.dmg -o $archive && ";
-        if ($$ref ne "") {
+        if (( $ref ne "" ) && ( $$ref ne "" )) {
             $systemcall .= "hdiutil unflatten $archive && Rez -a $$ref -o $archive && hdiutil flatten $archive &&";
         }
         $systemcall .= "rm -f $installdir/tmp.dmg";
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm
index 6f03228ca10a..b82f5175250b 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -769,9 +769,13 @@ sub prepare_language_idt_directory
         installer::systemactions::create_directory($destinationdir . $installer::globals::separator . "Binary");
         installer::systemactions::copy_directory($installer::globals::idttemplatepath . $installer::globals::separator . "Binary", $destinationdir . $installer::globals::separator . "Binary");
 
-        if (( $installer::globals::patch ) && ( $allvariables->{'WINDOWSPATCHBITMAPDIRECTORY'} ))
+        if ((( $installer::globals::patch ) && ( $allvariables->{'WINDOWSPATCHBITMAPDIRECTORY'} )) || ( $allvariables->{'WINDOWSBITMAPDIRECTORY'} ))
         {
-            my $newsourcedir = $installer::globals::unpackpath . $installer::globals::separator . $allvariables->{'WINDOWSPATCHBITMAPDIRECTORY'}; # path setting in list file dependent from unpackpath !?
+            my $bitmapdir = "";
+            if ( $allvariables->{'WINDOWSPATCHBITMAPDIRECTORY'} ) { $bitmapdir = $allvariables->{'WINDOWSPATCHBITMAPDIRECTORY'}; }
+            if ( $allvariables->{'WINDOWSBITMAPDIRECTORY'} ) { $bitmapdir = $allvariables->{'WINDOWSBITMAPDIRECTORY'}; }
+
+            my $newsourcedir = $installer::globals::unpackpath . $installer::globals::separator . $bitmapdir; # path setting in list file dependent from unpackpath !?
             $infoline = "\nOverwriting files in directory \"" . $destinationdir . $installer::globals::separator . "Binary" . "\" with files from directory \"" . $newsourcedir . "\".\n";
             push( @installer::globals::logfileinfo, $infoline);
             if ( ! -d $newsourcedir )
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index 7b890d06d58f..2ef083178122 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -393,7 +393,23 @@ sub set_important_properties
     if ( $allvariables->{'HIDELICENSEDIALOG'} )
     {
         my $onepropertyline = "HIDEEULA" . "\t" . "1" . "\n";
-        push(@{$propertyfile}, $onepropertyline);
+
+        my $already_defined = 0;
+
+        for ( my $i = 0; $i <= $#{$propertyfile}; $i++ )
+        {
+            if ( ${$propertyfile}[$i] =~ /^\s*HIDEEULA\t/ )
+            {
+                ${$propertyfile}[$i] = $onepropertyline;
+                $already_defined = 1;
+                last;
+            }
+        }
+
+        if ( ! $already_defined )
+        {
+            push(@{$propertyfile}, $onepropertyline);
+        }
     }
 
     # Setting .NET requirements
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index ff1d172c9b8f..6cc3c1e3f5db 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -491,6 +491,12 @@ sub analyze_and_save_logfile
 
     if ( $installer::globals::creating_windows_installer_patch ) { $installer::globals::creating_windows_installer_patch = 0; }
 
+    # Exiting the packaging process, if an error occured.
+    # This is important, to get an error code "-1", if an error was found in the log file,
+    # that did not break the packaging process
+
+    if ( ! $is_success) { installer::exiter::exit_program("ERROR: Found an error in the logfile. Packaging failed.", "analyze_and_save_logfile"); }
+
     return ($is_success, $finalinstalldir);
 }
 
@@ -3132,7 +3138,8 @@ sub put_license_into_setup
 
     # find and read english license file
     my $licenselanguage = "en-US";                  # always english !
-    my $licensefilename = "LICENSE_" . $licenselanguage;
+    # my $licensefilename = "LICENSE_" . $licenselanguage;
+    my $licensefilename = "license_" . $licenselanguage . ".txt";
     my $licenseincludepatharrayref = get_language_specific_include_pathes($includepatharrayref, $licenselanguage);
 
     my $licenseref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $licenseincludepatharrayref, 0);
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index 00de1709473b..09b7718e2992 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -659,7 +659,7 @@ sub set_manufacturer
         if (( $allvariables->{'DEFINEDMANUFACTURER'} ) && ( $allvariables->{'DEFINEDMANUFACTURER'} ne "" )) { $sunname = $allvariables->{'DEFINEDMANUFACTURER'}; }
         else { installer::exiter::exit_program("ERROR: Property DEFINEDMANUFACTURER has to be set for this product!", "set_manufacturer"); }
         $installer::globals::manufacturer = $sunname;
-        $installer::globals::longmanufacturer = $sunname . ", Inc.";
+        $installer::globals::longmanufacturer = $sunname;
     }
 
     $allvariables->{'MANUFACTURER'} = $installer::globals::manufacturer;
@@ -742,6 +742,11 @@ sub replace_variables_in_ziplist_variables
     my $localminor = $installer::globals::lastminor;
     if ( $installer::globals::minor ) { $localminor = $installer::globals::minor; }
 
+    my $buildidstringcws = $installer::globals::build . $localminor . "(Build:" . $installer::globals::buildid . ")";
+
+    # the environment variable CWS_WORK_STAMP is set only in CWS
+    if ( $ENV{'CWS_WORK_STAMP'} ) { $buildidstringcws = $buildidstringcws . "\[CWS\:" . $ENV{'CWS_WORK_STAMP'} . "\]"; }
+
     for ( my $i = 0; $i <= $#{$blockref}; $i++ )
     {
         if ($installer::globals::lastminor) { ${$blockref}[$i] =~ s/\{milestone\}/$milestonevariable/; }
@@ -752,6 +757,7 @@ sub replace_variables_in_ziplist_variables
         else { ${$blockref}[$i] =~ s/\{buildid\}//; }
         if ( $installer::globals::build ) { ${$blockref}[$i] =~ s/\{buildsource\}/$installer::globals::build/; }
         else { ${$blockref}[$i] =~ s/\{build\}//; }
+        ${$blockref}[$i] =~ s/\{buildidcws\}/$buildidstringcws/;
     }
 }
 
diff --git a/solenv/bin/packregistry.xslt b/solenv/bin/packregistry.xslt
index 55558d55450c..76b4c5eeffe8 100644
--- a/solenv/bin/packregistry.xslt
+++ b/solenv/bin/packregistry.xslt
@@ -29,7 +29,8 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
    xmlns:oor="http://openoffice.org/2001/registry">
   <xsl:strip-space elements="*"/>
-  <xsl:preserve-space elements="value"/>
+  <xsl:preserve-space elements="value it"/>
+    <!-- TODO: strip space from "value" elements that have "it" children -->
   <xsl:template match="/">
     <oor:data xmlns:xs="http://www.w3.org/2001/XMLSchema"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -63,19 +64,25 @@
   </xsl:template>
   <xsl:template
      match="oor:component-schema|oor:component-data|templates|component|group|
-            set|node-ref|prop|item|value|node">
+            set|node-ref|prop|item|value|it|unicode|node">
     <xsl:copy copy-namespaces="no">
       <!-- prune oor:component-data xmlns:install="..." namespaces (would only
            work in XSLT 2.0, however) -->
-      <xsl:for-each select="@*">
-        <xsl:attribute name="{name()}">
-          <xsl:value-of select="."/>
-        </xsl:attribute>
-      </xsl:for-each>
+      <xsl:apply-templates select="@*"/>
       <xsl:apply-templates/>
     </xsl:copy>
   </xsl:template>
+  <xsl:template match="value[it]">
+    <xsl:copy copy-namespaces="no">
+      <xsl:apply-templates select="@*"/>
+      <xsl:apply-templates select="*"/>
+        <!-- ignore text elements (which must be whitespace only) -->
+    </xsl:copy>
+  </xsl:template>
   <xsl:template match="info|import|uses|constraints"/>
     <!-- TODO: no longer strip elements when they are eventually read by
          configmgr implementation -->
+  <xsl:template match="@*">
+    <xsl:copy/>
+  </xsl:template>
 </xsl:stylesheet>
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 325d9a075504..23bd50af77a2 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -2953,7 +2953,7 @@ wntmsci12
 			MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
 			MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
 			OJDK16PATH %SOLAR_OJDK16PATH%
-			PATH $cp(%PSDK%$/bin)$:%PATH%$:$cp(%SHARED_COM_SDK_PATH%)$:$cp(%COMPATH%$/bin)$:$cp(%FSDK%)$:$cp(%F20SDK%)$/bin$:$cp(%DSDK%$/Utilities$/bin$/x86)$:$cp(%PACKMS%)
+			PATH $cp(%PSDK%$/Bin)$:%PATH%$:$cp(%SHARED_COM_SDK_PATH%)$:$cp(%COMPATH%$/bin)$:$cp(%FSDK%)$:$cp(%F20SDK%)$/bin$:$cp(%DSDK%$/Utilities$/bin$/x86)$:$cp(%PACKMS%)
 			PROF_EDITION TRUE
 			PSDKINC -I%PSDK%$/include
 			SOLAREXTRAINC -I%DSDK%$/include
@@ -3295,7 +3295,7 @@ wntmsci13
 			MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
 			MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
 			OJDK16PATH %SOLAR_OJDK16PATH%
-			PATH $cp(%PSDK%$/bin)$:%PATH%$:$cp(%SHARED_COM_SDK_PATH%)$:$cp(%COMPATH%$/bin)$:$cp(%FSDK%)$:$cp(%F20SDK%)$/bin$:$cp(%DSDK%$/Utilities$/bin$/x86)$:$cp(%PACKMS%)
+			PATH $cp(%PSDK%$/Bin)$:%PATH%$:$cp(%SHARED_COM_SDK_PATH%)$:$cp(%COMPATH%$/bin)$:$cp(%FSDK%)$:$cp(%F20SDK%)$/bin$:$cp(%DSDK%$/Utilities$/bin$/x86)$:$cp(%PACKMS%)
 			PROF_EDITION TRUE
 			PSDKINC -I%PSDK%$/include
 			SOLAREXTRAINC -I%DSDK%$/include
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index b835f526997f..09b4169048a6 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -182,7 +182,9 @@ SAXLIB=-lsax$(DLLPOSTFIX)
 MAILLIB=-lmail
 DOCMGRLIB=-ldmg$(DLLPOSTFIX)
 BASICLIB=-lsb$(DLLPOSTFIX)
+.IF "$(ENABLE_VBA)"=="YES"
 VBAHELPERLIB=-lvbahelper$(DLLPOSTFIX)
+.ENDIF
 DBTOOLSLIB=-ldbtools$(DLLPOSTFIX)
 HM2LIBSH=-lhmwrpdll
 HM2LIBST=-lhmwrap
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index f6920b285050..ec992a075900 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=300
-RSCREVISION=300m77(Build:9496)
-BUILD=9496
-LAST_MINOR=m77
+RSCREVISION=300m78(Build:9501)
+BUILD=9501
+LAST_MINOR=m78
 SOURCEVERSION=DEV300
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 495720f9d038..d2fcafa3fe13 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -480,7 +480,7 @@ DBG_LEVEL*=0
 optimize!=true
 dbgutil!=true
 DBG_LEVEL*=1
-USE_STLP_DEBUG=TRUE
+USE_STLP_DEBUG*=TRUE
 .ENDIF
 
 .IF "$(debug)"!=""
diff --git a/solenv/inc/tg_config.mk b/solenv/inc/tg_config.mk
index 2f1b9fedde80..bbc720ed600e 100644
--- a/solenv/inc/tg_config.mk
+++ b/solenv/inc/tg_config.mk
@@ -120,10 +120,12 @@ $(PROCESSOUT)/registry/data/$(PACKAGEDIR)/%.xcu : %.xcu
     $(COMMAND_ECHO)$(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $(@:d))$*.val) \
                 --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \
                 --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
+            --path $(DTDDIR)/registry \
                 $(SYSXSLDIR)data_val.xsl $<
     $(COMMAND_ECHO)$(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \
                 --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \
                 --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
+            --path $(DTDDIR)/registry \
                 $(SYSXSLDIR)alllang.xsl $<
     @+-$(RM) $(@:d)$*.val > $(NULLDEV)
 
@@ -154,6 +156,7 @@ $(PROCESSOUT)/registry/res/{$(alllangiso)}/$(PACKAGEDIR)/%.xcu :| %.xcu
                 --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \
                 --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
                 --stringparam locale {$(subst,/$(PACKAGEDIR)/$(@:f), $(subst,$(PROCESSOUT)/registry/res/, $@))} \
+                --path $(DTDDIR)/registry \
                 $(SYSXSLDIR)alllang.xsl $<
 
 # --- languagepack tag modules ---
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index eb27b51a6e6d..a05b4629755e 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -167,6 +167,10 @@
 .INCLUDE : unxlnghppa.mk
 .ENDIF
 
+.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXL"
+.INCLUDE : unxlngaxp.mk
+.ENDIF
+
 # --- general *ix settings ---
 HC=hc
 HCFLAGS=
diff --git a/solenv/inc/unxlngaxp.mk b/solenv/inc/unxlngaxp.mk
new file mode 100644
index 000000000000..bf7711a10c5b
--- /dev/null
+++ b/solenv/inc/unxlngaxp.mk
@@ -0,0 +1,34 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# mk file for Unix Linux Alpha using gcc, please make generic modifications to unxlng.mk
+
+PICSWITCH:=-fPIC
+.INCLUDE : unxlng.mk
+CFLAGS+=-DAXP
+DLLPOSTFIX=ll
+BUILD64=1
diff --git a/soltools/cpp/cpp.h b/soltools/cpp/cpp.h
index da609dbe53c1..34e18579c35a 100644
--- a/soltools/cpp/cpp.h
+++ b/soltools/cpp/cpp.h
@@ -15,11 +15,8 @@
 #define NULL    0
 #endif
 
-#ifndef __alpha
 typedef unsigned char uchar;
 
-#endif
-
 enum toktype
 {
     END, UNCLASS, NAME, NUMBER, STRING, CCON, NL, WS, DSHARP,
diff --git a/splitbuild/extern.lst b/splitbuild/extern.lst
index 334ad19a5b10..d0327f963e34 100644
--- a/splitbuild/extern.lst
+++ b/splitbuild/extern.lst
@@ -1 +1 @@
-afms agg apache-commons apple_remote beanshell berkeleydb bitstream_vera_fonts boost cairo cppunit curl epm expat external fondu graphite hsqldb hunspell hyphen icc icu jfreereport jpeg libegg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD moz neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib 
+afms agg apache-commons apple_remote beanshell berkeleydb bitstream_vera_fonts boost cairo cppunit curl epm expat external graphite hsqldb hunspell hyphen icc icu jfreereport jpeg libegg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD moz neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib
author	sb <sb@openoffice.org>	2010-05-20 15:46:46 +0200
committer	sb <sb@openoffice.org>	2010-05-20 15:46:46 +0200
commit	09993c4710798dfb1e9c67b2a02a31ce14adab98 (patch)
tree	7dfd861fc95b03d54f15c5daba8cca73a07a81c3
parent	4aee4ee739adaa21e46876ec1c4ac941d54ed8d5 (diff)
parent	ff94b38b00f90b4fbc8f49d132d46f27c537e143 (diff)