Index: configure
===================================================================
--- configure	(revision 61)
+++ configure	(working copy)
@@ -1,18 +1,20 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63.
+# Generated by GNU Autoconf 2.64.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 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
@@ -20,23 +22,15 @@
   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
@@ -44,7 +38,13 @@
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -55,7 +55,7 @@
     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\\(.*\\)"`;;
@@ -78,14 +78,7 @@
   }
 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
 # there to prevent editors from complaining about space-tab.
@@ -94,15 +87,15 @@
 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
 
      ;;
@@ -114,12 +107,16 @@
 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
 
-# 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
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -131,330 +128,299 @@
 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.
-$as_unset CDPATH
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
-
 if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
 else
-  as_have_required=no
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
 fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
 
-  if test $as_have_required = yes &&	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
 exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
+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 :
 
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
 else
-  exitcode=1
-  echo as_func_ret_success failed.
+  exitcode=1; echo positional parameters were not saved.
 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
-  :
+test x\$exitcode = x0 || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_have_required=no
 fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
-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
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  case $as_dir in
+  as_found=:
+  case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
 	   done;;
        esac
+  as_found=false
 done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
 IFS=$as_save_IFS
 
 
-      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$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
 
-
-:
-_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
-
+    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
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
 fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
 fi
+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
 
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
 
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
 
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-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
 
-test $exitcode = 0) || { (exit 1); exit 1; }
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
 
-(
-  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; }
+  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"
 
-_ASEOF
-}; then
-  break
-fi
 
-fi
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
 
-      done
+# 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
 
-      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
 
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  fi
+  $as_echo "$as_me: error: $1" >&2
+  as_fn_exit $as_status
+} # as_fn_error
 
-    if 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
-  :
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
 else
-  exitcode=1
-  echo as_func_success failed.
+  as_expr=false
 fi
 
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
 else
-  exitcode=1
-  echo as_func_ret_success failed.
+  as_basename=false
 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
-  :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_dirname=false
 fi
 
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell bug-autoconf@gnu.org about your system,
-  echo including any error possibly output before this message.
-  echo This can help us improve future autoconf versions.
-  echo Configuration will now proceed without shell functions.
-}
+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'`
 
+# 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" || {
-
-  # 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.  :-)
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
     /[$]LINENO/=
@@ -471,8 +437,7 @@
       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; }; }
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
@@ -482,29 +447,18 @@
   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 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   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
@@ -534,7 +488,7 @@
 rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -553,10 +507,10 @@
       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
   '
@@ -570,7 +524,6 @@
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-
 exec 7<&0 </dev/null 6>&1
 
 # Name of the host.
@@ -589,7 +542,6 @@
 subdirs=
 MFLAGS=
 MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
 PACKAGE_NAME=
@@ -597,6 +549,7 @@
 PACKAGE_VERSION=
 PACKAGE_STRING=
 PACKAGE_BUGREPORT=
+PACKAGE_URL=
 
 ac_unique_file="ABOUT_APACHE"
 enable_option_checking=no
@@ -751,6 +704,7 @@
 SSL_LIBS
 MOD_PROXY_BALANCER_LDADD
 MOD_PROXY_AJP_LDADD
+MOD_PROXY_SCGI_LDADD
 MOD_PROXY_HTTP_LDADD
 MOD_PROXY_FTP_LDADD
 MOD_PROXY_CONNECT_LDADD
@@ -907,6 +861,7 @@
 program_transform_name
 prefix
 exec_prefix
+PACKAGE_URL
 PACKAGE_BUGREPORT
 PACKAGE_STRING
 PACKAGE_VERSION
@@ -982,6 +937,7 @@
 enable_proxy_connect
 enable_proxy_ftp
 enable_proxy_http
+enable_proxy_scgi
 enable_proxy_ajp
 enable_proxy_balancer
 enable_ssl
@@ -1154,8 +1110,7 @@
     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_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1181,8 +1136,7 @@
     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_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1386,8 +1340,7 @@
     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_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1403,8 +1356,7 @@
     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_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1434,17 +1386,17 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
+  -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+    esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
@@ -1461,15 +1413,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
-   { (exit 1); exit 1; }; } ;;
+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1492,8 +1442,7 @@
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1523,11 +1472,9 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { $as_echo "$as_me: error: working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1566,13 +1513,11 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1735,6 +1680,7 @@
   --enable-proxy-connect  Apache proxy CONNECT module
   --enable-proxy-ftp      Apache proxy FTP module
   --enable-proxy-http     Apache proxy HTTP module
+  --enable-proxy-scgi     Apache proxy SCGI module
   --enable-proxy-ajp      Apache proxy AJP module
   --enable-proxy-balancer Apache proxy BALANCER module
   --enable-ssl            SSL/TLS support (mod_ssl)
@@ -1833,6 +1779,7 @@
 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
@@ -1896,21 +1843,372 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.64
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
   exit
 fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_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;}
+  return $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# 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_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;}
+  return $ac_retval
+
+} # ac_fn_c_try_run
+
+# 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_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_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
 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.63.  Invocation command line was
+generated by GNU Autoconf 2.64.  Invocation command line was
 
   $ $0 $@
 
@@ -1946,8 +2244,8 @@
 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
@@ -1984,9 +2282,9 @@
       ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
     2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      as_fn_append ac_configure_args1 " '$ac_arg'"
       if test $ac_must_keep_next = true; then
 	ac_must_keep_next=false # Got value, back to normal.
       else
@@ -2002,13 +2300,13 @@
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
+      as_fn_append ac_configure_args " '$ac_arg'"
       ;;
     esac
   done
 done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
@@ -2033,13 +2331,13 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -2111,40 +2409,42 @@
     exit $exit_status
 ' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -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"
+_ACEOF
 
+
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
 ac_site_file1=NONE
@@ -2162,7 +2462,7 @@
 do
   test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
@@ -2173,7 +2473,7 @@
   # 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:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
@@ -2181,7 +2481,7 @@
     esac
   fi
 else
-  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
 $as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -2196,11 +2496,11 @@
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
@@ -2210,17 +2510,17 @@
 	ac_old_val_w=`echo x $ac_old_val`
 	ac_new_val_w=`echo x $ac_new_val`
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
 $as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
 $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
@@ -2232,36 +2532,21 @@
     esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { $as_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; }; }
+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2274,24 +2559,16 @@
 
 ac_aux_dir=
 for ac_dir in build "$srcdir"/build; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
+  for ac_t in install-sh install.sh shtool; do
+    if test -f "$ac_dir/$ac_t"; then
+      ac_aux_dir=$ac_dir
+      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      break 2
+    fi
+  done
 done
 if test -z "$ac_aux_dir"; then
-  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in build \"$srcdir\"/build" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in build \"$srcdir\"/build" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot find install-sh, install.sh, or shtool in build \"$srcdir\"/build" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2427,7 +2704,7 @@
 
 
 # Check whether --enable-layout was given.
-if test "${enable_layout+set}" = set; then
+if test "${enable_layout+set}" = set; then :
   enableval=$enable_layout;
   LAYOUT=$enableval
 
@@ -2497,9 +2774,9 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for chosen layout" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for chosen layout" >&5
 $as_echo_n "checking for chosen layout... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $layout_name" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $layout_name" >&5
 $as_echo "$layout_name" >&6; }
 
 
@@ -2618,9 +2895,7 @@
   eval ac_val=$`echo $ac_var`
   case $ac_val in
     [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { { $as_echo "$as_me:$LINENO: error: expected an absolute path for --$ac_var: $ac_val" >&5
-$as_echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2;}
-   { (exit 1); exit 1; }; };;
+    *)  as_fn_error "expected an absolute path for --$ac_var: $ac_val" "$LINENO" 5;;
   esac
 done
 
@@ -3304,9 +3579,9 @@
 nl='
 '
 
-  { $as_echo "$as_me:$LINENO: checking for working mkdir -p" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mkdir -p" >&5
 $as_echo_n "checking for working mkdir -p... " >&6; }
-if test "${ac_cv_mkdir_p+set}" = set; then
+if test "${ac_cv_mkdir_p+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -3320,7 +3595,7 @@
     rm -rf conftestdir
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_mkdir_p" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mkdir_p" >&5
 $as_echo "$ac_cv_mkdir_p" >&6; }
   if test "$ac_cv_mkdir_p" = "yes"; then
       mkdir_p="mkdir -p"
@@ -3333,35 +3608,27 @@
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then
+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_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; }; }
+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { $as_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; }; }
+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -3377,28 +3644,24 @@
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then
+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_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; }; }
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
-   { (exit 1); exit 1; }; };;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -3414,28 +3677,24 @@
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:$LINENO: checking target system type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
 $as_echo_n "checking target system type... " >&6; }
-if test "${ac_cv_target+set}" = set; then
+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_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; }; }
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
 $as_echo "$ac_cv_target" >&6; }
 case $ac_cv_target in
 *-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-$as_echo "$as_me: error: invalid value of canonical target" >&2;}
-   { (exit 1); exit 1; }; };;
+*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
 esac
 target=$ac_cv_target
 ac_save_IFS=$IFS; IFS='-'
@@ -3458,13 +3717,14 @@
     NONENONEs,x,x, &&
   program_prefix=${target_alias}-
 
+
 orig_prefix="$prefix"
 
 echo $ac_n "${nl}Configuring Apache Portable Runtime library ...${nl}"
 
 
 # Check whether --with-included-apr was given.
-if test "${with_included_apr+set}" = set; then
+if test "${with_included_apr+set}" = set; then :
   withval=$with_included_apr;
 fi
 
@@ -3501,16 +3761,14 @@
     esac
   done
 
-  { $as_echo "$as_me:$LINENO: checking for APR" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for APR" >&5
 $as_echo_n "checking for APR... " >&6; }
 
 # Check whether --with-apr was given.
-if test "${with_apr+set}" = set; then
+if test "${with_apr+set}" = set; then :
   withval=$with_apr;
     if test "$withval" = "no" || test "$withval" = "yes"; then
-      { { $as_echo "$as_me:$LINENO: error: --with-apr requires a directory or file to be provided" >&5
-$as_echo "$as_me: error: --with-apr requires a directory or file to be provided" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "--with-apr requires a directory or file to be provided" "$LINENO" 5
     fi
 
     for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config
@@ -3532,9 +3790,7 @@
     fi
 
             if test "$apr_found" != "yes"; then
-      { { $as_echo "$as_me:$LINENO: error: the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file." >&5
-$as_echo "$as_me: error: the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file." "$LINENO" 5
     fi
 
 else
@@ -3565,9 +3821,7 @@
       apr_bundled_major="`sed -n '/#define.*APR_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \""$srcdir/srclib/apr"/include/apr_version.h\"`"
       case $apr_bundled_major in
         "")
-          { { $as_echo "$as_me:$LINENO: error: failed to find major version of bundled APR" >&5
-$as_echo "$as_me: error: failed to find major version of bundled APR" >&2;}
-   { (exit 1); exit 1; }; }
+          as_fn_error "failed to find major version of bundled APR" "$LINENO" 5
         ;;
         0)
           apr_temp_apr_config_file="apr-config"
@@ -3586,15 +3840,13 @@
 fi
 
 
-  { $as_echo "$as_me:$LINENO: result: $apr_found" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_found" >&5
 $as_echo "$apr_found" >&6; }
 
 fi
 
 if test "$apr_found" = "no"; then
-  { { $as_echo "$as_me:$LINENO: error: APR not found.  Please read the documentation." >&5
-$as_echo "$as_me: error: APR not found.  Please read the documentation." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "APR not found.  Please read the documentation." "$LINENO" 5
 fi
 
 if test "$apr_found" = "reconfig"; then
@@ -3627,13 +3879,13 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -3641,8 +3893,8 @@
   (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"
@@ -3665,11 +3917,11 @@
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
@@ -3728,7 +3980,7 @@
   # 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:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
@@ -3736,7 +3988,7 @@
     esac
   fi
 else
-  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
 $as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -3861,16 +4113,14 @@
     esac
   done
 
-  { $as_echo "$as_me:$LINENO: checking for APR-util" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for APR-util" >&5
 $as_echo_n "checking for APR-util... " >&6; }
 
 # Check whether --with-apr-util was given.
-if test "${with_apr_util+set}" = set; then
+if test "${with_apr_util+set}" = set; then :
   withval=$with_apr_util;
     if test "$withval" = "no" || test "$withval" = "yes"; then
-      { { $as_echo "$as_me:$LINENO: error: --with-apr-util requires a directory or file to be provided" >&5
-$as_echo "$as_me: error: --with-apr-util requires a directory or file to be provided" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "--with-apr-util requires a directory or file to be provided" "$LINENO" 5
     fi
 
     for apu_temp_apu_config_file in $apu_temp_acceptable_apu_config
@@ -3892,9 +4142,7 @@
     fi
 
             if test "$apu_found" != "yes"; then
-      { { $as_echo "$as_me:$LINENO: error: the --with-apr-util parameter is incorrect. It must specify an install prefix, a build directory, or an apu-config file." >&5
-$as_echo "$as_me: error: the --with-apr-util parameter is incorrect. It must specify an install prefix, a build directory, or an apu-config file." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "the --with-apr-util parameter is incorrect. It must specify an install prefix, a build directory, or an apu-config file." "$LINENO" 5
     fi
 
 else
@@ -3925,9 +4173,7 @@
       apu_bundled_major="`sed -n '/#define.*APU_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \""$srcdir/srclib/apr-util"/include/apu_version.h\"`"
       case $apu_bundled_major in
         "")
-          { { $as_echo "$as_me:$LINENO: error: failed to find major version of bundled APU" >&5
-$as_echo "$as_me: error: failed to find major version of bundled APU" >&2;}
-   { (exit 1); exit 1; }; }
+          as_fn_error "failed to find major version of bundled APU" "$LINENO" 5
         ;;
         0)
           apu_temp_apu_config_file="apu-config"
@@ -3946,28 +4192,22 @@
 fi
 
 
-  { $as_echo "$as_me:$LINENO: result: $apu_found" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apu_found" >&5
 $as_echo "$apu_found" >&6; }
 
 fi
 
 if test "$apu_found" = "no"; then
-  { { $as_echo "$as_me:$LINENO: error: APR-util not found.  Please read the documentation." >&5
-$as_echo "$as_me: error: APR-util not found.  Please read the documentation." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "APR-util not found.  Please read the documentation." "$LINENO" 5
 fi
 
 # Catch some misconfigurations:
 case ${apr_found}.${apu_found} in
 reconfig.yes)
-  { { $as_echo "$as_me:$LINENO: error: Cannot use an external APR-util with the bundled APR" >&5
-$as_echo "$as_me: error: Cannot use an external APR-util with the bundled APR" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "Cannot use an external APR-util with the bundled APR" "$LINENO" 5
   ;;
 yes.reconfig)
-  { { $as_echo "$as_me:$LINENO: error: Cannot use an external APR with the bundled APR-util" >&5
-$as_echo "$as_me: error: Cannot use an external APR with the bundled APR-util" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "Cannot use an external APR with the bundled APR-util" "$LINENO" 5
   ;;
 esac
 
@@ -4001,13 +4241,13 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -4015,8 +4255,8 @@
   (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"
@@ -4039,11 +4279,11 @@
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
@@ -4102,7 +4342,7 @@
   # 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:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
@@ -4110,7 +4350,7 @@
     esac
   fi
 else
-  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
 $as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -4154,9 +4394,9 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4167,24 +4407,24 @@
 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:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4194,9 +4434,9 @@
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -4207,24 +4447,24 @@
 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:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4233,7 +4473,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -4247,9 +4487,9 @@
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4260,24 +4500,24 @@
 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:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4287,9 +4527,9 @@
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4301,18 +4541,18 @@
 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:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
@@ -4331,10 +4571,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4346,9 +4586,9 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4359,24 +4599,24 @@
 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:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4390,9 +4630,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -4403,24 +4643,24 @@
 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:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4433,7 +4673,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -4444,73 +4684,55 @@
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_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; }; }; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
-  $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); }
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    rm -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
+#include <stdio.h>
 int
 main ()
 {
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
 
   ;
   return 0;
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
 $as_echo_n "checking for C compiler default output file name... " >&6; }
 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
@@ -4527,17 +4749,17 @@
 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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
@@ -4554,7 +4776,7 @@
 	# 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
@@ -4573,84 +4795,75 @@
 else
   ac_file=''
 fi
-
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
 $as_echo "$ac_file" >&6; }
-if test -z "$ac_file"; then
+if test -z "$ac_file"; then :
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
-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; }; }; }
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
 fi
-
 ac_exeext=$ac_cv_exeext
 
 # 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 "$as_me:${as_lineno-$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
+  { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) 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_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:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
+as_fn_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; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
     fi
   fi
 fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
 ac_clean_files=$ac_clean_files_save
 # Check 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 "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
 $as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
 $as_echo "$cross_compiling" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 $as_echo_n "checking for suffix of executables... " >&6; }
-if { (ac_try="$ac_link"
+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_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:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -4665,32 +4878,24 @@
   esac
 done
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$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; }; }; }
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
 fi
-
 rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
 $as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then
+if test "${ac_cv_objext+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -4702,17 +4907,17 @@
 }
 _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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
@@ -4725,31 +4930,23 @@
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-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; }; }; }
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
 fi
-
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
 $as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -4763,37 +4960,16 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
+  ac_compiler_gnu=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
 $as_echo "$ac_cv_c_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GCC=yes
@@ -4802,20 +4978,16 @@
 fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
+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 >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -4826,35 +4998,11 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -4865,36 +5013,12 @@
   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
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
 
-	ac_c_werror_flag=$ac_save_c_werror_flag
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -4905,42 +5029,17 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; 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:$LINENO: result: $ac_cv_prog_cc_g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
 $as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -4957,18 +5056,14 @@
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
+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 >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
@@ -5025,32 +5120,9 @@
 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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 ac_fn_c_try_compile "$LINENO"; 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
@@ -5061,17 +5133,19 @@
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 $as_echo "none needed" >&6; } ;;
   xno)
-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 $as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
 
+fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -5084,14 +5158,14 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
 $as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
+  if test "${ac_cv_prog_CPP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -5106,11 +5180,7 @@
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -5119,78 +5189,34 @@
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -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
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (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
+if ac_fn_c_try_cpp "$LINENO"; 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
 
@@ -5202,7 +5228,7 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
 $as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -5213,11 +5239,7 @@
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -5226,87 +5248,40 @@
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -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
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (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
+if ac_fn_c_try_cpp "$LINENO"; 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:$LINENO: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$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; }; }; }
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -5327,7 +5302,7 @@
 
 
 # Check whether --with-pcre was given.
-if test "${with_pcre+set}" = set; then
+if test "${with_pcre+set}" = set; then :
   withval=$with_pcre;
 fi
 
@@ -5335,9 +5310,9 @@
 case $with_pcre in
 yes) # Extract the first word of "pcre-config", so it can be a program name with args.
 set dummy pcre-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PCRE_CONFIG+set}" = set; then
+if test "${ac_cv_path_PCRE_CONFIG+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $PCRE_CONFIG in
@@ -5350,14 +5325,14 @@
 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_PCRE_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PCRE_CONFIG" && ac_cv_path_PCRE_CONFIG="false"
@@ -5366,10 +5341,10 @@
 fi
 PCRE_CONFIG=$ac_cv_path_PCRE_CONFIG
 if test -n "$PCRE_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PCRE_CONFIG" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PCRE_CONFIG" >&5
 $as_echo "$PCRE_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5381,16 +5356,14 @@
      fi
 
      if $PCRE_CONFIG --version >/dev/null 2>&1; then :; else
-       { { $as_echo "$as_me:$LINENO: error: Did not find pcre-config script at $PCRE_CONFIG" >&5
-$as_echo "$as_me: error: Did not find pcre-config script at $PCRE_CONFIG" >&2;}
-   { (exit 1); exit 1; }; }
+       as_fn_error "Did not find pcre-config script at $PCRE_CONFIG" "$LINENO" 5
      fi
      ;;
 *) PCRE_CONFIG=false ;;
 esac
 
 if test "$PCRE_CONFIG" != "false"; then
-  { $as_echo "$as_me:$LINENO: Using external PCRE library from $PCRE_CONFIG" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using external PCRE library from $PCRE_CONFIG" >&5
 $as_echo "$as_me: Using external PCRE library from $PCRE_CONFIG" >&6;}
 
   if test "x$CFLAGS" = "x"; then
@@ -5436,7 +5409,7 @@
 
 else
   # Build the bundled PCRE
-  { $as_echo "$as_me:$LINENO: Configuring PCRE regular expression library" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring PCRE regular expression library" >&5
 $as_echo "$as_me: Configuring PCRE regular expression library" >&6;}
 
 
@@ -5468,13 +5441,13 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -5482,8 +5455,8 @@
   (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"
@@ -5506,11 +5479,11 @@
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
@@ -5557,7 +5530,7 @@
   # 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:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
@@ -5565,7 +5538,7 @@
     esac
   fi
 else
-  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
 $as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -5881,9 +5854,9 @@
 
 # Extract the first word of "rm", so it can be a program name with args.
 set dummy rm; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_RM+set}" = set; then
+if test "${ac_cv_path_RM+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $RM in
@@ -5896,14 +5869,14 @@
 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_RM="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -5911,19 +5884,19 @@
 fi
 RM=$ac_cv_path_RM
 if test -n "$RM"; then
-  { $as_echo "$as_me:$LINENO: result: $RM" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM" >&5
 $as_echo "$RM" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKGCONFIG+set}" = set; then
+if test "${ac_cv_path_PKGCONFIG+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $PKGCONFIG in
@@ -5936,14 +5909,14 @@
 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_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -5951,19 +5924,19 @@
 fi
 PKGCONFIG=$ac_cv_path_PKGCONFIG
 if test -n "$PKGCONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKGCONFIG" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5
 $as_echo "$PKGCONFIG" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "rsync", so it can be a program name with args.
 set dummy rsync; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_RSYNC+set}" = set; then
+if test "${ac_cv_path_RSYNC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $RSYNC in
@@ -5976,14 +5949,14 @@
 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_RSYNC="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -5991,10 +5964,10 @@
 fi
 RSYNC=$ac_cv_path_RSYNC
 if test -n "$RSYNC"; then
-  { $as_echo "$as_me:$LINENO: result: $RSYNC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RSYNC" >&5
 $as_echo "$RSYNC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6003,9 +5976,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
+if test "${ac_cv_prog_AWK+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -6016,24 +5989,24 @@
 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:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
 $as_echo "$AWK" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6041,23 +6014,23 @@
   test -n "$AWK" && break
 done
 
-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 $as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
 $as_echo "no, using $LN_S" >&6; }
 fi
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
@@ -6068,24 +6041,24 @@
 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_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
 $as_echo "$RANLIB" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6095,9 +6068,9 @@
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
@@ -6108,24 +6081,24 @@
 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_RANLIB="ranlib"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
 $as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6134,7 +6107,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -6148,9 +6121,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LYNX_PATH+set}" = set; then
+if test "${ac_cv_prog_LYNX_PATH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$LYNX_PATH"; then
@@ -6161,24 +6134,24 @@
 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_LYNX_PATH="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 LYNX_PATH=$ac_cv_prog_LYNX_PATH
 if test -n "$LYNX_PATH"; then
-  { $as_echo "$as_me:$LINENO: result: $LYNX_PATH" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LYNX_PATH" >&5
 $as_echo "$LYNX_PATH" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6203,9 +6176,9 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
+if test "${ac_cv_path_GREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -6216,7 +6189,7 @@
 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
@@ -6236,7 +6209,7 @@
     $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_GREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_GREP="$ac_path_GREP"
@@ -6251,26 +6224,24 @@
       $ac_path_GREP_found && break 3
     done
   done
-done
+  done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
 $as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
+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
@@ -6284,7 +6255,7 @@
 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
@@ -6304,7 +6275,7 @@
     $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_EGREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_EGREP="$ac_path_EGREP"
@@ -6319,12 +6290,10 @@
       $ac_path_EGREP_found && break 3
     done
   done
-done
+  done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -6332,21 +6301,17 @@
 
    fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
 $as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
+if test "${ac_cv_header_stdc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -6361,48 +6326,23 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stdc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
+  ac_cv_header_stdc=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -6412,18 +6352,14 @@
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
+  $EGREP "free" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -6433,14 +6369,10 @@
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
 #include <stdlib.h>
@@ -6467,118 +6399,34 @@
   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
-  :
-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
+if ac_fn_c_try_run "$LINENO"; then :
 
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+  ac_cv_header_stdc=no
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
 $as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
 # 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`
-{ $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
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -6589,134 +6437,8 @@
 
 
 
-  if test "${ac_cv_header_minix_config_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
-$as_echo_n "checking for minix/config.h... " >&6; }
-if test "${ac_cv_header_minix_config_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
-$as_echo "$ac_cv_header_minix_config_h" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5
-$as_echo_n "checking minix/config.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 <minix/config.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 minix/config.h presence" >&5
-$as_echo_n "checking minix/config.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 <minix/config.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: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: minix/config.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
-$as_echo_n "checking for minix/config.h... " >&6; }
-if test "${ac_cv_header_minix_config_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_minix_config_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
-$as_echo "$ac_cv_header_minix_config_h" >&6; }
-
-fi
-if test "x$ac_cv_header_minix_config_h" = x""yes; then
+  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
+if test "x$ac_cv_header_minix_config_h" = x""yes; then :
   MINIX=yes
 else
   MINIX=
@@ -6725,34 +6447,23 @@
 
   if test "$MINIX" = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define _POSIX_SOURCE 1
-_ACEOF
+$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define _POSIX_1_SOURCE 2
-_ACEOF
+$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define _MINIX 1
-_ACEOF
+$as_echo "#define _MINIX 1" >>confdefs.h
 
   fi
 
 
-
-  { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
 $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if test "${ac_cv_safe_to_define___extensions__+set}" = set; then
+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #	  define __EXTENSIONS__ 1
@@ -6765,71 +6476,36 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_safe_to_define___extensions__=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_safe_to_define___extensions__=no
+  ac_cv_safe_to_define___extensions__=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
 $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
   test $ac_cv_safe_to_define___extensions__ = yes &&
-    cat >>confdefs.h <<\_ACEOF
-#define __EXTENSIONS__ 1
-_ACEOF
+    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
 
-  cat >>confdefs.h <<\_ACEOF
-#define _ALL_SOURCE 1
-_ACEOF
+  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
 
-  cat >>confdefs.h <<\_ACEOF
-#define _GNU_SOURCE 1
-_ACEOF
+  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
 
-  cat >>confdefs.h <<\_ACEOF
-#define _POSIX_PTHREAD_SEMANTICS 1
-_ACEOF
+  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
 
-  cat >>confdefs.h <<\_ACEOF
-#define _TANDEM_SOURCE 1
-_ACEOF
+  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
 
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
 $as_echo_n "checking for library containing strerror... " >&6; }
-if test "${ac_cv_search_strerror+set}" = set; then
+if test "${ac_cv_search_strerror+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -6854,54 +6530,27 @@
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  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
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_strerror=$ac_res
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_strerror+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_strerror+set}" = set; then :
   break
 fi
 done
-if test "${ac_cv_search_strerror+set}" = set; then
-  :
+if test "${ac_cv_search_strerror+set}" = set; then :
+
 else
   ac_cv_search_strerror=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
 $as_echo "$ac_cv_search_strerror" >&6; }
 ac_res=$ac_cv_search_strerror
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
@@ -6920,17 +6569,13 @@
 ap_ckver_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS `$apr_config --includes`"
 
-{ $as_echo "$as_me:$LINENO: checking for APR version 1.2.0 or later" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APR version 1.2.0 or later" >&5
 $as_echo_n "checking for APR version 1.2.0 or later... " >&6; }
-if test "${ap_cv_aprver12+set}" = set; then
+if test "${ap_cv_aprver12+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <apr_version.h>
@@ -6940,7 +6585,7 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "good" >/dev/null 2>&1; then
+  $EGREP "good" >/dev/null 2>&1; then :
   ap_cv_aprver12=yes
 else
   ap_cv_aprver12=no
@@ -6948,15 +6593,13 @@
 rm -f conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ap_cv_aprver12" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_cv_aprver12" >&5
 $as_echo "$ap_cv_aprver12" >&6; }
 
 if test "$ap_cv_aprver12" = "yes"; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: APR version 1.2.0 or later is required" >&5
-$as_echo "$as_me: error: APR version 1.2.0 or later is required" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "APR version 1.2.0 or later is required" "$LINENO" 5
 fi
 
 CPPFLAGS="$ap_ckver_CPPFLAGS"
@@ -6979,17 +6622,13 @@
 ap_ckver_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS `$apu_config --includes`"
 
-{ $as_echo "$as_me:$LINENO: checking for APR-util version 1.2.0 or later" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APR-util version 1.2.0 or later" >&5
 $as_echo_n "checking for APR-util version 1.2.0 or later... " >&6; }
-if test "${ap_cv_apuver12+set}" = set; then
+if test "${ap_cv_apuver12+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <apu_version.h>
@@ -6999,7 +6638,7 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "good" >/dev/null 2>&1; then
+  $EGREP "good" >/dev/null 2>&1; then :
   ap_cv_apuver12=yes
 else
   ap_cv_apuver12=no
@@ -7007,15 +6646,13 @@
 rm -f conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ap_cv_apuver12" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_cv_apuver12" >&5
 $as_echo "$ap_cv_apuver12" >&6; }
 
 if test "$ap_cv_apuver12" = "yes"; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: APR-util version 1.2.0 or later is required" >&5
-$as_echo "$as_me: error: APR-util version 1.2.0 or later is required" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "APR-util version 1.2.0 or later is required" "$LINENO" 5
 fi
 
 CPPFLAGS="$ap_ckver_CPPFLAGS"
@@ -7038,15 +6675,15 @@
 EOF
   MKDEP="true"
   for i in "$CC -MM" "$CC -M" "$CPP -MM" "$CPP -M" "cpp -M"; do
-    { $as_echo "$as_me:$LINENO: checking if $i can create proper make dependencies" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $i can create proper make dependencies" >&5
 $as_echo_n "checking if $i can create proper make dependencies... " >&6; }
     if $i conftest.c 2>/dev/null | grep 'conftest.o: conftest.c' >/dev/null; then
       MKDEP=$i
-      { $as_echo "$as_me:$LINENO: result: yes" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
       break;
     fi
-    { $as_echo "$as_me:$LINENO: result: no" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
   done
   rm -f conftest.c
@@ -7059,16 +6696,12 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
+if test "${ac_cv_header_stdc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -7083,48 +6716,23 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stdc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
+  ac_cv_header_stdc=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -7134,18 +6742,14 @@
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
+  $EGREP "free" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -7155,14 +6759,10 @@
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
 #include <stdlib.h>
@@ -7189,64 +6789,25 @@
   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
-  :
-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
+if ac_fn_c_try_run "$LINENO"; then :
 
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+  ac_cv_header_stdc=no
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
 $as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
-
-
-
-
-
-
-
-
-
-
 for ac_header in \
 string.h \
 limits.h \
@@ -7259,142 +6820,11 @@
 sys/processor.h \
 sys/sem.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
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -7403,16 +6833,12 @@
 
 done
 
-{ $as_echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
 $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
-if test "${ac_cv_header_sys_wait_h+set}" = set; then
+if test "${ac_cv_header_sys_wait_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
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -7433,56 +6859,29 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_sys_wait_h=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_sys_wait_h=no
+  ac_cv_header_sys_wait_h=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5
 $as_echo "$ac_cv_header_sys_wait_h" >&6; }
 if test $ac_cv_header_sys_wait_h = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYS_WAIT_H 1
-_ACEOF
+$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
 
 fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
 $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if test "${ac_cv_c_const+set}" = set; then
+if test "${ac_cv_c_const+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -7542,56 +6941,29 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_const=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_c_const=no
+  ac_cv_c_const=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
 $as_echo "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
-cat >>confdefs.h <<\_ACEOF
-#define const /**/
-_ACEOF
+$as_echo "#define const /**/" >>confdefs.h
 
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking for library containing sqrt" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sqrt" >&5
 $as_echo_n "checking for library containing sqrt... " >&6; }
-if test "${ac_cv_search_sqrt+set}" = set; then
+if test "${ac_cv_search_sqrt+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -7616,67 +6988,33 @@
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  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
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_sqrt=$ac_res
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_sqrt+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_sqrt+set}" = set; then :
   break
 fi
 done
-if test "${ac_cv_search_sqrt+set}" = set; then
-  :
+if test "${ac_cv_search_sqrt+set}" = set; then :
+
 else
   ac_cv_search_sqrt=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_sqrt" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sqrt" >&5
 $as_echo "$ac_cv_search_sqrt" >&6; }
 ac_res=$ac_cv_search_sqrt
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 
 
-
-
-
-
-
-
-
 for ac_func in \
 getpwnam \
 getgrnam \
@@ -7686,98 +7024,11 @@
 timegm \
 getpgid
 
-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
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -7788,19 +7039,15 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for void pointer length" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for void pointer length" >&5
 $as_echo_n "checking for void pointer length... " >&6; }
-if test "${ap_cv_void_ptr_lt_long+set}" = set; then
+if test "${ap_cv_void_ptr_lt_long+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   ap_cv_void_ptr_lt_long=yes
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int main(void)
@@ -7808,63 +7055,30 @@
     return sizeof(void *) < sizeof(long);
 }
 _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
+if ac_fn_c_try_run "$LINENO"; then :
   ap_cv_void_ptr_lt_long=no
 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
-
-( exit $ac_status )
-ap_cv_void_ptr_lt_long=yes
+  ap_cv_void_ptr_lt_long=yes
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
 fi
-{ $as_echo "$as_me:$LINENO: result: $ap_cv_void_ptr_lt_long" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_cv_void_ptr_lt_long" >&5
 $as_echo "$ap_cv_void_ptr_lt_long" >&6; }
 
 if test "$ap_cv_void_ptr_lt_long" = "yes"; then
-    { { $as_echo "$as_me:$LINENO: error: Size of \"void *\" is less than size of \"long\"" >&5
-$as_echo "$as_me: error: Size of \"void *\" is less than size of \"long\"" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Size of \"void *\" is less than size of \"long\"" "$LINENO" 5
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tm_gmtoff in struct tm" >&5
 $as_echo_n "checking for tm_gmtoff in struct tm... " >&6; }
-if test "${ac_cv_struct_tm_gmtoff+set}" = set; then
+if test "${ac_cv_struct_tm_gmtoff+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <time.h>
@@ -7876,41 +7090,18 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_struct_tm_gmtoff=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_struct_tm_gmtoff=no
+  ac_cv_struct_tm_gmtoff=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_struct_tm_gmtoff" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm_gmtoff" >&5
 $as_echo "$ac_cv_struct_tm_gmtoff" >&6; }
 if test "$ac_cv_struct_tm_gmtoff" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GMTOFF 1
-_ACEOF
+$as_echo "#define HAVE_GMTOFF 1" >>confdefs.h
 
 fi
 
@@ -7938,10 +7129,8 @@
 
 
 # Check whether --with-port was given.
-if test "${with_port+set}" = set; then
-  withval=$with_port; if test "$withval" = "yes"; then { { $as_echo "$as_me:$LINENO: error: 'option --with-port requires a value (the TCP port number)'" >&5
-$as_echo "$as_me: error: 'option --with-port requires a value (the TCP port number)'" >&2;}
-   { (exit 1); exit 1; }; }; else PORT="$withval"; fi
+if test "${with_port+set}" = set; then :
+  withval=$with_port; if test "$withval" = "yes"; then as_fn_error "'option --with-port requires a value (the TCP port number)'" "$LINENO" 5; else PORT="$withval"; fi
 else
   PORT=80
 fi
@@ -7949,10 +7138,8 @@
 
 
 # Check whether --with-sslport was given.
-if test "${with_sslport+set}" = set; then
-  withval=$with_sslport; if test "$withval" = "yes"; then { { $as_echo "$as_me:$LINENO: error: 'option --with-sslport requires a value (the SSL TCP port number)'" >&5
-$as_echo "$as_me: error: 'option --with-sslport requires a value (the SSL TCP port number)'" >&2;}
-   { (exit 1); exit 1; }; }; else SSLPORT="$withval"; fi
+if test "${with_sslport+set}" = set; then :
+  withval=$with_sslport; if test "$withval" = "yes"; then as_fn_error "'option --with-sslport requires a value (the SSL TCP port number)'" "$LINENO" 5; else SSLPORT="$withval"; fi
 else
   SSLPORT=443
 fi
@@ -7961,11 +7148,7 @@
 
 apr_old_cppflags=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $INCLUDES"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <apr.h>
@@ -7975,7 +7158,7 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then
+  $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then :
   ac_cv_define_APR_HAVE_IPV6=yes
 else
   ac_cv_define_APR_HAVE_IPV6=no
@@ -7986,7 +7169,7 @@
 
 
 # Check whether --enable-v4-mapped was given.
-if test "${enable_v4_mapped+set}" = set; then
+if test "${enable_v4_mapped+set}" = set; then :
   enableval=$enable_v4_mapped;
   v4mapped=$enableval
 
@@ -8006,25 +7189,21 @@
 
 if test $v4mapped = "yes" -a $ac_cv_define_APR_HAVE_IPV6 = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define AP_ENABLE_V4_MAPPED 1
-_ACEOF
+$as_echo "#define AP_ENABLE_V4_MAPPED 1" >>confdefs.h
 
 fi
 
 # Check whether --enable-exception-hook was given.
-if test "${enable_exception_hook+set}" = set; then
+if test "${enable_exception_hook+set}" = set; then :
   enableval=$enable_exception_hook;
 
-cat >>confdefs.h <<\_ACEOF
-#define AP_ENABLE_EXCEPTION_HOOK 1
-_ACEOF
+$as_echo "#define AP_ENABLE_EXCEPTION_HOOK 1" >>confdefs.h
 
 
 fi
 
 # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
+if test "${enable_maintainer_mode+set}" = set; then :
   enableval=$enable_maintainer_mode;
 
   if test "x$CPPFLAGS" = "x"; then
@@ -8051,14 +7230,14 @@
 fi
 
 # Check whether --enable-pie was given.
-if test "${enable_pie+set}" = set; then
+if test "${enable_pie+set}" = set; then :
   enableval=$enable_pie;
 fi
 
 if test "$enable_pie" = "yes"; then
-   { $as_echo "$as_me:$LINENO: checking whether $CC accepts PIE flags" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts PIE flags" >&5
 $as_echo_n "checking whether $CC accepts PIE flags... " >&6; }
-if test "${ap_cv_cc_pie+set}" = set; then
+if test "${ap_cv_cc_pie+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -8066,66 +7245,33 @@
      save_LDFLAGS=$LDFLAGS
      CFLAGS="$CFLAGS -fPIE"
      LDFLAGS="$LDFLAGS -pie"
-     if test "$cross_compiling" = yes; then
+     if test "$cross_compiling" = yes; then :
   ap_cv_cc_pie=yes
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 static int foo[30000]; int main () { 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
+if ac_fn_c_try_run "$LINENO"; then :
   ap_cv_cc_pie=yes
 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
-
-( exit $ac_status )
-ap_cv_cc_pie=no
+  ap_cv_cc_pie=no
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
      CFLAGS=$save_CFLAGS
      LDFLAGS=$save_LDFLAGS
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ap_cv_cc_pie" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_cv_cc_pie" >&5
 $as_echo "$ap_cv_cc_pie" >&6; }
    if test "$ap_cv_cc_pie" = "yes"; then
      PICFLAGS="-fPIE"
      PILDFLAGS="-pie"
    else
-     { { $as_echo "$as_me:$LINENO: error: --enable-pie requested but $CC failed using PIE flags" >&5
-$as_echo "$as_me: error: --enable-pie requested but $CC failed using PIE flags" >&2;}
-   { (exit 1); exit 1; }; }
+     as_fn_error "--enable-pie requested but $CC failed using PIE flags" "$LINENO" 5
    fi
 fi
 
@@ -8137,7 +7283,7 @@
   module_default=yes
 
   # Check whether --enable-modules was given.
-if test "${enable_modules+set}" = set; then
+if test "${enable_modules+set}" = set; then :
   enableval=$enable_modules;
     for i in $enableval; do
       if test "$i" = "all" -o "$i" = "most"; then
@@ -8152,7 +7298,7 @@
 
 
   # Check whether --enable-mods-shared was given.
-if test "${enable_mods_shared+set}" = set; then
+if test "${enable_mods_shared+set}" = set; then :
   enableval=$enable_mods_shared;
     for i in $enableval; do
       if test "$i" = "all" -o "$i" = "most"; then
@@ -8181,10 +7327,10 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_authn_file" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_authn_file" >&5
 $as_echo_n "checking whether to enable mod_authn_file... " >&6; }
     # Check whether --enable-authn-file was given.
-if test "${enable_authn_file+set}" = set; then
+if test "${enable_authn_file+set}" = set; then :
   enableval=$enable_authn_file;
 else
   enable_authn_file=yes
@@ -8219,7 +7365,7 @@
   if test "$enable_authn_file" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_authn_file$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_authn_file$_apmod_extra_msg" >&5
 $as_echo "$enable_authn_file$_apmod_extra_msg" >&6; }
   if test "$enable_authn_file" != "no"; then
     case "$enable_authn_file" in
@@ -8274,10 +7420,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_authn_dbm" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_authn_dbm" >&5
 $as_echo_n "checking whether to enable mod_authn_dbm... " >&6; }
     # Check whether --enable-authn-dbm was given.
-if test "${enable_authn_dbm+set}" = set; then
+if test "${enable_authn_dbm+set}" = set; then :
   enableval=$enable_authn_dbm;
 else
   enable_authn_dbm=most
@@ -8312,7 +7458,7 @@
   if test "$enable_authn_dbm" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_authn_dbm$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_authn_dbm$_apmod_extra_msg" >&5
 $as_echo "$enable_authn_dbm$_apmod_extra_msg" >&6; }
   if test "$enable_authn_dbm" != "no"; then
     case "$enable_authn_dbm" in
@@ -8367,10 +7513,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_authn_anon" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_authn_anon" >&5
 $as_echo_n "checking whether to enable mod_authn_anon... " >&6; }
     # Check whether --enable-authn-anon was given.
-if test "${enable_authn_anon+set}" = set; then
+if test "${enable_authn_anon+set}" = set; then :
   enableval=$enable_authn_anon;
 else
   enable_authn_anon=most
@@ -8405,7 +7551,7 @@
   if test "$enable_authn_anon" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_authn_anon$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_authn_anon$_apmod_extra_msg" >&5
 $as_echo "$enable_authn_anon$_apmod_extra_msg" >&6; }
   if test "$enable_authn_anon" != "no"; then
     case "$enable_authn_anon" in
@@ -8460,10 +7606,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_authn_dbd" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_authn_dbd" >&5
 $as_echo_n "checking whether to enable mod_authn_dbd... " >&6; }
     # Check whether --enable-authn-dbd was given.
-if test "${enable_authn_dbd+set}" = set; then
+if test "${enable_authn_dbd+set}" = set; then :
   enableval=$enable_authn_dbd;
 else
   enable_authn_dbd=most
@@ -8498,7 +7644,7 @@
   if test "$enable_authn_dbd" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_authn_dbd$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_authn_dbd$_apmod_extra_msg" >&5
 $as_echo "$enable_authn_dbd$_apmod_extra_msg" >&6; }
   if test "$enable_authn_dbd" != "no"; then
     case "$enable_authn_dbd" in
@@ -8554,10 +7700,10 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_authn_default" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_authn_default" >&5
 $as_echo_n "checking whether to enable mod_authn_default... " >&6; }
     # Check whether --enable-authn-default was given.
-if test "${enable_authn_default+set}" = set; then
+if test "${enable_authn_default+set}" = set; then :
   enableval=$enable_authn_default;
 else
   enable_authn_default=yes
@@ -8592,7 +7738,7 @@
   if test "$enable_authn_default" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_authn_default$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_authn_default$_apmod_extra_msg" >&5
 $as_echo "$enable_authn_default$_apmod_extra_msg" >&6; }
   if test "$enable_authn_default" != "no"; then
     case "$enable_authn_default" in
@@ -8648,10 +7794,10 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_authn_alias" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_authn_alias" >&5
 $as_echo_n "checking whether to enable mod_authn_alias... " >&6; }
     # Check whether --enable-authn-alias was given.
-if test "${enable_authn_alias+set}" = set; then
+if test "${enable_authn_alias+set}" = set; then :
   enableval=$enable_authn_alias;
 else
   enable_authn_alias=no
@@ -8686,7 +7832,7 @@
   if test "$enable_authn_alias" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_authn_alias$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_authn_alias$_apmod_extra_msg" >&5
 $as_echo "$enable_authn_alias$_apmod_extra_msg" >&6; }
   if test "$enable_authn_alias" != "no"; then
     case "$enable_authn_alias" in
@@ -8742,10 +7888,10 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_authz_host" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_authz_host" >&5
 $as_echo_n "checking whether to enable mod_authz_host... " >&6; }
     # Check whether --enable-authz-host was given.
-if test "${enable_authz_host+set}" = set; then
+if test "${enable_authz_host+set}" = set; then :
   enableval=$enable_authz_host;
 else
   enable_authz_host=yes
@@ -8780,7 +7926,7 @@
   if test "$enable_authz_host" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_authz_host$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_authz_host$_apmod_extra_msg" >&5
 $as_echo "$enable_authz_host$_apmod_extra_msg" >&6; }
   if test "$enable_authz_host" != "no"; then
     case "$enable_authz_host" in
@@ -8835,10 +7981,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_authz_groupfile" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_authz_groupfile" >&5
 $as_echo_n "checking whether to enable mod_authz_groupfile... " >&6; }
     # Check whether --enable-authz-groupfile was given.
-if test "${enable_authz_groupfile+set}" = set; then
+if test "${enable_authz_groupfile+set}" = set; then :
   enableval=$enable_authz_groupfile;
 else
   enable_authz_groupfile=yes
@@ -8873,7 +8019,7 @@
   if test "$enable_authz_groupfile" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_authz_groupfile$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_authz_groupfile$_apmod_extra_msg" >&5
 $as_echo "$enable_authz_groupfile$_apmod_extra_msg" >&6; }
   if test "$enable_authz_groupfile" != "no"; then
     case "$enable_authz_groupfile" in
@@ -8928,10 +8074,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_authz_user" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_authz_user" >&5
 $as_echo_n "checking whether to enable mod_authz_user... " >&6; }
     # Check whether --enable-authz-user was given.
-if test "${enable_authz_user+set}" = set; then
+if test "${enable_authz_user+set}" = set; then :
   enableval=$enable_authz_user;
 else
   enable_authz_user=yes
@@ -8966,7 +8112,7 @@
   if test "$enable_authz_user" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_authz_user$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_authz_user$_apmod_extra_msg" >&5
 $as_echo "$enable_authz_user$_apmod_extra_msg" >&6; }
   if test "$enable_authz_user" != "no"; then
     case "$enable_authz_user" in
@@ -9021,10 +8167,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_authz_dbm" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_authz_dbm" >&5
 $as_echo_n "checking whether to enable mod_authz_dbm... " >&6; }
     # Check whether --enable-authz-dbm was given.
-if test "${enable_authz_dbm+set}" = set; then
+if test "${enable_authz_dbm+set}" = set; then :
   enableval=$enable_authz_dbm;
 else
   enable_authz_dbm=most
@@ -9059,7 +8205,7 @@
   if test "$enable_authz_dbm" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_authz_dbm$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_authz_dbm$_apmod_extra_msg" >&5
 $as_echo "$enable_authz_dbm$_apmod_extra_msg" >&6; }
   if test "$enable_authz_dbm" != "no"; then
     case "$enable_authz_dbm" in
@@ -9114,10 +8260,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_authz_owner" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_authz_owner" >&5
 $as_echo_n "checking whether to enable mod_authz_owner... " >&6; }
     # Check whether --enable-authz-owner was given.
-if test "${enable_authz_owner+set}" = set; then
+if test "${enable_authz_owner+set}" = set; then :
   enableval=$enable_authz_owner;
 else
   enable_authz_owner=most
@@ -9152,7 +8298,7 @@
   if test "$enable_authz_owner" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_authz_owner$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_authz_owner$_apmod_extra_msg" >&5
 $as_echo "$enable_authz_owner$_apmod_extra_msg" >&6; }
   if test "$enable_authz_owner" != "no"; then
     case "$enable_authz_owner" in
@@ -9208,10 +8354,10 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_authnz_ldap" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_authnz_ldap" >&5
 $as_echo_n "checking whether to enable mod_authnz_ldap... " >&6; }
     # Check whether --enable-authnz-ldap was given.
-if test "${enable_authnz_ldap+set}" = set; then
+if test "${enable_authnz_ldap+set}" = set; then :
   enableval=$enable_authnz_ldap;
 else
   enable_authnz_ldap=no
@@ -9244,25 +8390,23 @@
     fi
   fi
   if test "$enable_authnz_ldap" != "no"; then
-            { $as_echo "$as_me:$LINENO: result: checking dependencies" >&5
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
 $as_echo "checking dependencies" >&6; }
 
   MOD_AUTHNZ_LDAP_LDADD="`$apu_config --ldap-libs`" || MOD_AUTHNZ_LDAP_LDADD=""
 
 
-                    { $as_echo "$as_me:$LINENO: checking whether to enable mod_authnz_ldap" >&5
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_authnz_ldap" >&5
 $as_echo_n "checking whether to enable mod_authnz_ldap... " >&6; }
                     if test "$enable_authnz_ldap" = "no"; then
                       if test "$_apmod_error_fatal" = "no"; then
                         _apmod_extra_msg=" (disabled)"
                       else
-                        { { $as_echo "$as_me:$LINENO: error: mod_authnz_ldap has been requested but can not be built due to prerequisite failures" >&5
-$as_echo "$as_me: error: mod_authnz_ldap has been requested but can not be built due to prerequisite failures" >&2;}
-   { (exit 1); exit 1; }; }
+                        as_fn_error "mod_authnz_ldap has been requested but can not be built due to prerequisite failures" "$LINENO" 5
                       fi
                     fi
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_authnz_ldap$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_authnz_ldap$_apmod_extra_msg" >&5
 $as_echo "$enable_authnz_ldap$_apmod_extra_msg" >&6; }
   if test "$enable_authnz_ldap" != "no"; then
     case "$enable_authnz_ldap" in
@@ -9318,10 +8462,10 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_authz_default" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_authz_default" >&5
 $as_echo_n "checking whether to enable mod_authz_default... " >&6; }
     # Check whether --enable-authz-default was given.
-if test "${enable_authz_default+set}" = set; then
+if test "${enable_authz_default+set}" = set; then :
   enableval=$enable_authz_default;
 else
   enable_authz_default=yes
@@ -9356,7 +8500,7 @@
   if test "$enable_authz_default" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_authz_default$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_authz_default$_apmod_extra_msg" >&5
 $as_echo "$enable_authz_default$_apmod_extra_msg" >&6; }
   if test "$enable_authz_default" != "no"; then
     case "$enable_authz_default" in
@@ -9413,10 +8557,10 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_auth_basic" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_auth_basic" >&5
 $as_echo_n "checking whether to enable mod_auth_basic... " >&6; }
     # Check whether --enable-auth-basic was given.
-if test "${enable_auth_basic+set}" = set; then
+if test "${enable_auth_basic+set}" = set; then :
   enableval=$enable_auth_basic;
 else
   enable_auth_basic=yes
@@ -9451,7 +8595,7 @@
   if test "$enable_auth_basic" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_auth_basic$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_auth_basic$_apmod_extra_msg" >&5
 $as_echo "$enable_auth_basic$_apmod_extra_msg" >&6; }
   if test "$enable_auth_basic" != "no"; then
     case "$enable_auth_basic" in
@@ -9506,10 +8650,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_auth_digest" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_auth_digest" >&5
 $as_echo_n "checking whether to enable mod_auth_digest... " >&6; }
     # Check whether --enable-auth-digest was given.
-if test "${enable_auth_digest+set}" = set; then
+if test "${enable_auth_digest+set}" = set; then :
   enableval=$enable_auth_digest;
 else
   enable_auth_digest=most
@@ -9542,17 +8686,13 @@
     fi
   fi
   if test "$enable_auth_digest" != "no"; then
-            { $as_echo "$as_me:$LINENO: result: checking dependencies" >&5
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
 $as_echo "checking dependencies" >&6; }
 
 
 apr_old_cppflags=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $INCLUDES"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <apr.h>
@@ -9562,7 +8702,7 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then
+  $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then :
   ac_cv_define_APR_HAS_RANDOM=yes
 else
   ac_cv_define_APR_HAS_RANDOM=no
@@ -9577,19 +8717,17 @@
     enable_auth_digest="no"
   fi
 
-                    { $as_echo "$as_me:$LINENO: checking whether to enable mod_auth_digest" >&5
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_auth_digest" >&5
 $as_echo_n "checking whether to enable mod_auth_digest... " >&6; }
                     if test "$enable_auth_digest" = "no"; then
                       if test "$_apmod_error_fatal" = "no"; then
                         _apmod_extra_msg=" (disabled)"
                       else
-                        { { $as_echo "$as_me:$LINENO: error: mod_auth_digest has been requested but can not be built due to prerequisite failures" >&5
-$as_echo "$as_me: error: mod_auth_digest has been requested but can not be built due to prerequisite failures" >&2;}
-   { (exit 1); exit 1; }; }
+                        as_fn_error "mod_auth_digest has been requested but can not be built due to prerequisite failures" "$LINENO" 5
                       fi
                     fi
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_auth_digest$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_auth_digest$_apmod_extra_msg" >&5
 $as_echo "$enable_auth_digest$_apmod_extra_msg" >&6; }
   if test "$enable_auth_digest" != "no"; then
     case "$enable_auth_digest" in
@@ -9670,10 +8808,10 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_isapi" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_isapi" >&5
 $as_echo_n "checking whether to enable mod_isapi... " >&6; }
     # Check whether --enable-isapi was given.
-if test "${enable_isapi+set}" = set; then
+if test "${enable_isapi+set}" = set; then :
   enableval=$enable_isapi;
 else
   enable_isapi=no
@@ -9708,7 +8846,7 @@
   if test "$enable_isapi" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_isapi$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_isapi$_apmod_extra_msg" >&5
 $as_echo "$enable_isapi$_apmod_extra_msg" >&6; }
   if test "$enable_isapi" != "no"; then
     case "$enable_isapi" in
@@ -9789,10 +8927,10 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_file_cache" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_file_cache" >&5
 $as_echo_n "checking whether to enable mod_file_cache... " >&6; }
     # Check whether --enable-file-cache was given.
-if test "${enable_file_cache+set}" = set; then
+if test "${enable_file_cache+set}" = set; then :
   enableval=$enable_file_cache;
 else
   enable_file_cache=no
@@ -9827,7 +8965,7 @@
   if test "$enable_file_cache" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_file_cache$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_file_cache$_apmod_extra_msg" >&5
 $as_echo "$enable_file_cache$_apmod_extra_msg" >&6; }
   if test "$enable_file_cache" != "no"; then
     case "$enable_file_cache" in
@@ -9885,10 +9023,10 @@
 cache_objs="mod_cache.lo cache_storage.lo cache_util.lo "
 mem_cache_objs="mod_mem_cache.lo cache_cache.lo cache_pqueue.lo cache_hash.lo "
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_cache" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_cache" >&5
 $as_echo_n "checking whether to enable mod_cache... " >&6; }
     # Check whether --enable-cache was given.
-if test "${enable_cache+set}" = set; then
+if test "${enable_cache+set}" = set; then :
   enableval=$enable_cache;
 else
   enable_cache=no
@@ -9923,7 +9061,7 @@
   if test "$enable_cache" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_cache$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_cache$_apmod_extra_msg" >&5
 $as_echo "$enable_cache$_apmod_extra_msg" >&6; }
   if test "$enable_cache" != "no"; then
     case "$enable_cache" in
@@ -9978,10 +9116,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_disk_cache" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_disk_cache" >&5
 $as_echo_n "checking whether to enable mod_disk_cache... " >&6; }
     # Check whether --enable-disk-cache was given.
-if test "${enable_disk_cache+set}" = set; then
+if test "${enable_disk_cache+set}" = set; then :
   enableval=$enable_disk_cache;
 else
   enable_disk_cache=no
@@ -10016,7 +9154,7 @@
   if test "$enable_disk_cache" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_disk_cache$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_disk_cache$_apmod_extra_msg" >&5
 $as_echo "$enable_disk_cache$_apmod_extra_msg" >&6; }
   if test "$enable_disk_cache" != "no"; then
     case "$enable_disk_cache" in
@@ -10071,10 +9209,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_mem_cache" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_mem_cache" >&5
 $as_echo_n "checking whether to enable mod_mem_cache... " >&6; }
     # Check whether --enable-mem-cache was given.
-if test "${enable_mem_cache+set}" = set; then
+if test "${enable_mem_cache+set}" = set; then :
   enableval=$enable_mem_cache;
 else
   enable_mem_cache=no
@@ -10109,7 +9247,7 @@
   if test "$enable_mem_cache" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_mem_cache$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_mem_cache$_apmod_extra_msg" >&5
 $as_echo "$enable_mem_cache$_apmod_extra_msg" >&6; }
   if test "$enable_mem_cache" != "no"; then
     case "$enable_mem_cache" in
@@ -10189,10 +9327,10 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_dbd" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_dbd" >&5
 $as_echo_n "checking whether to enable mod_dbd... " >&6; }
     # Check whether --enable-dbd was given.
-if test "${enable_dbd+set}" = set; then
+if test "${enable_dbd+set}" = set; then :
   enableval=$enable_dbd;
 else
   enable_dbd=most
@@ -10227,7 +9365,7 @@
   if test "$enable_dbd" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_dbd$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_dbd$_apmod_extra_msg" >&5
 $as_echo "$enable_dbd$_apmod_extra_msg" >&6; }
   if test "$enable_dbd" != "no"; then
     case "$enable_dbd" in
@@ -10307,10 +9445,10 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_bucketeer" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_bucketeer" >&5
 $as_echo_n "checking whether to enable mod_bucketeer... " >&6; }
     # Check whether --enable-bucketeer was given.
-if test "${enable_bucketeer+set}" = set; then
+if test "${enable_bucketeer+set}" = set; then :
   enableval=$enable_bucketeer;
 else
   enable_bucketeer=no
@@ -10345,7 +9483,7 @@
   if test "$enable_bucketeer" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_bucketeer$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_bucketeer$_apmod_extra_msg" >&5
 $as_echo "$enable_bucketeer$_apmod_extra_msg" >&6; }
   if test "$enable_bucketeer" != "no"; then
     case "$enable_bucketeer" in
@@ -10400,10 +9538,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_dumpio" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_dumpio" >&5
 $as_echo_n "checking whether to enable mod_dumpio... " >&6; }
     # Check whether --enable-dumpio was given.
-if test "${enable_dumpio+set}" = set; then
+if test "${enable_dumpio+set}" = set; then :
   enableval=$enable_dumpio;
 else
   enable_dumpio=most
@@ -10438,7 +9576,7 @@
   if test "$enable_dumpio" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_dumpio$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_dumpio$_apmod_extra_msg" >&5
 $as_echo "$enable_dumpio$_apmod_extra_msg" >&6; }
   if test "$enable_dumpio" != "no"; then
     case "$enable_dumpio" in
@@ -10519,10 +9657,10 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_echo" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_echo" >&5
 $as_echo_n "checking whether to enable mod_echo... " >&6; }
     # Check whether --enable-echo was given.
-if test "${enable_echo+set}" = set; then
+if test "${enable_echo+set}" = set; then :
   enableval=$enable_echo;
 else
   enable_echo=no
@@ -10557,7 +9695,7 @@
   if test "$enable_echo" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_echo$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_echo$_apmod_extra_msg" >&5
 $as_echo "$enable_echo$_apmod_extra_msg" >&6; }
   if test "$enable_echo" != "no"; then
     case "$enable_echo" in
@@ -10637,10 +9775,10 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_example" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_example" >&5
 $as_echo_n "checking whether to enable mod_example... " >&6; }
     # Check whether --enable-example was given.
-if test "${enable_example+set}" = set; then
+if test "${enable_example+set}" = set; then :
   enableval=$enable_example;
 else
   enable_example=no
@@ -10675,7 +9813,7 @@
   if test "$enable_example" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_example$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_example$_apmod_extra_msg" >&5
 $as_echo "$enable_example$_apmod_extra_msg" >&6; }
   if test "$enable_example" != "no"; then
     case "$enable_example" in
@@ -10730,10 +9868,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_case_filter" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_case_filter" >&5
 $as_echo_n "checking whether to enable mod_case_filter... " >&6; }
     # Check whether --enable-case-filter was given.
-if test "${enable_case_filter+set}" = set; then
+if test "${enable_case_filter+set}" = set; then :
   enableval=$enable_case_filter;
 else
   enable_case_filter=no
@@ -10768,7 +9906,7 @@
   if test "$enable_case_filter" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_case_filter$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_case_filter$_apmod_extra_msg" >&5
 $as_echo "$enable_case_filter$_apmod_extra_msg" >&6; }
   if test "$enable_case_filter" != "no"; then
     case "$enable_case_filter" in
@@ -10823,10 +9961,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_case_filter_in" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_case_filter_in" >&5
 $as_echo_n "checking whether to enable mod_case_filter_in... " >&6; }
     # Check whether --enable-case-filter-in was given.
-if test "${enable_case_filter_in+set}" = set; then
+if test "${enable_case_filter_in+set}" = set; then :
   enableval=$enable_case_filter_in;
 else
   enable_case_filter_in=no
@@ -10861,7 +9999,7 @@
   if test "$enable_case_filter_in" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_case_filter_in$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_case_filter_in$_apmod_extra_msg" >&5
 $as_echo "$enable_case_filter_in$_apmod_extra_msg" >&6; }
   if test "$enable_case_filter_in" != "no"; then
     case "$enable_case_filter_in" in
@@ -10942,10 +10080,10 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_ext_filter" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_ext_filter" >&5
 $as_echo_n "checking whether to enable mod_ext_filter... " >&6; }
     # Check whether --enable-ext-filter was given.
-if test "${enable_ext_filter+set}" = set; then
+if test "${enable_ext_filter+set}" = set; then :
   enableval=$enable_ext_filter;
 else
   enable_ext_filter=most
@@ -10980,7 +10118,7 @@
   if test "$enable_ext_filter" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_ext_filter$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_ext_filter$_apmod_extra_msg" >&5
 $as_echo "$enable_ext_filter$_apmod_extra_msg" >&6; }
   if test "$enable_ext_filter" != "no"; then
     case "$enable_ext_filter" in
@@ -11035,10 +10173,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_include" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_include" >&5
 $as_echo_n "checking whether to enable mod_include... " >&6; }
     # Check whether --enable-include was given.
-if test "${enable_include+set}" = set; then
+if test "${enable_include+set}" = set; then :
   enableval=$enable_include;
 else
   enable_include=yes
@@ -11073,7 +10211,7 @@
   if test "$enable_include" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_include$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_include$_apmod_extra_msg" >&5
 $as_echo "$enable_include$_apmod_extra_msg" >&6; }
   if test "$enable_include" != "no"; then
     case "$enable_include" in
@@ -11128,10 +10266,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_filter" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_filter" >&5
 $as_echo_n "checking whether to enable mod_filter... " >&6; }
     # Check whether --enable-filter was given.
-if test "${enable_filter+set}" = set; then
+if test "${enable_filter+set}" = set; then :
   enableval=$enable_filter;
 else
   enable_filter=yes
@@ -11166,7 +10304,7 @@
   if test "$enable_filter" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_filter$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_filter$_apmod_extra_msg" >&5
 $as_echo "$enable_filter$_apmod_extra_msg" >&6; }
   if test "$enable_filter" != "no"; then
     case "$enable_filter" in
@@ -11221,10 +10359,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_substitute" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_substitute" >&5
 $as_echo_n "checking whether to enable mod_substitute... " >&6; }
     # Check whether --enable-substitute was given.
-if test "${enable_substitute+set}" = set; then
+if test "${enable_substitute+set}" = set; then :
   enableval=$enable_substitute;
 else
   enable_substitute=most
@@ -11259,7 +10397,7 @@
   if test "$enable_substitute" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_substitute$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_substitute$_apmod_extra_msg" >&5
 $as_echo "$enable_substitute$_apmod_extra_msg" >&6; }
   if test "$enable_substitute" != "no"; then
     case "$enable_substitute" in
@@ -11318,10 +10456,10 @@
 # mod_charset_lite can be very useful on an ebcdic system,
 #   so include it by default
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_charset_lite" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_charset_lite" >&5
 $as_echo_n "checking whether to enable mod_charset_lite... " >&6; }
     # Check whether --enable-charset-lite was given.
-if test "${enable_charset_lite+set}" = set; then
+if test "${enable_charset_lite+set}" = set; then :
   enableval=$enable_charset_lite;
 else
   enable_charset_lite=yes
@@ -11356,7 +10494,7 @@
   if test "$enable_charset_lite" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_charset_lite$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_charset_lite$_apmod_extra_msg" >&5
 $as_echo "$enable_charset_lite$_apmod_extra_msg" >&6; }
   if test "$enable_charset_lite" != "no"; then
     case "$enable_charset_lite" in
@@ -11412,10 +10550,10 @@
 
 else
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_charset_lite" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_charset_lite" >&5
 $as_echo_n "checking whether to enable mod_charset_lite... " >&6; }
     # Check whether --enable-charset-lite was given.
-if test "${enable_charset_lite+set}" = set; then
+if test "${enable_charset_lite+set}" = set; then :
   enableval=$enable_charset_lite;
 else
   enable_charset_lite=no
@@ -11450,7 +10588,7 @@
   if test "$enable_charset_lite" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_charset_lite$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_charset_lite$_apmod_extra_msg" >&5
 $as_echo "$enable_charset_lite$_apmod_extra_msg" >&6; }
   if test "$enable_charset_lite" != "no"; then
     case "$enable_charset_lite" in
@@ -11508,10 +10646,10 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_deflate" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_deflate" >&5
 $as_echo_n "checking whether to enable mod_deflate... " >&6; }
     # Check whether --enable-deflate was given.
-if test "${enable_deflate+set}" = set; then
+if test "${enable_deflate+set}" = set; then :
   enableval=$enable_deflate;
 else
   enable_deflate=most
@@ -11544,12 +10682,12 @@
     fi
   fi
   if test "$enable_deflate" != "no"; then
-            { $as_echo "$as_me:$LINENO: result: checking dependencies" >&5
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
 $as_echo "checking dependencies" >&6; }
 
 
 # Check whether --with-z was given.
-if test "${with_z+set}" = set; then
+if test "${with_z+set}" = set; then :
   withval=$with_z;
     if test "x$withval" != "xyes" && test "x$withval" != "x"; then
       ap_zlib_base="$withval"
@@ -11558,9 +10696,9 @@
 fi
 
   if test "x$ap_zlib_base" = "x"; then
-    { $as_echo "$as_me:$LINENO: checking for zlib location" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib location" >&5
 $as_echo_n "checking for zlib location... " >&6; }
-    if test "${ap_cv_zlib+set}" = set; then
+    if test "${ap_cv_zlib+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -11576,10 +10714,10 @@
     ap_zlib_base=$ap_cv_zlib
     if test "x$ap_zlib_base" = "x"; then
       enable_deflate=no
-      { $as_echo "$as_me:$LINENO: result: not found" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 $as_echo "not found" >&6; }
     else
-      { $as_echo "$as_me:$LINENO: result: $ap_zlib_base" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_zlib_base" >&5
 $as_echo "$ap_zlib_base" >&6; }
     fi
   fi
@@ -11676,13 +10814,9 @@
     done
   fi
 
-    { $as_echo "$as_me:$LINENO: checking for zlib library" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib library" >&5
 $as_echo_n "checking for zlib library... " >&6; }
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <zlib.h>
 int
@@ -11693,48 +10827,23 @@
   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
-  { $as_echo "$as_me:$LINENO: result: found" >&5
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
 $as_echo "found" >&6; }
 
   test "x$silent" != "xyes" && echo "  forcing MOD_DEFLATE_LDADD to \"-lz\""
   MOD_DEFLATE_LDADD="-lz"
 
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ $as_echo "$as_me:$LINENO: result: not found" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 $as_echo "not found" >&6; }
      enable_deflate=no
      INCLUDES=$ap_save_includes
      LDFLAGS=$ap_save_ldflags
 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 "x$LIBS" = "x-lz"; then
     test "x$silent" != "xyes" && echo "  nulling LIBS"
     LIBS=""
@@ -11757,19 +10866,17 @@
     CPPFLAGS=$ap_save_cppflags
   fi
 
-                    { $as_echo "$as_me:$LINENO: checking whether to enable mod_deflate" >&5
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_deflate" >&5
 $as_echo_n "checking whether to enable mod_deflate... " >&6; }
                     if test "$enable_deflate" = "no"; then
                       if test "$_apmod_error_fatal" = "no"; then
                         _apmod_extra_msg=" (disabled)"
                       else
-                        { { $as_echo "$as_me:$LINENO: error: mod_deflate has been requested but can not be built due to prerequisite failures" >&5
-$as_echo "$as_me: error: mod_deflate has been requested but can not be built due to prerequisite failures" >&2;}
-   { (exit 1); exit 1; }; }
+                        as_fn_error "mod_deflate has been requested but can not be built due to prerequisite failures" "$LINENO" 5
                       fi
                     fi
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_deflate$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_deflate$_apmod_extra_msg" >&5
 $as_echo "$enable_deflate$_apmod_extra_msg" >&6; }
   if test "$enable_deflate" != "no"; then
     case "$enable_deflate" in
@@ -11851,10 +10958,10 @@
 
 ldap_objects="util_ldap.lo util_ldap_cache.lo util_ldap_cache_mgr.lo"
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_ldap" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_ldap" >&5
 $as_echo_n "checking whether to enable mod_ldap... " >&6; }
     # Check whether --enable-ldap was given.
-if test "${enable_ldap+set}" = set; then
+if test "${enable_ldap+set}" = set; then :
   enableval=$enable_ldap;
 else
   enable_ldap=no
@@ -11887,25 +10994,23 @@
     fi
   fi
   if test "$enable_ldap" != "no"; then
-            { $as_echo "$as_me:$LINENO: result: checking dependencies" >&5
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
 $as_echo "checking dependencies" >&6; }
 
   MOD_LDAP_LDADD="`$apu_config --ldap-libs`" || MOD_LDAP_LDADD=""
 
 
-                    { $as_echo "$as_me:$LINENO: checking whether to enable mod_ldap" >&5
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_ldap" >&5
 $as_echo_n "checking whether to enable mod_ldap... " >&6; }
                     if test "$enable_ldap" = "no"; then
                       if test "$_apmod_error_fatal" = "no"; then
                         _apmod_extra_msg=" (disabled)"
                       else
-                        { { $as_echo "$as_me:$LINENO: error: mod_ldap has been requested but can not be built due to prerequisite failures" >&5
-$as_echo "$as_me: error: mod_ldap has been requested but can not be built due to prerequisite failures" >&2;}
-   { (exit 1); exit 1; }; }
+                        as_fn_error "mod_ldap has been requested but can not be built due to prerequisite failures" "$LINENO" 5
                       fi
                     fi
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_ldap$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_ldap$_apmod_extra_msg" >&5
 $as_echo "$enable_ldap$_apmod_extra_msg" >&6; }
   if test "$enable_ldap" != "no"; then
     case "$enable_ldap" in
@@ -11986,10 +11091,10 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_log_config" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_log_config" >&5
 $as_echo_n "checking whether to enable mod_log_config... " >&6; }
     # Check whether --enable-log-config was given.
-if test "${enable_log_config+set}" = set; then
+if test "${enable_log_config+set}" = set; then :
   enableval=$enable_log_config;
 else
   enable_log_config=yes
@@ -12024,7 +11129,7 @@
   if test "$enable_log_config" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_log_config$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_log_config$_apmod_extra_msg" >&5
 $as_echo "$enable_log_config$_apmod_extra_msg" >&6; }
   if test "$enable_log_config" != "no"; then
     case "$enable_log_config" in
@@ -12079,10 +11184,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_log_forensic" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_log_forensic" >&5
 $as_echo_n "checking whether to enable mod_log_forensic... " >&6; }
     # Check whether --enable-log-forensic was given.
-if test "${enable_log_forensic+set}" = set; then
+if test "${enable_log_forensic+set}" = set; then :
   enableval=$enable_log_forensic;
 else
   enable_log_forensic=maybe-all
@@ -12117,7 +11222,7 @@
   if test "$enable_log_forensic" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_log_forensic$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_log_forensic$_apmod_extra_msg" >&5
 $as_echo "$enable_log_forensic$_apmod_extra_msg" >&6; }
   if test "$enable_log_forensic" != "no"; then
     case "$enable_log_forensic" in
@@ -12198,10 +11303,10 @@
 fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_logio" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_logio" >&5
 $as_echo_n "checking whether to enable mod_logio... " >&6; }
     # Check whether --enable-logio was given.
-if test "${enable_logio+set}" = set; then
+if test "${enable_logio+set}" = set; then :
   enableval=$enable_logio;
 else
   enable_logio=most
@@ -12236,7 +11341,7 @@
   if test "$enable_logio" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_logio$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_logio$_apmod_extra_msg" >&5
 $as_echo "$enable_logio$_apmod_extra_msg" >&6; }
   if test "$enable_logio" != "no"; then
     case "$enable_logio" in
@@ -12317,10 +11422,10 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_env" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_env" >&5
 $as_echo_n "checking whether to enable mod_env... " >&6; }
     # Check whether --enable-env was given.
-if test "${enable_env+set}" = set; then
+if test "${enable_env+set}" = set; then :
   enableval=$enable_env;
 else
   enable_env=yes
@@ -12355,7 +11460,7 @@
   if test "$enable_env" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_env$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_env$_apmod_extra_msg" >&5
 $as_echo "$enable_env$_apmod_extra_msg" >&6; }
   if test "$enable_env" != "no"; then
     case "$enable_env" in
@@ -12410,10 +11515,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_mime_magic" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_mime_magic" >&5
 $as_echo_n "checking whether to enable mod_mime_magic... " >&6; }
     # Check whether --enable-mime-magic was given.
-if test "${enable_mime_magic+set}" = set; then
+if test "${enable_mime_magic+set}" = set; then :
   enableval=$enable_mime_magic;
 else
   enable_mime_magic=maybe-all
@@ -12448,7 +11553,7 @@
   if test "$enable_mime_magic" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_mime_magic$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_mime_magic$_apmod_extra_msg" >&5
 $as_echo "$enable_mime_magic$_apmod_extra_msg" >&6; }
   if test "$enable_mime_magic" != "no"; then
     case "$enable_mime_magic" in
@@ -12503,10 +11608,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_cern_meta" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_cern_meta" >&5
 $as_echo_n "checking whether to enable mod_cern_meta... " >&6; }
     # Check whether --enable-cern-meta was given.
-if test "${enable_cern_meta+set}" = set; then
+if test "${enable_cern_meta+set}" = set; then :
   enableval=$enable_cern_meta;
 else
   enable_cern_meta=maybe-all
@@ -12541,7 +11646,7 @@
   if test "$enable_cern_meta" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_cern_meta$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_cern_meta$_apmod_extra_msg" >&5
 $as_echo "$enable_cern_meta$_apmod_extra_msg" >&6; }
   if test "$enable_cern_meta" != "no"; then
     case "$enable_cern_meta" in
@@ -12596,10 +11701,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_expires" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_expires" >&5
 $as_echo_n "checking whether to enable mod_expires... " >&6; }
     # Check whether --enable-expires was given.
-if test "${enable_expires+set}" = set; then
+if test "${enable_expires+set}" = set; then :
   enableval=$enable_expires;
 else
   enable_expires=most
@@ -12634,7 +11739,7 @@
   if test "$enable_expires" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_expires$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_expires$_apmod_extra_msg" >&5
 $as_echo "$enable_expires$_apmod_extra_msg" >&6; }
   if test "$enable_expires" != "no"; then
     case "$enable_expires" in
@@ -12689,10 +11794,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_headers" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_headers" >&5
 $as_echo_n "checking whether to enable mod_headers... " >&6; }
     # Check whether --enable-headers was given.
-if test "${enable_headers+set}" = set; then
+if test "${enable_headers+set}" = set; then :
   enableval=$enable_headers;
 else
   enable_headers=most
@@ -12727,7 +11832,7 @@
   if test "$enable_headers" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_headers$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_headers$_apmod_extra_msg" >&5
 $as_echo "$enable_headers$_apmod_extra_msg" >&6; }
   if test "$enable_headers" != "no"; then
     case "$enable_headers" in
@@ -12782,10 +11887,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_ident" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_ident" >&5
 $as_echo_n "checking whether to enable mod_ident... " >&6; }
     # Check whether --enable-ident was given.
-if test "${enable_ident+set}" = set; then
+if test "${enable_ident+set}" = set; then :
   enableval=$enable_ident;
 else
   enable_ident=most
@@ -12820,7 +11925,7 @@
   if test "$enable_ident" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_ident$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_ident$_apmod_extra_msg" >&5
 $as_echo "$enable_ident$_apmod_extra_msg" >&6; }
   if test "$enable_ident" != "no"; then
     case "$enable_ident" in
@@ -12876,10 +11981,10 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_usertrack" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_usertrack" >&5
 $as_echo_n "checking whether to enable mod_usertrack... " >&6; }
     # Check whether --enable-usertrack was given.
-if test "${enable_usertrack+set}" = set; then
+if test "${enable_usertrack+set}" = set; then :
   enableval=$enable_usertrack;
 else
   enable_usertrack=maybe-all
@@ -12912,270 +12017,44 @@
     fi
   fi
   if test "$enable_usertrack" != "no"; then
-            { $as_echo "$as_me:$LINENO: result: checking dependencies" >&5
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
 $as_echo "checking dependencies" >&6; }
 
-
-for ac_header in sys/times.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
+  for ac_header in sys/times.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/times.h" "ac_cv_header_sys_times_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_times_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_SYS_TIMES_H 1
 _ACEOF
 
 fi
 
 done
 
-
-for ac_func in times
-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
+  for ac_func in times
+do :
+  ac_fn_c_check_func "$LINENO" "times" "ac_cv_func_times"
+if test "x$ac_cv_func_times" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_TIMES 1
 _ACEOF
 
 fi
 done
 
 
-                    { $as_echo "$as_me:$LINENO: checking whether to enable mod_usertrack" >&5
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_usertrack" >&5
 $as_echo_n "checking whether to enable mod_usertrack... " >&6; }
                     if test "$enable_usertrack" = "no"; then
                       if test "$_apmod_error_fatal" = "no"; then
                         _apmod_extra_msg=" (disabled)"
                       else
-                        { { $as_echo "$as_me:$LINENO: error: mod_usertrack has been requested but can not be built due to prerequisite failures" >&5
-$as_echo "$as_me: error: mod_usertrack has been requested but can not be built due to prerequisite failures" >&2;}
-   { (exit 1); exit 1; }; }
+                        as_fn_error "mod_usertrack has been requested but can not be built due to prerequisite failures" "$LINENO" 5
                       fi
                     fi
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_usertrack$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_usertrack$_apmod_extra_msg" >&5
 $as_echo "$enable_usertrack$_apmod_extra_msg" >&6; }
   if test "$enable_usertrack" != "no"; then
     case "$enable_usertrack" in
@@ -13231,10 +12110,10 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_unique_id" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_unique_id" >&5
 $as_echo_n "checking whether to enable mod_unique_id... " >&6; }
     # Check whether --enable-unique-id was given.
-if test "${enable_unique_id+set}" = set; then
+if test "${enable_unique_id+set}" = set; then :
   enableval=$enable_unique_id;
 else
   enable_unique_id=maybe-all
@@ -13269,7 +12148,7 @@
   if test "$enable_unique_id" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_unique_id$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_unique_id$_apmod_extra_msg" >&5
 $as_echo "$enable_unique_id$_apmod_extra_msg" >&6; }
   if test "$enable_unique_id" != "no"; then
     case "$enable_unique_id" in
@@ -13324,10 +12203,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_setenvif" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_setenvif" >&5
 $as_echo_n "checking whether to enable mod_setenvif... " >&6; }
     # Check whether --enable-setenvif was given.
-if test "${enable_setenvif+set}" = set; then
+if test "${enable_setenvif+set}" = set; then :
   enableval=$enable_setenvif;
 else
   enable_setenvif=yes
@@ -13362,7 +12241,7 @@
   if test "$enable_setenvif" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_setenvif$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_setenvif$_apmod_extra_msg" >&5
 $as_echo "$enable_setenvif$_apmod_extra_msg" >&6; }
   if test "$enable_setenvif" != "no"; then
     case "$enable_setenvif" in
@@ -13417,10 +12296,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_version" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_version" >&5
 $as_echo_n "checking whether to enable mod_version... " >&6; }
     # Check whether --enable-version was given.
-if test "${enable_version+set}" = set; then
+if test "${enable_version+set}" = set; then :
   enableval=$enable_version;
 else
   enable_version=yes
@@ -13455,7 +12334,7 @@
   if test "$enable_version" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_version$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_version$_apmod_extra_msg" >&5
 $as_echo "$enable_version$_apmod_extra_msg" >&6; }
   if test "$enable_version" != "no"; then
     case "$enable_version" in
@@ -13544,10 +12423,10 @@
 
 proxy_objs="mod_proxy.lo proxy_util.lo"
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_proxy" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy" >&5
 $as_echo_n "checking whether to enable mod_proxy... " >&6; }
     # Check whether --enable-proxy was given.
-if test "${enable_proxy+set}" = set; then
+if test "${enable_proxy+set}" = set; then :
   enableval=$enable_proxy;
 else
   enable_proxy=$proxy_mods_enable
@@ -13582,7 +12461,7 @@
   if test "$enable_proxy" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_proxy$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy$_apmod_extra_msg" >&5
 $as_echo "$enable_proxy$_apmod_extra_msg" >&6; }
   if test "$enable_proxy" != "no"; then
     case "$enable_proxy" in
@@ -13640,6 +12519,7 @@
 proxy_connect_objs="mod_proxy_connect.lo"
 proxy_ftp_objs="mod_proxy_ftp.lo"
 proxy_http_objs="mod_proxy_http.lo"
+proxy_scgi_objs="mod_proxy_scgi.lo"
 proxy_ajp_objs="mod_proxy_ajp.lo ajp_header.lo ajp_link.lo ajp_msg.lo ajp_utils.lo"
 proxy_balancer_objs="mod_proxy_balancer.lo"
 
@@ -13650,16 +12530,17 @@
     proxy_connect_objs="$proxy_connect_objs mod_proxy.la"
     proxy_ftp_objs="$proxy_ftp_objs mod_proxy.la"
     proxy_http_objs="$proxy_http_objs mod_proxy.la"
+    proxy_scgi_objs="$proxy_scgi_objs mod_proxy.la"
     proxy_ajp_objs="$proxy_ajp_objs mod_proxy.la"
     proxy_balancer_objs="$proxy_balancer_objs mod_proxy.la"
     ;;
 esac
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_proxy_connect" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_connect" >&5
 $as_echo_n "checking whether to enable mod_proxy_connect... " >&6; }
     # Check whether --enable-proxy-connect was given.
-if test "${enable_proxy_connect+set}" = set; then
+if test "${enable_proxy_connect+set}" = set; then :
   enableval=$enable_proxy_connect;
 else
   enable_proxy_connect=$proxy_mods_enable
@@ -13694,7 +12575,7 @@
   if test "$enable_proxy_connect" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_proxy_connect$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_connect$_apmod_extra_msg" >&5
 $as_echo "$enable_proxy_connect$_apmod_extra_msg" >&6; }
   if test "$enable_proxy_connect" != "no"; then
     case "$enable_proxy_connect" in
@@ -13749,10 +12630,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_proxy_ftp" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_ftp" >&5
 $as_echo_n "checking whether to enable mod_proxy_ftp... " >&6; }
     # Check whether --enable-proxy-ftp was given.
-if test "${enable_proxy_ftp+set}" = set; then
+if test "${enable_proxy_ftp+set}" = set; then :
   enableval=$enable_proxy_ftp;
 else
   enable_proxy_ftp=$proxy_mods_enable
@@ -13787,7 +12668,7 @@
   if test "$enable_proxy_ftp" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_proxy_ftp$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_ftp$_apmod_extra_msg" >&5
 $as_echo "$enable_proxy_ftp$_apmod_extra_msg" >&6; }
   if test "$enable_proxy_ftp" != "no"; then
     case "$enable_proxy_ftp" in
@@ -13842,10 +12723,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_proxy_http" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_http" >&5
 $as_echo_n "checking whether to enable mod_proxy_http... " >&6; }
     # Check whether --enable-proxy-http was given.
-if test "${enable_proxy_http+set}" = set; then
+if test "${enable_proxy_http+set}" = set; then :
   enableval=$enable_proxy_http;
 else
   enable_proxy_http=$proxy_mods_enable
@@ -13880,7 +12761,7 @@
   if test "$enable_proxy_http" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_proxy_http$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_http$_apmod_extra_msg" >&5
 $as_echo "$enable_proxy_http$_apmod_extra_msg" >&6; }
   if test "$enable_proxy_http" != "no"; then
     case "$enable_proxy_http" in
@@ -13935,10 +12816,103 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_proxy_ajp" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_scgi" >&5
+$as_echo_n "checking whether to enable mod_proxy_scgi... " >&6; }
+    # Check whether --enable-proxy-scgi was given.
+if test "${enable_proxy_scgi+set}" = set; then :
+  enableval=$enable_proxy_scgi;
+else
+  enable_proxy_scgi=$proxy_mods_enable
+fi
+
+    _apmod_extra_msg=""
+      if test "$module_selection" = "most" -a "$enable_proxy_scgi" = "most"; then
+    _apmod_error_fatal="no"
+  else
+    _apmod_error_fatal="yes"
+  fi
+  if test "$enable_proxy_scgi" = "static"; then
+    enable_proxy_scgi=yes
+  elif test "$enable_proxy_scgi" = "yes"; then
+    enable_proxy_scgi=$module_default
+    _apmod_extra_msg=" ($module_selection)"
+  elif test "$enable_proxy_scgi" = "most"; then
+    if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+      enable_proxy_scgi=$module_default
+      _apmod_extra_msg=" ($module_selection)"
+    elif test "$enable_proxy_scgi" != "yes"; then
+      enable_proxy_scgi=no
+    fi
+  elif test "$enable_proxy_scgi" = "maybe-all"; then
+    if test "$module_selection" = "all"; then
+      enable_proxy_scgi=$module_default
+      _apmod_extra_msg=" (all)"
+    else
+      enable_proxy_scgi=no
+    fi
+  fi
+  if test "$enable_proxy_scgi" != "no"; then
+            :
+  fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_scgi$_apmod_extra_msg" >&5
+$as_echo "$enable_proxy_scgi$_apmod_extra_msg" >&6; }
+  if test "$enable_proxy_scgi" != "no"; then
+    case "$enable_proxy_scgi" in
+    shared*)
+      enable_proxy_scgi=`echo $enable_proxy_scgi|sed 's/shared,*//'`
+      sharedobjs=yes
+      shared=yes
+      DSO_MODULES="$DSO_MODULES proxy_scgi"
+      ;;
+    *)
+      MODLIST="$MODLIST proxy_scgi"
+      if test "proxy_scgi" = "so"; then
+          sharedobjs=yes
+      fi
+      shared="";;
+    esac
+
+
+  if test -z "$proxy_scgi_objs"; then
+    objects="mod_proxy_scgi.lo"
+  else
+    objects="$proxy_scgi_objs"
+  fi
+
+  if test -z "$module_standalone"; then
+    if test -z "$shared"; then
+      # The filename of a convenience library must have a "lib" prefix:
+      libname="libmod_proxy_scgi.la"
+      BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+      modpath_static="$modpath_static $libname"
+      cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+	\$(MOD_LINK) $objects \$(MOD_PROXY_SCGI_LDADD)
+EOF
+    else
+      apache_need_shared=yes
+      libname="mod_proxy_scgi.la"
+      shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+      modpath_shared="$modpath_shared $libname"
+      cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+	\$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version  $objects \$(MOD_PROXY_SCGI_LDADD)
+EOF
+    fi
+  fi
+
+
+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_PROXY_SCGI_LDADD"
+
+
+
+  fi
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_ajp" >&5
 $as_echo_n "checking whether to enable mod_proxy_ajp... " >&6; }
     # Check whether --enable-proxy-ajp was given.
-if test "${enable_proxy_ajp+set}" = set; then
+if test "${enable_proxy_ajp+set}" = set; then :
   enableval=$enable_proxy_ajp;
 else
   enable_proxy_ajp=$proxy_mods_enable
@@ -13973,7 +12947,7 @@
   if test "$enable_proxy_ajp" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_proxy_ajp$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_ajp$_apmod_extra_msg" >&5
 $as_echo "$enable_proxy_ajp$_apmod_extra_msg" >&6; }
   if test "$enable_proxy_ajp" != "no"; then
     case "$enable_proxy_ajp" in
@@ -14028,10 +13002,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_proxy_balancer" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_balancer" >&5
 $as_echo_n "checking whether to enable mod_proxy_balancer... " >&6; }
     # Check whether --enable-proxy-balancer was given.
-if test "${enable_proxy_balancer+set}" = set; then
+if test "${enable_proxy_balancer+set}" = set; then :
   enableval=$enable_proxy_balancer;
 else
   enable_proxy_balancer=$proxy_mods_enable
@@ -14066,7 +13040,7 @@
   if test "$enable_proxy_balancer" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_proxy_balancer$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_balancer$_apmod_extra_msg" >&5
 $as_echo "$enable_proxy_balancer$_apmod_extra_msg" >&6; }
   if test "$enable_proxy_balancer" != "no"; then
     case "$enable_proxy_balancer" in
@@ -14171,10 +13145,10 @@
 
 ssl_objs="mod_ssl.lo ssl_engine_config.lo ssl_engine_dh.lo ssl_engine_init.lo ssl_engine_io.lo ssl_engine_kernel.lo ssl_engine_log.lo ssl_engine_mutex.lo ssl_engine_pphrase.lo ssl_engine_rand.lo ssl_engine_vars.lo ssl_expr.lo ssl_expr_eval.lo ssl_expr_parse.lo ssl_expr_scan.lo ssl_scache.lo ssl_scache_dbm.lo ssl_scache_shmcb.lo ssl_scache_dc.lo ssl_util.lo ssl_util_ssl.lo "
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_ssl" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_ssl" >&5
 $as_echo_n "checking whether to enable mod_ssl... " >&6; }
     # Check whether --enable-ssl was given.
-if test "${enable_ssl+set}" = set; then
+if test "${enable_ssl+set}" = set; then :
   enableval=$enable_ssl;
 else
   enable_ssl=no
@@ -14207,7 +13181,7 @@
     fi
   fi
   if test "$enable_ssl" != "no"; then
-            { $as_echo "$as_me:$LINENO: result: checking dependencies" >&5
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
 $as_echo "checking dependencies" >&6; }
 
 
@@ -14216,11 +13190,11 @@
   ap_ssltk_libs=""
   ap_ssltk_type=""
 
-    { $as_echo "$as_me:$LINENO: checking for SSL/TLS toolkit base" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL/TLS toolkit base" >&5
 $as_echo_n "checking for SSL/TLS toolkit base... " >&6; }
 
 # Check whether --with-sslc was given.
-if test "${with_sslc+set}" = set; then
+if test "${with_sslc+set}" = set; then :
   withval=$with_sslc;
         if test "x$withval" != "xyes" -a "x$withval" != "x"; then
             ap_ssltk_base="`cd $withval ; pwd`"
@@ -14231,7 +13205,7 @@
 
 
 # Check whether --with-ssl was given.
-if test "${with_ssl+set}" = set; then
+if test "${with_ssl+set}" = set; then :
   withval=$with_ssl;
         if test "x$withval" != "xyes" -a "x$withval" != "x"; then
             ap_ssltk_base="`cd $withval ; pwd`"
@@ -14240,10 +13214,10 @@
 fi
 
   if test "x$ap_ssltk_base" = "x"; then
-    { $as_echo "$as_me:$LINENO: result: none" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
 $as_echo "none" >&6; }
   else
-    { $as_echo "$as_me:$LINENO: result: $ap_ssltk_base" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_ssltk_base" >&5
 $as_echo "$ap_ssltk_base" >&6; }
   fi
 
@@ -14338,147 +13312,14 @@
     fi
   fi
   if test "x$ap_ssltk_type" = "x"; then
-    { $as_echo "$as_me:$LINENO: checking for OpenSSL version" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL version" >&5
 $as_echo_n "checking for OpenSSL version... " >&6; }
-
-
-for ac_header in openssl/opensslv.h openssl/ssl.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
+        for ac_header in openssl/opensslv.h openssl/ssl.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -14488,11 +13329,7 @@
 done
 
     if test "$ap_ssltk_type" = "openssl"; then
-            cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <openssl/opensslv.h>
 int
@@ -14510,186 +13347,31 @@
   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
-  { $as_echo "$as_me:$LINENO: result: OK" >&5
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
 $as_echo "OK" >&6; }
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	       { $as_echo "$as_me:$LINENO: result: not encouraging" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: not encouraging" >&5
 $as_echo "not encouraging" >&6; }
        echo "WARNING: OpenSSL version may contain security vulnerabilities!"
        echo "         Ensure the latest security patches have been applied!"
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     else
-      { $as_echo "$as_me:$LINENO: result: no OpenSSL headers found" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no OpenSSL headers found" >&5
 $as_echo "no OpenSSL headers found" >&6; }
     fi
   fi
   if test "$ap_ssltk_type" != "openssl"; then
-        { $as_echo "$as_me:$LINENO: checking for SSL-C version" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL-C version" >&5
 $as_echo_n "checking for SSL-C version... " >&6; }
-
-for ac_header in sslc.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
+    for ac_header in sslc.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sslc.h" "ac_cv_header_sslc_h" "$ac_includes_default"
+if test "x$ac_cv_header_sslc_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_SSLC_H 1
 _ACEOF
  ap_ssltk_type="sslc"
 else
@@ -14700,13 +13382,9 @@
 
     if test "$ap_ssltk_type" = "sslc"; then
       ap_ssltk_libs="-lsslc"
-      { $as_echo "$as_me:$LINENO: checking for SSL-C version" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL-C version" >&5
 $as_echo_n "checking for SSL-C version... " >&6; }
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sslc.h>
 int
@@ -14724,47 +13402,24 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_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
-  { $as_echo "$as_me:$LINENO: result: OK" >&5
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
 $as_echo "OK" >&6; }
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	       { $as_echo "$as_me:$LINENO: result: not encouraging" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: not encouraging" >&5
 $as_echo "not encouraging" >&6; }
        echo "WARNING: SSL-C version may contain security vulnerabilities!"
        echo "         Ensure the latest security patches have been applied!"
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     else
-      { $as_echo "$as_me:$LINENO: result: no SSL-C headers found" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no SSL-C headers found" >&5
 $as_echo "no SSL-C headers found" >&6; }
     fi
   fi
   if test "x$ap_ssltk_type" = "x"; then
-    { { $as_echo "$as_me:$LINENO: error: ...No recognized SSL/TLS toolkit detected" >&5
-$as_echo "$as_me: error: ...No recognized SSL/TLS toolkit detected" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "...No recognized SSL/TLS toolkit detected" "$LINENO" 5
   fi
 
   if test "$ap_ssltk_type" = "openssl"; then
@@ -14880,247 +13535,24 @@
 
     liberrors=""
   if test "$ap_ssltk_type" = "openssl"; then
-
-for ac_header in openssl/engine.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
+    for ac_header in openssl/engine.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "openssl/engine.h" "ac_cv_header_openssl_engine_h" "$ac_includes_default"
+if test "x$ac_cv_header_openssl_engine_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_OPENSSL_ENGINE_H 1
 _ACEOF
 
 fi
 
 done
 
-
-
-for ac_func in SSLeay_version SSL_CTX_new
-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
+    for ac_func in SSLeay_version SSL_CTX_new
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -15130,101 +13562,12 @@
 fi
 done
 
-
-
-for ac_func in ENGINE_init ENGINE_load_builtin_engines
-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
+    for ac_func in ENGINE_init ENGINE_load_builtin_engines
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -15233,101 +13576,12 @@
 done
 
   else
-
-
-for ac_func in SSLC_library_version SSL_CTX_new
-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
+    for ac_func in SSLC_library_version SSL_CTX_new
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -15337,204 +13591,24 @@
 fi
 done
 
-
-for ac_func in SSL_set_state
-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
+    for ac_func in SSL_set_state
+do :
+  ac_fn_c_check_func "$LINENO" "SSL_set_state" "ac_cv_func_SSL_set_state"
+if test "x$ac_cv_func_SSL_set_state" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_SSL_SET_STATE 1
 _ACEOF
 
 fi
 done
 
   fi
-
-for ac_func in SSL_set_cert_store
-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
+  for ac_func in SSL_set_cert_store
+do :
+  ac_fn_c_check_func "$LINENO" "SSL_set_cert_store" "ac_cv_func_SSL_set_cert_store"
+if test "x$ac_cv_func_SSL_set_cert_store" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_SSL_SET_CERT_STORE 1
 _ACEOF
 
 fi
@@ -15543,22 +13617,16 @@
     CPPFLAGS="$saved_CPPFLAGS"
   LIBS="$saved_LIBS"
   if test "x$liberrors" != "x"; then
-    { { $as_echo "$as_me:$LINENO: error: ... Error, SSL/TLS libraries were missing or unusable" >&5
-$as_echo "$as_me: error: ... Error, SSL/TLS libraries were missing or unusable" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "... Error, SSL/TLS libraries were missing or unusable" "$LINENO" 5
   fi
 
       if test "$ap_ssltk_type" = "openssl"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_OPENSSL 1
-_ACEOF
+$as_echo "#define HAVE_OPENSSL 1" >>confdefs.h
 
   else
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SSLC 1
-_ACEOF
+$as_echo "#define HAVE_SSLC 1" >>confdefs.h
 
   fi
 fi
@@ -15568,13 +13636,13 @@
   MOD_SSL_LDADD="\$(SSL_LIBS)"
 
 
-  { $as_echo "$as_me:$LINENO: checking whether Distcache is required" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Distcache is required" >&5
 $as_echo_n "checking whether Distcache is required... " >&6; }
   ap_ssltk_dc="no"
   tmp_nomessage=""
   tmp_forced="no"
   # Check whether --enable-distcache was given.
-if test "${enable_distcache+set}" = set; then
+if test "${enable_distcache+set}" = set; then :
   enableval=$enable_distcache; ap_ssltk_dc="$enableval"
     tmp_nomessage=""
     tmp_forced="yes"
@@ -15589,167 +13657,33 @@
 fi
 
   if test "$tmp_forced" = "no"; then
-    { $as_echo "$as_me:$LINENO: result: $ap_ssltk_dc (default)" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_ssltk_dc (default)" >&5
 $as_echo "$ap_ssltk_dc (default)" >&6; }
   else
-    { $as_echo "$as_me:$LINENO: result: $ap_ssltk_dc (specified)" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_ssltk_dc (specified)" >&5
 $as_echo "$ap_ssltk_dc (specified)" >&6; }
   fi
   if test "$tmp_forced" = "yes" -a "x$ap_ssltk_dc" = "xno" -a "x$tmp_nomessage" != "x"; then
-    { { $as_echo "$as_me:$LINENO: error: distcache support failed: $tmp_nomessage" >&5
-$as_echo "$as_me: error: distcache support failed: $tmp_nomessage" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "distcache support failed: $tmp_nomessage" "$LINENO" 5
   fi
   if test "$ap_ssltk_dc" = "yes"; then
-    if test "${ac_cv_header_distcache_dc_client_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for distcache/dc_client.h" >&5
-$as_echo_n "checking for distcache/dc_client.h... " >&6; }
-if test "${ac_cv_header_distcache_dc_client_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_distcache_dc_client_h" >&5
-$as_echo "$ac_cv_header_distcache_dc_client_h" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking distcache/dc_client.h usability" >&5
-$as_echo_n "checking distcache/dc_client.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 <distcache/dc_client.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_fn_c_check_header_mongrel "$LINENO" "distcache/dc_client.h" "ac_cv_header_distcache_dc_client_h" "$ac_includes_default"
+if test "x$ac_cv_header_distcache_dc_client_h" = x""yes; then :
 
-	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 distcache/dc_client.h presence" >&5
-$as_echo_n "checking distcache/dc_client.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 <distcache/dc_client.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: distcache/dc_client.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: distcache/dc_client.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: distcache/dc_client.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: distcache/dc_client.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: distcache/dc_client.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: distcache/dc_client.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: distcache/dc_client.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: distcache/dc_client.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: distcache/dc_client.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: distcache/dc_client.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: distcache/dc_client.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: distcache/dc_client.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: distcache/dc_client.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: distcache/dc_client.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: distcache/dc_client.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: distcache/dc_client.h: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for distcache/dc_client.h" >&5
-$as_echo_n "checking for distcache/dc_client.h... " >&6; }
-if test "${ac_cv_header_distcache_dc_client_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_distcache_dc_client_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_distcache_dc_client_h" >&5
-$as_echo "$ac_cv_header_distcache_dc_client_h" >&6; }
-
-fi
-if test "x$ac_cv_header_distcache_dc_client_h" = x""yes; then
-  :
-else
   tmp_nomessage="can't include distcache headers"
       ap_ssltk_dc="no"
 fi
 
 
     if test "$tmp_forced" = "yes" -a "x$ap_ssltk_dc" = "xno"; then
-      { { $as_echo "$as_me:$LINENO: error: distcache support failed: $tmp_nomessage" >&5
-$as_echo "$as_me: error: distcache support failed: $tmp_nomessage" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "distcache support failed: $tmp_nomessage" "$LINENO" 5
     fi
   fi
   if test "$ap_ssltk_dc" = "yes"; then
-    { $as_echo "$as_me:$LINENO: checking for Distcache version" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Distcache version" >&5
 $as_echo_n "checking for Distcache version... " >&6; }
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <distcache/dc_client.h>
 int
@@ -15762,52 +13696,25 @@
   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
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
 
-	tmp_nomessage="distcache has an unsupported API version"
+else
+  tmp_nomessage="distcache has an unsupported API version"
 ap_ssltk_dc="no"
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    { $as_echo "$as_me:$LINENO: result: $ap_ssltk_dc" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_ssltk_dc" >&5
 $as_echo "$ap_ssltk_dc" >&6; }
     if test "$tmp_forced" = "yes" -a "x$ap_ssltk_dc" = "xno"; then
-      { { $as_echo "$as_me:$LINENO: error: distcache support failed: $tmp_nomessage" >&5
-$as_echo "$as_me: error: distcache support failed: $tmp_nomessage" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "distcache support failed: $tmp_nomessage" "$LINENO" 5
     fi
   fi
   if test "$ap_ssltk_dc" = "yes"; then
-    { $as_echo "$as_me:$LINENO: checking for Distcache libraries" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Distcache libraries" >&5
 $as_echo_n "checking for Distcache libraries... " >&6; }
     save_libs=$LIBS
     LIBS="$LIBS -ldistcache -lnal"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <distcache/dc_client.h>
 int
@@ -15818,46 +13725,19 @@
   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
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_link "$LINENO"; then :
 
-	tmp_no_message="failed to link with distcache libraries"
+else
+  tmp_no_message="failed to link with distcache libraries"
       ap_ssltk_dc="no"
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
     LIBS=$save_libs
-    { $as_echo "$as_me:$LINENO: result: $ap_ssltk_dc" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_ssltk_dc" >&5
 $as_echo "$ap_ssltk_dc" >&6; }
     if test "$tmp_forced" = "yes" -a "x$ap_ssltk_dc" = "xno"; then
-      { { $as_echo "$as_me:$LINENO: error: distcache support failed: $tmp_nomessage" >&5
-$as_echo "$as_me: error: distcache support failed: $tmp_nomessage" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "distcache support failed: $tmp_nomessage" "$LINENO" 5
     else
 
   if test "x$MOD_SSL_LDADD" = "x"; then
@@ -15881,9 +13761,7 @@
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DISTCACHE 1
-_ACEOF
+$as_echo "#define HAVE_DISTCACHE 1" >>confdefs.h
 
     fi
   fi
@@ -15914,19 +13792,17 @@
 
     fi
 
-                    { $as_echo "$as_me:$LINENO: checking whether to enable mod_ssl" >&5
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_ssl" >&5
 $as_echo_n "checking whether to enable mod_ssl... " >&6; }
                     if test "$enable_ssl" = "no"; then
                       if test "$_apmod_error_fatal" = "no"; then
                         _apmod_extra_msg=" (disabled)"
                       else
-                        { { $as_echo "$as_me:$LINENO: error: mod_ssl has been requested but can not be built due to prerequisite failures" >&5
-$as_echo "$as_me: error: mod_ssl has been requested but can not be built due to prerequisite failures" >&2;}
-   { (exit 1); exit 1; }; }
+                        as_fn_error "mod_ssl has been requested but can not be built due to prerequisite failures" "$LINENO" 5
                       fi
                     fi
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_ssl$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_ssl$_apmod_extra_msg" >&5
 $as_echo "$enable_ssl$_apmod_extra_msg" >&6; }
   if test "$enable_ssl" != "no"; then
     case "$enable_ssl" in
@@ -16030,10 +13906,10 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_optional_hook_export" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_optional_hook_export" >&5
 $as_echo_n "checking whether to enable mod_optional_hook_export... " >&6; }
     # Check whether --enable-optional-hook-export was given.
-if test "${enable_optional_hook_export+set}" = set; then
+if test "${enable_optional_hook_export+set}" = set; then :
   enableval=$enable_optional_hook_export;
 else
   enable_optional_hook_export=no
@@ -16068,7 +13944,7 @@
   if test "$enable_optional_hook_export" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_optional_hook_export$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_optional_hook_export$_apmod_extra_msg" >&5
 $as_echo "$enable_optional_hook_export$_apmod_extra_msg" >&6; }
   if test "$enable_optional_hook_export" != "no"; then
     case "$enable_optional_hook_export" in
@@ -16123,10 +13999,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_optional_hook_import" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_optional_hook_import" >&5
 $as_echo_n "checking whether to enable mod_optional_hook_import... " >&6; }
     # Check whether --enable-optional-hook-import was given.
-if test "${enable_optional_hook_import+set}" = set; then
+if test "${enable_optional_hook_import+set}" = set; then :
   enableval=$enable_optional_hook_import;
 else
   enable_optional_hook_import=no
@@ -16161,7 +14037,7 @@
   if test "$enable_optional_hook_import" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_optional_hook_import$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_optional_hook_import$_apmod_extra_msg" >&5
 $as_echo "$enable_optional_hook_import$_apmod_extra_msg" >&6; }
   if test "$enable_optional_hook_import" != "no"; then
     case "$enable_optional_hook_import" in
@@ -16216,10 +14092,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_optional_fn_import" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_optional_fn_import" >&5
 $as_echo_n "checking whether to enable mod_optional_fn_import... " >&6; }
     # Check whether --enable-optional-fn-import was given.
-if test "${enable_optional_fn_import+set}" = set; then
+if test "${enable_optional_fn_import+set}" = set; then :
   enableval=$enable_optional_fn_import;
 else
   enable_optional_fn_import=no
@@ -16254,7 +14130,7 @@
   if test "$enable_optional_fn_import" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_optional_fn_import$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_optional_fn_import$_apmod_extra_msg" >&5
 $as_echo "$enable_optional_fn_import$_apmod_extra_msg" >&6; }
   if test "$enable_optional_fn_import" != "no"; then
     case "$enable_optional_fn_import" in
@@ -16309,10 +14185,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_optional_fn_export" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_optional_fn_export" >&5
 $as_echo_n "checking whether to enable mod_optional_fn_export... " >&6; }
     # Check whether --enable-optional-fn-export was given.
-if test "${enable_optional_fn_export+set}" = set; then
+if test "${enable_optional_fn_export+set}" = set; then :
   enableval=$enable_optional_fn_export;
 else
   enable_optional_fn_export=no
@@ -16347,7 +14223,7 @@
   if test "$enable_optional_fn_export" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_optional_fn_export$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_optional_fn_export$_apmod_extra_msg" >&5
 $as_echo "$enable_optional_fn_export$_apmod_extra_msg" >&6; }
   if test "$enable_optional_fn_export" != "no"; then
     case "$enable_optional_fn_export" in
@@ -16440,7 +14316,7 @@
 
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for target platform" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for target platform" >&5
 $as_echo_n "checking for target platform... " >&6; }
 
 case $host in
@@ -16465,7 +14341,7 @@
   OS_DIR=$OS;;
 esac
 
-{ $as_echo "$as_me:$LINENO: result: $OS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $OS" >&5
 $as_echo "$OS" >&6; }
 
   APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES os/${OS_DIR}/Makefile"
@@ -16497,17 +14373,13 @@
 
 if test "$OS" = "unix" ; then
 
-  { $as_echo "$as_me:$LINENO: checking for rlim_t" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rlim_t" >&5
 $as_echo_n "checking for rlim_t... " >&6; }
-if test "${ac_cv_type_rlim_t+set}" = set; then
+if test "${ac_cv_type_rlim_t+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -16522,190 +14394,32 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
       ac_cv_type_rlim_t=yes
 
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  ac_cv_type_rlim_t=no
 
-	ac_cv_type_rlim_t=no
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_rlim_t" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_rlim_t" >&5
 $as_echo "$ac_cv_type_rlim_t" >&6; }
   if test "$ac_cv_type_rlim_t" = "no" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define rlim_t int
-_ACEOF
+$as_echo "#define rlim_t int" >>confdefs.h
 
   fi
 
 
-
-
-
-
-for ac_header in sys/time.h sys/resource.h sys/sem.h sys/ipc.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
+    for ac_header in sys/time.h sys/resource.h sys/sem.h sys/ipc.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -16715,101 +14429,12 @@
 done
 
 
-
-
-for ac_func in setsid killpg
-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
+    for ac_func in setsid killpg
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16821,145 +14446,12 @@
 
 
 
-
-
 for ac_header in bstring.h unistd.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
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -16971,361 +14463,47 @@
 
 
 
-
 for ac_func in syslog
-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
+do :
+  ac_fn_c_check_func "$LINENO" "syslog" "ac_cv_func_syslog"
+if test "x$ac_cv_func_syslog" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_SYSLOG 1
 _ACEOF
 
 fi
 done
 
 
-
-for ac_header in sys/times.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
+    for ac_header in sys/times.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/times.h" "ac_cv_header_sys_times_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_times_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_SYS_TIMES_H 1
 _ACEOF
 
 fi
 
 done
 
-
-for ac_func in times
-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
+    for ac_func in times
+do :
+  ac_fn_c_check_func "$LINENO" "times" "ac_cv_func_times"
+if test "x$ac_cv_func_times" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_TIMES 1
 _ACEOF
 
 fi
 done
 
 
-{ $as_echo "$as_me:$LINENO: checking which MPM to use" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which MPM to use" >&5
 $as_echo_n "checking which MPM to use... " >&6; }
 
 # Check whether --with-mpm was given.
-if test "${with_mpm+set}" = set; then
+if test "${with_mpm+set}" = set; then :
   withval=$with_mpm;
   APACHE_MPM=$withval
 
@@ -17337,7 +14515,7 @@
 
 fi
 
-{ $as_echo "$as_me:$LINENO: result: $APACHE_MPM" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $APACHE_MPM" >&5
 $as_echo "$APACHE_MPM" >&6; }
 
 apache_cv_mpm=$APACHE_MPM
@@ -17364,11 +14542,7 @@
 
 apr_old_cppflags=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $INCLUDES"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <apr.h>
@@ -17378,7 +14552,7 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then
+  $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then :
   ac_cv_define_APR_HAS_THREADS=yes
 else
   ac_cv_define_APR_HAS_THREADS=no
@@ -17389,11 +14563,11 @@
 
 
   if test "x$ac_cv_define_APR_HAS_THREADS" = "xno"; then
-    { $as_echo "$as_me:$LINENO: result: The currently selected MPM requires threads which your system seems to lack" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: The currently selected MPM requires threads which your system seems to lack" >&5
 $as_echo "The currently selected MPM requires threads which your system seems to lack" >&6; }
-    { $as_echo "$as_me:$LINENO: checking checking for replacement" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking checking for replacement" >&5
 $as_echo_n "checking checking for replacement... " >&6; }
-    { $as_echo "$as_me:$LINENO: result: prefork selected" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: prefork selected" >&5
 $as_echo "prefork selected" >&6; }
     apache_cv_mpm=prefork
   else
@@ -17402,9 +14576,9 @@
         case `uname -r` in
           2.0* )
                                                 echo "Threaded MPM's are not supported on this platform"
-            { $as_echo "$as_me:$LINENO: checking checking for replacement" >&5
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking checking for replacement" >&5
 $as_echo_n "checking checking for replacement... " >&6; }
-            { $as_echo "$as_me:$LINENO: result: prefork selected" >&5
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: prefork selected" >&5
 $as_echo "prefork selected" >&6; }
             apache_cv_mpm=prefork
           ;;
@@ -17420,7 +14594,7 @@
 
 MPM_NAME=$apache_cv_mpm
 if ap_mpm_is_experimental; then
-  { $as_echo "$as_me:$LINENO: WARNING: You have selected an EXPERIMENTAL MPM.  Be warned!" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You have selected an EXPERIMENTAL MPM.  Be warned!" >&5
 $as_echo "$as_me: WARNING: You have selected an EXPERIMENTAL MPM.  Be warned!" >&2;}
   MPM_SUBDIR_NAME=experimental/$MPM_NAME
 else
@@ -17430,9 +14604,7 @@
 MPM_LIB=$MPM_DIR/lib${MPM_NAME}.la
 
 if test ! -f "$abs_srcdir/$MPM_DIR/mpm.h"; then
-    { { $as_echo "$as_me:$LINENO: error: the selected mpm -- $apache_cv_mpm -- is not supported" >&5
-$as_echo "$as_me: error: the selected mpm -- $apache_cv_mpm -- is not supported" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "the selected mpm -- $apache_cv_mpm -- is not supported" "$LINENO" 5
 fi
 
 
@@ -17463,7 +14635,7 @@
 httxt2dbm_LTFLAGS=""
 
 # Check whether --enable-static-support was given.
-if test "${enable_static_support+set}" = set; then
+if test "${enable_static_support+set}" = set; then :
   enableval=$enable_static_support;
 if test "$enableval" = "yes" ; then
 
@@ -17661,7 +14833,7 @@
 
 
 # Check whether --enable-static-htpasswd was given.
-if test "${enable_static_htpasswd+set}" = set; then
+if test "${enable_static_htpasswd+set}" = set; then :
   enableval=$enable_static_htpasswd;
 if test "$enableval" = "yes" ; then
 
@@ -17716,7 +14888,7 @@
 
 
 # Check whether --enable-static-htdigest was given.
-if test "${enable_static_htdigest+set}" = set; then
+if test "${enable_static_htdigest+set}" = set; then :
   enableval=$enable_static_htdigest;
 if test "$enableval" = "yes" ; then
 
@@ -17771,7 +14943,7 @@
 
 
 # Check whether --enable-static-rotatelogs was given.
-if test "${enable_static_rotatelogs+set}" = set; then
+if test "${enable_static_rotatelogs+set}" = set; then :
   enableval=$enable_static_rotatelogs;
 if test "$enableval" = "yes" ; then
 
@@ -17826,7 +14998,7 @@
 
 
 # Check whether --enable-static-logresolve was given.
-if test "${enable_static_logresolve+set}" = set; then
+if test "${enable_static_logresolve+set}" = set; then :
   enableval=$enable_static_logresolve;
 if test "$enableval" = "yes" ; then
 
@@ -17881,7 +15053,7 @@
 
 
 # Check whether --enable-static-htdbm was given.
-if test "${enable_static_htdbm+set}" = set; then
+if test "${enable_static_htdbm+set}" = set; then :
   enableval=$enable_static_htdbm;
 if test "$enableval" = "yes" ; then
 
@@ -17936,7 +15108,7 @@
 
 
 # Check whether --enable-static-ab was given.
-if test "${enable_static_ab+set}" = set; then
+if test "${enable_static_ab+set}" = set; then :
   enableval=$enable_static_ab;
 if test "$enableval" = "yes" ; then
 
@@ -17991,7 +15163,7 @@
 
 
 # Check whether --enable-static-checkgid was given.
-if test "${enable_static_checkgid+set}" = set; then
+if test "${enable_static_checkgid+set}" = set; then :
   enableval=$enable_static_checkgid;
 if test "$enableval" = "yes" ; then
 
@@ -18046,7 +15218,7 @@
 
 
 # Check whether --enable-static-htcacheclean was given.
-if test "${enable_static_htcacheclean+set}" = set; then
+if test "${enable_static_htcacheclean+set}" = set; then :
   enableval=$enable_static_htcacheclean;
 if test "$enableval" = "yes" ; then
 
@@ -18101,7 +15273,7 @@
 
 
 # Check whether --enable-static-httxt2dbm was given.
-if test "${enable_static_httxt2dbm+set}" = set; then
+if test "${enable_static_httxt2dbm+set}" = set; then :
   enableval=$enable_static_httxt2dbm;
 if test "$enableval" = "yes" ; then
 
@@ -18195,16 +15367,14 @@
 if test "$enable_http" = "yes"; then
     enable_http="static"
 elif test "$enable_http" = "shared"; then
-    { { $as_echo "$as_me:$LINENO: error: mod_http can not be built as a shared DSO" >&5
-$as_echo "$as_me: error: mod_http can not be built as a shared DSO" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "mod_http can not be built as a shared DSO" "$LINENO" 5
 fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_http" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_http" >&5
 $as_echo_n "checking whether to enable mod_http... " >&6; }
     # Check whether --enable-http was given.
-if test "${enable_http+set}" = set; then
+if test "${enable_http+set}" = set; then :
   enableval=$enable_http;
 else
   enable_http=static
@@ -18239,7 +15409,7 @@
   if test "$enable_http" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_http$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_http$_apmod_extra_msg" >&5
 $as_echo "$enable_http$_apmod_extra_msg" >&6; }
   if test "$enable_http" != "no"; then
     case "$enable_http" in
@@ -18294,10 +15464,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_mime" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_mime" >&5
 $as_echo_n "checking whether to enable mod_mime... " >&6; }
     # Check whether --enable-mime was given.
-if test "${enable_mime+set}" = set; then
+if test "${enable_mime+set}" = set; then :
   enableval=$enable_mime;
 else
   enable_mime=yes
@@ -18332,7 +15502,7 @@
   if test "$enable_mime" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_mime$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_mime$_apmod_extra_msg" >&5
 $as_echo "$enable_mime$_apmod_extra_msg" >&6; }
   if test "$enable_mime" != "no"; then
     case "$enable_mime" in
@@ -18401,11 +15571,11 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for extra modules" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra modules" >&5
 $as_echo_n "checking for extra modules... " >&6; }
 
 # Check whether --with-module was given.
-if test "${with_module+set}" = set; then
+if test "${with_module+set}" = set; then :
   withval=$with_module;
     as_save_IFS="$IFS"; IFS=","
     for mod in $withval
@@ -18455,13 +15625,13 @@
 
     done
     if test ! -z "$EXTRA_MODLIST"; then
-      { $as_echo "$as_me:$LINENO: result: added:$EXTRA_MODLIST" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: added:$EXTRA_MODLIST" >&5
 $as_echo "added:$EXTRA_MODLIST" >&6; }
     fi
     IFS="$as_save_IFS"
 
 else
-   { $as_echo "$as_me:$LINENO: result: none" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
 $as_echo "none" >&6; }
 
 fi
@@ -18486,10 +15656,10 @@
 fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_dav" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_dav" >&5
 $as_echo_n "checking whether to enable mod_dav... " >&6; }
     # Check whether --enable-dav was given.
-if test "${enable_dav+set}" = set; then
+if test "${enable_dav+set}" = set; then :
   enableval=$enable_dav;
 else
   enable_dav=$dav_enable
@@ -18524,7 +15694,7 @@
   if test "$enable_dav" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_dav$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_dav$_apmod_extra_msg" >&5
 $as_echo "$enable_dav$_apmod_extra_msg" >&6; }
   if test "$enable_dav" != "no"; then
     case "$enable_dav" in
@@ -18632,10 +15802,10 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_status" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_status" >&5
 $as_echo_n "checking whether to enable mod_status... " >&6; }
     # Check whether --enable-status was given.
-if test "${enable_status+set}" = set; then
+if test "${enable_status+set}" = set; then :
   enableval=$enable_status;
 else
   enable_status=yes
@@ -18670,7 +15840,7 @@
   if test "$enable_status" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_status$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_status$_apmod_extra_msg" >&5
 $as_echo "$enable_status$_apmod_extra_msg" >&6; }
   if test "$enable_status" != "no"; then
     case "$enable_status" in
@@ -18725,10 +15895,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_autoindex" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_autoindex" >&5
 $as_echo_n "checking whether to enable mod_autoindex... " >&6; }
     # Check whether --enable-autoindex was given.
-if test "${enable_autoindex+set}" = set; then
+if test "${enable_autoindex+set}" = set; then :
   enableval=$enable_autoindex;
 else
   enable_autoindex=yes
@@ -18763,7 +15933,7 @@
   if test "$enable_autoindex" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_autoindex$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_autoindex$_apmod_extra_msg" >&5
 $as_echo "$enable_autoindex$_apmod_extra_msg" >&6; }
   if test "$enable_autoindex" != "no"; then
     case "$enable_autoindex" in
@@ -18818,10 +15988,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_asis" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_asis" >&5
 $as_echo_n "checking whether to enable mod_asis... " >&6; }
     # Check whether --enable-asis was given.
-if test "${enable_asis+set}" = set; then
+if test "${enable_asis+set}" = set; then :
   enableval=$enable_asis;
 else
   enable_asis=yes
@@ -18856,7 +16026,7 @@
   if test "$enable_asis" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_asis$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_asis$_apmod_extra_msg" >&5
 $as_echo "$enable_asis$_apmod_extra_msg" >&6; }
   if test "$enable_asis" != "no"; then
     case "$enable_asis" in
@@ -18911,10 +16081,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_info" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_info" >&5
 $as_echo_n "checking whether to enable mod_info... " >&6; }
     # Check whether --enable-info was given.
-if test "${enable_info+set}" = set; then
+if test "${enable_info+set}" = set; then :
   enableval=$enable_info;
 else
   enable_info=most
@@ -18949,7 +16119,7 @@
   if test "$enable_info" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_info$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_info$_apmod_extra_msg" >&5
 $as_echo "$enable_info$_apmod_extra_msg" >&6; }
   if test "$enable_info" != "no"; then
     case "$enable_info" in
@@ -19004,10 +16174,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_suexec" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_suexec" >&5
 $as_echo_n "checking whether to enable mod_suexec... " >&6; }
     # Check whether --enable-suexec was given.
-if test "${enable_suexec+set}" = set; then
+if test "${enable_suexec+set}" = set; then :
   enableval=$enable_suexec;
 else
   enable_suexec=no
@@ -19040,23 +16210,21 @@
     fi
   fi
   if test "$enable_suexec" != "no"; then
-            { $as_echo "$as_me:$LINENO: result: checking dependencies" >&5
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
 $as_echo "checking dependencies" >&6; }
 
               other_targets=suexec
-                    { $as_echo "$as_me:$LINENO: checking whether to enable mod_suexec" >&5
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_suexec" >&5
 $as_echo_n "checking whether to enable mod_suexec... " >&6; }
                     if test "$enable_suexec" = "no"; then
                       if test "$_apmod_error_fatal" = "no"; then
                         _apmod_extra_msg=" (disabled)"
                       else
-                        { { $as_echo "$as_me:$LINENO: error: mod_suexec has been requested but can not be built due to prerequisite failures" >&5
-$as_echo "$as_me: error: mod_suexec has been requested but can not be built due to prerequisite failures" >&2;}
-   { (exit 1); exit 1; }; }
+                        as_fn_error "mod_suexec has been requested but can not be built due to prerequisite failures" "$LINENO" 5
                       fi
                     fi
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_suexec$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_suexec$_apmod_extra_msg" >&5
 $as_echo "$enable_suexec$_apmod_extra_msg" >&6; }
   if test "$enable_suexec" != "no"; then
     case "$enable_suexec" in
@@ -19115,10 +16283,10 @@
 # if we are using a threaded MPM, we will get better performance with
 # mod_cgid, so make it the default.
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_cgid" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_cgid" >&5
 $as_echo_n "checking whether to enable mod_cgid... " >&6; }
     # Check whether --enable-cgid was given.
-if test "${enable_cgid+set}" = set; then
+if test "${enable_cgid+set}" = set; then :
   enableval=$enable_cgid;
 else
   enable_cgid=yes
@@ -19153,7 +16321,7 @@
   if test "$enable_cgid" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_cgid$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_cgid$_apmod_extra_msg" >&5
 $as_echo "$enable_cgid$_apmod_extra_msg" >&6; }
   if test "$enable_cgid" != "no"; then
     case "$enable_cgid" in
@@ -19208,10 +16376,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_cgi" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_cgi" >&5
 $as_echo_n "checking whether to enable mod_cgi... " >&6; }
     # Check whether --enable-cgi was given.
-if test "${enable_cgi+set}" = set; then
+if test "${enable_cgi+set}" = set; then :
   enableval=$enable_cgi;
 else
   enable_cgi=no
@@ -19246,7 +16414,7 @@
   if test "$enable_cgi" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_cgi$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_cgi$_apmod_extra_msg" >&5
 $as_echo "$enable_cgi$_apmod_extra_msg" >&6; }
   if test "$enable_cgi" != "no"; then
     case "$enable_cgi" in
@@ -19305,10 +16473,10 @@
 # mod_cgid, and it just opens up holes we don't need.  Make mod_cgi the
 # default
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_cgi" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_cgi" >&5
 $as_echo_n "checking whether to enable mod_cgi... " >&6; }
     # Check whether --enable-cgi was given.
-if test "${enable_cgi+set}" = set; then
+if test "${enable_cgi+set}" = set; then :
   enableval=$enable_cgi;
 else
   enable_cgi=yes
@@ -19343,7 +16511,7 @@
   if test "$enable_cgi" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_cgi$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_cgi$_apmod_extra_msg" >&5
 $as_echo "$enable_cgi$_apmod_extra_msg" >&6; }
   if test "$enable_cgi" != "no"; then
     case "$enable_cgi" in
@@ -19398,10 +16566,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_cgid" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_cgid" >&5
 $as_echo_n "checking whether to enable mod_cgid... " >&6; }
     # Check whether --enable-cgid was given.
-if test "${enable_cgid+set}" = set; then
+if test "${enable_cgid+set}" = set; then :
   enableval=$enable_cgid;
 else
   enable_cgid=no
@@ -19436,7 +16604,7 @@
   if test "$enable_cgid" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_cgid$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_cgid$_apmod_extra_msg" >&5
 $as_echo "$enable_cgid$_apmod_extra_msg" >&6; }
   if test "$enable_cgid" != "no"; then
     case "$enable_cgid" in
@@ -19517,102 +16685,12 @@
 
 
 if test "$MPM_NAME" = "event" ; then
-
-for ac_func in pthread_kill
-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
+    for ac_func in pthread_kill
+do :
+  ac_fn_c_check_func "$LINENO" "pthread_kill" "ac_cv_func_pthread_kill"
+if test "x$ac_cv_func_pthread_kill" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_PTHREAD_KILL 1
 _ACEOF
 
 fi
@@ -19651,13 +16729,13 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -19665,8 +16743,8 @@
   (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"
@@ -19689,11 +16767,11 @@
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
@@ -19726,102 +16804,12 @@
 
 
 if test "$MPM_NAME" = "worker" ; then
-
-for ac_func in pthread_kill
-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
+    for ac_func in pthread_kill
+do :
+  ac_fn_c_check_func "$LINENO" "pthread_kill" "ac_cv_func_pthread_kill"
+if test "x$ac_cv_func_pthread_kill" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_PTHREAD_KILL 1
 _ACEOF
 
 fi
@@ -19859,10 +16847,10 @@
 esac
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_dav_fs" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_dav_fs" >&5
 $as_echo_n "checking whether to enable mod_dav_fs... " >&6; }
     # Check whether --enable-dav-fs was given.
-if test "${enable_dav_fs+set}" = set; then
+if test "${enable_dav_fs+set}" = set; then :
   enableval=$enable_dav_fs;
 else
   enable_dav_fs=$dav_fs_enable
@@ -19897,7 +16885,7 @@
   if test "$enable_dav_fs" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_dav_fs$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_dav_fs$_apmod_extra_msg" >&5
 $as_echo "$enable_dav_fs$_apmod_extra_msg" >&6; }
   if test "$enable_dav_fs" != "no"; then
     case "$enable_dav_fs" in
@@ -19987,10 +16975,10 @@
 esac
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_dav_lock" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_dav_lock" >&5
 $as_echo_n "checking whether to enable mod_dav_lock... " >&6; }
     # Check whether --enable-dav-lock was given.
-if test "${enable_dav_lock+set}" = set; then
+if test "${enable_dav_lock+set}" = set; then :
   enableval=$enable_dav_lock;
 else
   enable_dav_lock=no
@@ -20025,7 +17013,7 @@
   if test "$enable_dav_lock" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_dav_lock$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_dav_lock$_apmod_extra_msg" >&5
 $as_echo "$enable_dav_lock$_apmod_extra_msg" >&6; }
   if test "$enable_dav_lock" != "no"; then
     case "$enable_dav_lock" in
@@ -20106,10 +17094,10 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_vhost_alias" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_vhost_alias" >&5
 $as_echo_n "checking whether to enable mod_vhost_alias... " >&6; }
     # Check whether --enable-vhost-alias was given.
-if test "${enable_vhost_alias+set}" = set; then
+if test "${enable_vhost_alias+set}" = set; then :
   enableval=$enable_vhost_alias;
 else
   enable_vhost_alias=most
@@ -20144,7 +17132,7 @@
   if test "$enable_vhost_alias" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_vhost_alias$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_vhost_alias$_apmod_extra_msg" >&5
 $as_echo "$enable_vhost_alias$_apmod_extra_msg" >&6; }
   if test "$enable_vhost_alias" != "no"; then
     case "$enable_vhost_alias" in
@@ -20199,10 +17187,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_negotiation" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_negotiation" >&5
 $as_echo_n "checking whether to enable mod_negotiation... " >&6; }
     # Check whether --enable-negotiation was given.
-if test "${enable_negotiation+set}" = set; then
+if test "${enable_negotiation+set}" = set; then :
   enableval=$enable_negotiation;
 else
   enable_negotiation=yes
@@ -20237,7 +17225,7 @@
   if test "$enable_negotiation" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_negotiation$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_negotiation$_apmod_extra_msg" >&5
 $as_echo "$enable_negotiation$_apmod_extra_msg" >&6; }
   if test "$enable_negotiation" != "no"; then
     case "$enable_negotiation" in
@@ -20292,10 +17280,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_dir" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_dir" >&5
 $as_echo_n "checking whether to enable mod_dir... " >&6; }
     # Check whether --enable-dir was given.
-if test "${enable_dir+set}" = set; then
+if test "${enable_dir+set}" = set; then :
   enableval=$enable_dir;
 else
   enable_dir=yes
@@ -20330,7 +17318,7 @@
   if test "$enable_dir" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_dir$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_dir$_apmod_extra_msg" >&5
 $as_echo "$enable_dir$_apmod_extra_msg" >&6; }
   if test "$enable_dir" != "no"; then
     case "$enable_dir" in
@@ -20385,10 +17373,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_imagemap" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_imagemap" >&5
 $as_echo_n "checking whether to enable mod_imagemap... " >&6; }
     # Check whether --enable-imagemap was given.
-if test "${enable_imagemap+set}" = set; then
+if test "${enable_imagemap+set}" = set; then :
   enableval=$enable_imagemap;
 else
   enable_imagemap=most
@@ -20423,7 +17411,7 @@
   if test "$enable_imagemap" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_imagemap$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_imagemap$_apmod_extra_msg" >&5
 $as_echo "$enable_imagemap$_apmod_extra_msg" >&6; }
   if test "$enable_imagemap" != "no"; then
     case "$enable_imagemap" in
@@ -20478,10 +17466,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_actions" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_actions" >&5
 $as_echo_n "checking whether to enable mod_actions... " >&6; }
     # Check whether --enable-actions was given.
-if test "${enable_actions+set}" = set; then
+if test "${enable_actions+set}" = set; then :
   enableval=$enable_actions;
 else
   enable_actions=yes
@@ -20516,7 +17504,7 @@
   if test "$enable_actions" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_actions$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_actions$_apmod_extra_msg" >&5
 $as_echo "$enable_actions$_apmod_extra_msg" >&6; }
   if test "$enable_actions" != "no"; then
     case "$enable_actions" in
@@ -20571,10 +17559,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_speling" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_speling" >&5
 $as_echo_n "checking whether to enable mod_speling... " >&6; }
     # Check whether --enable-speling was given.
-if test "${enable_speling+set}" = set; then
+if test "${enable_speling+set}" = set; then :
   enableval=$enable_speling;
 else
   enable_speling=most
@@ -20609,7 +17597,7 @@
   if test "$enable_speling" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_speling$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_speling$_apmod_extra_msg" >&5
 $as_echo "$enable_speling$_apmod_extra_msg" >&6; }
   if test "$enable_speling" != "no"; then
     case "$enable_speling" in
@@ -20664,10 +17652,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_userdir" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_userdir" >&5
 $as_echo_n "checking whether to enable mod_userdir... " >&6; }
     # Check whether --enable-userdir was given.
-if test "${enable_userdir+set}" = set; then
+if test "${enable_userdir+set}" = set; then :
   enableval=$enable_userdir;
 else
   enable_userdir=yes
@@ -20702,7 +17690,7 @@
   if test "$enable_userdir" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_userdir$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_userdir$_apmod_extra_msg" >&5
 $as_echo "$enable_userdir$_apmod_extra_msg" >&6; }
   if test "$enable_userdir" != "no"; then
     case "$enable_userdir" in
@@ -20757,10 +17745,10 @@
   fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_alias" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_alias" >&5
 $as_echo_n "checking whether to enable mod_alias... " >&6; }
     # Check whether --enable-alias was given.
-if test "${enable_alias+set}" = set; then
+if test "${enable_alias+set}" = set; then :
   enableval=$enable_alias;
 else
   enable_alias=yes
@@ -20795,7 +17783,7 @@
   if test "$enable_alias" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_alias$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_alias$_apmod_extra_msg" >&5
 $as_echo "$enable_alias$_apmod_extra_msg" >&6; }
   if test "$enable_alias" != "no"; then
     case "$enable_alias" in
@@ -20851,10 +17839,10 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_rewrite" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_rewrite" >&5
 $as_echo_n "checking whether to enable mod_rewrite... " >&6; }
     # Check whether --enable-rewrite was given.
-if test "${enable_rewrite+set}" = set; then
+if test "${enable_rewrite+set}" = set; then :
   enableval=$enable_rewrite;
 else
   enable_rewrite=most
@@ -20889,7 +17877,7 @@
   if test "$enable_rewrite" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_rewrite$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_rewrite$_apmod_extra_msg" >&5
 $as_echo "$enable_rewrite$_apmod_extra_msg" >&6; }
   if test "$enable_rewrite" != "no"; then
     case "$enable_rewrite" in
@@ -20948,11 +17936,7 @@
 
 apr_old_cppflags=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $INCLUDES"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <apr.h>
@@ -20962,7 +17946,7 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then
+  $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then :
   ac_cv_define_APR_HAS_DSO=yes
 else
   ac_cv_define_APR_HAS_DSO=no
@@ -20975,15 +17959,11 @@
 case "x$enable_so" in
     "xyes")
         if test $ac_cv_define_APR_HAS_DSO = "no"; then
-            { { $as_echo "$as_me:$LINENO: error: mod_so has been requested but cannot be built on your system" >&5
-$as_echo "$as_me: error: mod_so has been requested but cannot be built on your system" >&2;}
-   { (exit 1); exit 1; }; }
+            as_fn_error "mod_so has been requested but cannot be built on your system" "$LINENO" 5
         fi
         ;;
     "xshared")
-        { { $as_echo "$as_me:$LINENO: error: mod_so can not be built as a shared DSO" >&5
-$as_echo "$as_me: error: mod_so can not be built as a shared DSO" >&2;}
-   { (exit 1); exit 1; }; }
+        as_fn_error "mod_so can not be built as a shared DSO" "$LINENO" 5
         ;;
     "xno")
         ;;
@@ -21029,21 +18009,17 @@
 
 if test "$sharedobjs" = "yes"; then
     if test $ac_cv_define_APR_HAS_DSO = "no"; then
-        { { $as_echo "$as_me:$LINENO: error: shared objects have been requested but cannot be built since mod_so cannot be built" >&5
-$as_echo "$as_me: error: shared objects have been requested but cannot be built since mod_so cannot be built" >&2;}
-   { (exit 1); exit 1; }; }
+        as_fn_error "shared objects have been requested but cannot be built since mod_so cannot be built" "$LINENO" 5
     elif test $enable_so = "no"; then
-        { { $as_echo "$as_me:$LINENO: error: shared objects have been requested but cannot be built since mod_so was disabled" >&5
-$as_echo "$as_me: error: shared objects have been requested but cannot be built since mod_so was disabled" >&2;}
-   { (exit 1); exit 1; }; }
+        as_fn_error "shared objects have been requested but cannot be built since mod_so was disabled" "$LINENO" 5
     fi
 fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether to enable mod_so" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_so" >&5
 $as_echo_n "checking whether to enable mod_so... " >&6; }
     # Check whether --enable-so was given.
-if test "${enable_so+set}" = set; then
+if test "${enable_so+set}" = set; then :
   enableval=$enable_so;
 else
   enable_so=$enable_so
@@ -21078,7 +18054,7 @@
   if test "$enable_so" != "no"; then
             :
   fi
-  { $as_echo "$as_me:$LINENO: result: $enable_so$_apmod_extra_msg" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_so$_apmod_extra_msg" >&5
 $as_echo "$enable_so$_apmod_extra_msg" >&6; }
   if test "$enable_so" != "no"; then
     case "$enable_so" in
@@ -21160,13 +18136,13 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -21174,8 +18150,8 @@
   (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"
@@ -21198,11 +18174,11 @@
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
@@ -21298,7 +18274,7 @@
 
 
 # Check whether --with-program-name was given.
-if test "${with_program_name+set}" = set; then
+if test "${with_program_name+set}" = set; then :
   withval=$with_program_name;
   progname="$withval"
 else
@@ -21310,7 +18286,7 @@
 # SuExec parameters
 
 # Check whether --with-suexec-bin was given.
-if test "${with_suexec_bin+set}" = set; then
+if test "${with_suexec_bin+set}" = set; then :
   withval=$with_suexec_bin;
 
 cat >>confdefs.h <<_ACEOF
@@ -21323,7 +18299,7 @@
 
 
 # Check whether --with-suexec-caller was given.
-if test "${with_suexec_caller+set}" = set; then
+if test "${with_suexec_caller+set}" = set; then :
   withval=$with_suexec_caller;
 
 cat >>confdefs.h <<_ACEOF
@@ -21335,7 +18311,7 @@
 
 
 # Check whether --with-suexec-userdir was given.
-if test "${with_suexec_userdir+set}" = set; then
+if test "${with_suexec_userdir+set}" = set; then :
   withval=$with_suexec_userdir;
 
 cat >>confdefs.h <<_ACEOF
@@ -21347,7 +18323,7 @@
 
 
 # Check whether --with-suexec-docroot was given.
-if test "${with_suexec_docroot+set}" = set; then
+if test "${with_suexec_docroot+set}" = set; then :
   withval=$with_suexec_docroot;
 
 cat >>confdefs.h <<_ACEOF
@@ -21359,7 +18335,7 @@
 
 
 # Check whether --with-suexec-uidmin was given.
-if test "${with_suexec_uidmin+set}" = set; then
+if test "${with_suexec_uidmin+set}" = set; then :
   withval=$with_suexec_uidmin;
 
 cat >>confdefs.h <<_ACEOF
@@ -21371,7 +18347,7 @@
 
 
 # Check whether --with-suexec-gidmin was given.
-if test "${with_suexec_gidmin+set}" = set; then
+if test "${with_suexec_gidmin+set}" = set; then :
   withval=$with_suexec_gidmin;
 
 cat >>confdefs.h <<_ACEOF
@@ -21383,7 +18359,7 @@
 
 
 # Check whether --with-suexec-logfile was given.
-if test "${with_suexec_logfile+set}" = set; then
+if test "${with_suexec_logfile+set}" = set; then :
   withval=$with_suexec_logfile;
 
 cat >>confdefs.h <<_ACEOF
@@ -21395,7 +18371,7 @@
 
 
 # Check whether --with-suexec-safepath was given.
-if test "${with_suexec_safepath+set}" = set; then
+if test "${with_suexec_safepath+set}" = set; then :
   withval=$with_suexec_safepath;
 
 cat >>confdefs.h <<_ACEOF
@@ -21407,7 +18383,7 @@
 
 
 # Check whether --with-suexec-umask was given.
-if test "${with_suexec_umask+set}" = set; then
+if test "${with_suexec_umask+set}" = set; then :
   withval=$with_suexec_umask;
 
 cat >>confdefs.h <<_ACEOF
@@ -21434,24 +18410,18 @@
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define AP_USING_AUTOCONF 1
-_ACEOF
+$as_echo "#define AP_USING_AUTOCONF 1" >>confdefs.h
 
 
 if test "$SINGLE_LISTEN_UNSERIALIZED_ACCEPT" = "1"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define SINGLE_LISTEN_UNSERIALIZED_ACCEPT 1
-_ACEOF
+$as_echo "#define SINGLE_LISTEN_UNSERIALIZED_ACCEPT 1" >>confdefs.h
 
 fi
 
 if test "$AP_NONBLOCK_WHEN_MULTI_LISTEN" = "1"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define AP_NONBLOCK_WHEN_MULTI_LISTEN 1
-_ACEOF
+$as_echo "#define AP_NONBLOCK_WHEN_MULTI_LISTEN 1" >>confdefs.h
 
 fi
 
@@ -21991,13 +18961,13 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -22005,8 +18975,8 @@
   (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"
@@ -22029,11 +18999,11 @@
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
@@ -22053,8 +19023,8 @@
   ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
@@ -22066,9 +19036,10 @@
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -22078,17 +19049,18 @@
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
+
 SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
-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
@@ -22096,23 +19068,15 @@
   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
@@ -22120,7 +19084,13 @@
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -22131,7 +19101,7 @@
     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\\(.*\\)"`;;
@@ -22154,14 +19124,7 @@
   }
 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
 # there to prevent editors from complaining about space-tab.
@@ -22170,15 +19133,15 @@
 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
 
      ;;
@@ -22190,12 +19153,16 @@
 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
 
-# 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
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -22207,7 +19174,89 @@
 LANGUAGE=C
 export LANGUAGE
 
-# Required to use basename.
+# 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
+
+
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -22221,8 +19270,12 @@
   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\(//\)$' \| \
@@ -22242,76 +19295,25 @@
 	  }
 	  s/.*/./; q'`
 
-# CDPATH.
-$as_unset CDPATH
+# 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" || {
-
-  # 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 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   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
@@ -22340,8 +19342,56 @@
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -22360,10 +19410,10 @@
       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
   '
@@ -22378,13 +19428,19 @@
 
 
 exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
 
-# Save the log message, to keep $[0] and so on meaningful, and to
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+generated by GNU Autoconf 2.64.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -22416,10 +19472,11 @@
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
 
-Usage: $0 [OPTION]... [FILE]...
+Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
@@ -22441,16 +19498,16 @@
 Configuration commands:
 $config_commands
 
-Report bugs to <bug-autoconf@gnu.org>."
+Report bugs to the package provider."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.63,
+configured by $0, generated by GNU Autoconf 2.64,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -22491,20 +19548,19 @@
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
-    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
-    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { $as_echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
+    as_fn_error "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
@@ -22512,11 +19568,10 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { $as_echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
+  -*) as_fn_error "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
 
-  *) ac_config_targets="$ac_config_targets $1"
+  *) as_fn_append ac_config_targets " $1"
      ac_need_defaults=false ;;
 
   esac
@@ -22599,9 +19654,7 @@
     "build/config_vars.sh") CONFIG_FILES="$CONFIG_FILES build/config_vars.sh" ;;
     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
 
-  *) { { $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; }; };;
+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -22628,7 +19681,7 @@
   trap 'exit_status=$?
   { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
 ' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
+  trap 'as_fn_exit 1' 1 2 13 15
 }
 # Create a (secure) tmp directory for tmp files.
 
@@ -22639,11 +19692,7 @@
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} ||
-{
-   $as_echo "$as_me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -22651,11 +19700,16 @@
 if test -n "$CONFIG_FILES"; then
 
 
-ac_cr='
-'
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
+  ac_cs_awk_cr='\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
@@ -22669,24 +19723,18 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
 ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    { { $as_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; }; }
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { $as_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; }; }
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -22775,9 +19823,7 @@
 else
   cat
 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
-   { (exit 1); exit 1; }; }
+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
@@ -22818,9 +19864,7 @@
   if test -z "$ac_t"; then
     break
   elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -22905,9 +19949,7 @@
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -22920,9 +19962,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
-   { (exit 1); exit 1; }; };;
+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -22950,12 +19990,10 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      ac_file_inputs="$ac_file_inputs '$ac_f'"
+      as_fn_append ac_file_inputs " '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
@@ -22966,7 +20004,7 @@
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
 $as_echo "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
@@ -22979,9 +20017,7 @@
 
     case $ac_tag in
     *:-:* | *:-) cat >"$tmp/stdin" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; } ;;
+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -23009,47 +20045,7 @@
 	    q
 	  }
 	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    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; }; }; }
+  as_dir="$ac_dir"; as_fn_mkdir_p
   ac_builddir=.
 
 case "$ac_dir" in
@@ -23097,7 +20093,6 @@
 # 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
@@ -23107,12 +20102,11 @@
 /@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:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -23122,7 +20116,7 @@
   s&@infodir@&$infodir&g
   s&@localedir@&$localedir&g
   s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
+  s&\\\${datarootdir}&$datarootdir&g' ;;
 esac
 _ACEOF
 
@@ -23149,14 +20143,12 @@
 $ac_datarootdir_hack
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
@@ -23166,9 +20158,7 @@
   -) cat "$tmp/out" && rm -f "$tmp/out";;
   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -23179,29 +20169,23 @@
       $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
     } >"$tmp/config.h" \
-      || { { $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; }; }
+      || as_fn_error "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$tmp/config.h" "$ac_file" \
-	|| { { $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; }; }
+	|| as_fn_error "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-$as_echo "$as_me: error: could not create -" >&2;}
-   { (exit 1); exit 1; }; }
+      || as_fn_error "could not create -" "$LINENO" 5
   fi
  ;;
 
-  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
 $as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
@@ -23214,15 +20198,12 @@
 done # for ac_tag
 
 
-{ (exit 0); exit 0; }
+as_fn_exit 0
 _ACEOF
-chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -23243,10 +20224,10 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
+  $ac_cs_success || as_fn_exit $?
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
Index: docs/man/tr/ab.8
===================================================================
--- docs/man/tr/ab.8	(revision 61)
+++ docs/man/tr/ab.8	(working copy)
@@ -19,7 +19,7 @@
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.TH "AB" 8 "2009-02-16" "Apache HTTP Sunucusu" "ab"
+.TH "AB" 8 "2009-09-18" "Apache HTTP Sunucusu" "ab"
 .nh
 .SH İSİM
 ab \- Apache HTTP sunucusu başarım ölçme aracı
@@ -27,7 +27,7 @@
 .SH "KULLANIM"
  
 .PP
-\fBab\fR [ -\fBA\fR \fIyetkili-kullanıcı:parola\fR ] [ -\fBb\fR \fItampon-boyu\fR ] [ -\fBc\fR \fIbağlantı-sayısı\fR ] [ -\fBC\fR \fIçerez-ismi=değer\fR ] [ -\fBd\fR ] [ -\fBe\fR \fIcsv-dosyası\fR ] [ -\fBf\fR \fIprotokol\fR ] [ -\fBg\fR \fIgnuplot-dosyası\fR ] [ -\fBh\fR ] [ -\fBH\fR \fIözel-başlık\fR ] [ -\fBi\fR ] [ -\fBk\fR ] [ -\fBn\fR \fIistek-sayısı\fR ] [ -\fBp\fR \fIPOST-dosyası\fR ] [ -\fBP\fR \fIvekil-yetkilisi:parola\fR ] [ -\fBq\fR ] [ -\fBr\fR ] [ -\fBs\fR ] [ -\fBS\fR ] [ -\fBt\fR \fIsaniye\fR ] [ -\fBT\fR \fIiçerik-türü\fR ] [ -\fBv\fR \fIayrıntı-düzeyi\fR] [ -\fBV\fR ] [ -\fBw\fR ] [ -\fBx\fR \fI<table>-öznitelikleri\fR ] [ -\fBX\fR \fIvekil\fR[:\fIport\fR] ] [ -\fBy\fR \fI<tr>-öznitelikleri\fR ] [ -\fBz\fR \fI<td>-öznitelikleri\fR ] [ -\fBZ\fR \fIşifre-kümesi\fR ] [http[s]://]\fIkonakadı\fR[:\fIport\fR]/\fIdizin\fR
+\fBab\fR [ -\fBA\fR \fIyetkili-kullanıcı:parola\fR ] [ -\fBb\fR \fItampon-boyu\fR ] [ -\fBc\fR \fIbağlantı-sayısı\fR ] [ -\fBC\fR \fIçerez-ismi=değer\fR ] [ -\fBd\fR ] [ -\fBe\fR \fIcsv-dosyası\fR ] [ -\fBf\fR \fIprotokol\fR ] [ -\fBg\fR \fIgnuplot-dosyası\fR ] [ -\fBh\fR ] [ -\fBH\fR \fIözel-başlık\fR ] [ -\fBi\fR ] [ -\fBk\fR ] [ -\fBn\fR \fIistek-sayısı\fR ] [ -\fBp\fR \fIPOST-dosyası\fR ] [ -\fBP\fR \fIvekil-yetkilisi:parola\fR ] [ -\fBq\fR ] [ -\fBr\fR ] [ -\fBs\fR ] [ -\fBS\fR ] [ -\fBt\fR \fIsaniye\fR ] [ -\fBT\fR \fIiçerik-türü\fR ] [ -\fBu\fR \fIPUT-dosyası\fR ] [ -\fBv\fR \fIayrıntı-düzeyi\fR] [ -\fBV\fR ] [ -\fBw\fR ] [ -\fBx\fR \fI<table>-öznitelikleri\fR ] [ -\fBX\fR \fIvekil\fR[:\fIport\fR] ] [ -\fBy\fR \fI<tr>-öznitelikleri\fR ] [ -\fBz\fR \fI<td>-öznitelikleri\fR ] [ -\fBZ\fR \fIşifre-kümesi\fR ] [http[s]://]\fIkonakadı\fR[:\fIport\fR]/\fIdizin\fR
  
 
 .SH "ÖZET"
@@ -101,8 +101,11 @@
 Ölçümleme işleminin ne kadar süreyle uygulanacağı belirtilir\&. Dahili olarak \fB-n 50000\fR seçeneği uygulanır\&. Bunu belli bir süreye göre kıyaslama yapmak amacıyla kullanabilirsiniz\&. Öntanımlı olarak bir süre kısıtlaması yoktur\&.  
 .TP
 \fB-T\fR \fIiçerik-türü\fR
-POST verisi için kullanılacak içerik türü belirtilir\&. Örnek: application/x-www-form-urlencoded\&. Öntanımlı değer: text/plain\&.  
+POST/PUT verisi için kullanılacak içerik türü belirtilir\&. Örnek: application/x-www-form-urlencoded\&. Öntanımlı değer: text/plain\&.  
 .TP
+-u \fIPUT-dosyası\fR
+PUT verisini içeren dosya\&. Ayrıca, -T seçeneğini belirtmeyi de unutmayın\&.  
+.TP
 \fB-v\fR \fIayrıntı-düzeyi\fR
 Çıktının ayrıntı düzeyi belirtilir\&. 4 ve üstü ile başlıklar hakkında bilgi, 3 ve üstü ile yanıt kodları (404, 200, vb\&.), 2 ve üstü ile ise uyarı ve bilgi iletileri gösterilir\&.  
 .TP
Index: docs/man/ab.8
===================================================================
--- docs/man/ab.8	(revision 61)
+++ docs/man/ab.8	(working copy)
@@ -19,7 +19,7 @@
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.TH "AB" 8 "2008-10-23" "Apache HTTP Server" "ab"
+.TH "AB" 8 "2009-09-14" "Apache HTTP Server" "ab"
 
 .SH NAME
 ab \- Apache HTTP server benchmarking tool
@@ -27,7 +27,7 @@
 .SH "SYNOPSIS"
  
 .PP
-\fBab\fR [ -\fBA\fR \fIauth-username\fR:\fIpassword\fR ] [ -\fBb\fR \fIwindowsize\fR ] [ -\fBc\fR \fIconcurrency\fR ] [ -\fBC\fR \fIcookie-name\fR=\fIvalue\fR ] [ -\fBd\fR ] [ -\fBe\fR \fIcsv-file\fR ] [ -\fBf\fR \fIprotocol\fR ] [ -\fBg\fR \fIgnuplot-file\fR ] [ -\fBh\fR ] [ -\fBH\fR \fIcustom-header\fR ] [ -\fBi\fR ] [ -\fBk\fR ] [ -\fBn\fR \fIrequests\fR ] [ -\fBp\fR \fIPOST-file\fR ] [ -\fBP\fR \fIproxy-auth-username\fR:\fIpassword\fR ] [ -\fBq\fR ] [ -\fBr\fR ] [ -\fBs\fR ] [ -\fBS\fR ] [ -\fBt\fR \fItimelimit\fR ] [ -\fBT\fR \fIcontent-type\fR ] [ -\fBv\fR \fIverbosity\fR] [ -\fBV\fR ] [ -\fBw\fR ] [ -\fBx\fR \fI<table>-attributes\fR ] [ -\fBX\fR \fIproxy\fR[:\fIport\fR] ] [ -\fBy\fR \fI<tr>-attributes\fR ] [ -\fBz\fR \fI<td>-attributes\fR ] [ -\fBZ\fR \fIciphersuite\fR ] [http[s]://]\fIhostname\fR[:\fIport\fR]/\fIpath\fR
+\fBab\fR [ -\fBA\fR \fIauth-username\fR:\fIpassword\fR ] [ -\fBb\fR \fIwindowsize\fR ] [ -\fBc\fR \fIconcurrency\fR ] [ -\fBC\fR \fIcookie-name\fR=\fIvalue\fR ] [ -\fBd\fR ] [ -\fBe\fR \fIcsv-file\fR ] [ -\fBf\fR \fIprotocol\fR ] [ -\fBg\fR \fIgnuplot-file\fR ] [ -\fBh\fR ] [ -\fBH\fR \fIcustom-header\fR ] [ -\fBi\fR ] [ -\fBk\fR ] [ -\fBn\fR \fIrequests\fR ] [ -\fBp\fR \fIPOST-file\fR ] [ -\fBP\fR \fIproxy-auth-username\fR:\fIpassword\fR ] [ -\fBq\fR ] [ -\fBr\fR ] [ -\fBs\fR ] [ -\fBS\fR ] [ -\fBt\fR \fItimelimit\fR ] [ -\fBT\fR \fIcontent-type\fR ] [ -\fBu\fR \fIPUT-file\fR ] [ -\fBv\fR \fIverbosity\fR] [ -\fBV\fR ] [ -\fBw\fR ] [ -\fBx\fR \fI<table>-attributes\fR ] [ -\fBX\fR \fIproxy\fR[:\fIport\fR] ] [ -\fBy\fR \fI<tr>-attributes\fR ] [ -\fBz\fR \fI<td>-attributes\fR ] [ -\fBZ\fR \fIciphersuite\fR ] [http[s]://]\fIhostname\fR[:\fIport\fR]/\fIpath\fR
  
 
 .SH "SUMMARY"
@@ -101,8 +101,11 @@
 Maximum number of seconds to spend for benchmarking\&. This implies a -n 50000 internally\&. Use this to benchmark the server within a fixed total amount of time\&. Per default there is no timelimit\&.  
 .TP
 -T \fIcontent-type\fR
-Content-type header to use for POST data, eg\&. application/x-www-form-urlencoded\&. Default: text/plain\&.  
+Content-type header to use for POST/PUT data, eg\&. application/x-www-form-urlencoded\&. Default: text/plain\&.  
 .TP
+-u \fIPUT-file\fR
+File containing data to PUT\&. Remember to also set -T\&.  
+.TP
 -v \fIverbosity\fR
 Set verbosity level - 4 and above prints information on headers, 3 and above prints response codes (404, 200, etc\&.), 2 and above prints warnings and info\&.  
 .TP
Index: docs/manual/developer/thread_safety.html.en
===================================================================
--- docs/manual/developer/thread_safety.html.en	(revision 61)
+++ docs/manual/developer/thread_safety.html.en	(working copy)
@@ -174,103 +174,99 @@
         across threads. If <code>strtok()</code> and
         <code>gethostbyname()</code> are thread-safe on your OS, c-client
         <em>may</em> be thread-safe.</td></tr>
-<tr class="odd"><td><a href="http://www.fastio.com/">cpdflib</a></td>
+<tr class="odd"><td><a href="http://www.ijg.org/files/">libcrypt</a></td>
         <td> </td>
         <td>?</td>
         <td> </td></tr>
-<tr><td><a href="http://www.ijg.org/files/">libcrypt</a></td>
+<tr><td><a href="http://expat.sourceforge.net/">Expat</a></td>
         <td> </td>
-        <td>?</td>
-        <td> </td></tr>
-<tr class="odd"><td><a href="http://expat.sourceforge.net/">Expat</a></td>
-        <td> </td>
         <td>Yes</td>
         <td>Need a separate parser instance per thread</td></tr>
-<tr><td><a href="http://www.freetds.org/">FreeTDS</a></td>
+<tr class="odd"><td><a href="http://www.freetds.org/">FreeTDS</a></td>
         <td> </td>
         <td>?</td>
         <td> </td></tr>
-<tr class="odd"><td><a href="http://www.freetype.org/">FreeType</a></td>
+<tr><td><a href="http://www.freetype.org/">FreeType</a></td>
         <td> </td>
         <td>?</td>
         <td> </td></tr>
-<tr><td><a href="http://www.boutell.com/gd/">GD 1.8.x</a></td>
+<tr class="odd"><td><a href="http://www.boutell.com/gd/">GD 1.8.x</a></td>
         <td> </td>
         <td>?</td>
         <td> </td></tr>
-<tr class="odd"><td><a href="http://www.boutell.com/gd/">GD 2.0.x</a></td>
+<tr><td><a href="http://www.boutell.com/gd/">GD 2.0.x</a></td>
         <td> </td>
         <td>?</td>
         <td> </td></tr>
-<tr><td><a href="http://www.gnu.org/software/gdbm/gdbm.html">gdbm</a></td>
+<tr class="odd"><td><a href="http://www.gnu.org/software/gdbm/gdbm.html">gdbm</a></td>
         <td> </td>
         <td>No</td>
         <td>Errors returned via a static <code>gdbm_error</code>
         variable</td></tr>
-<tr class="odd"><td><a href="http://www.imagemagick.org/">ImageMagick</a></td>
+<tr><td><a href="http://www.imagemagick.org/">ImageMagick</a></td>
         <td>5.2.2</td>
         <td>Yes</td>
-        <td>ImageMagick docs claim it is thread safe since version 5.2.2 (see <a href="http://www.cise.ufl.edu/depot/www/ImageMagick/www/Changelog.html">Change log</a>).
+        <td>ImageMagick docs claim it is thread safe since version 5.2.2 (see <a href="http://www.imagemagick.com/www/changelog.html">Change log</a>).
         </td></tr>
-<tr><td><a href="http://www.enlightenment.org/pages/imlib2.html">Imlib2</a></td>
+<tr class="odd"><td><a href="http://www.enlightenment.org/p.php?p=about/efl&amp;l=en">Imlib2</a></td>
         <td> </td>
         <td>?</td>
         <td> </td></tr>
-<tr class="odd"><td><a href="http://www.ijg.org/files/">libjpeg</a></td>
+<tr><td><a href="http://www.ijg.org/files/">libjpeg</a></td>
         <td>v6b</td>
         <td>?</td>
         <td> </td></tr>
-<tr><td><a href="http://mysql.com">libmysqlclient</a></td>
+<tr class="odd"><td><a href="http://mysql.com">libmysqlclient</a></td>
         <td> </td>
         <td>Yes</td>
         <td>Use mysqlclient_r library variant to ensure thread-safety.  For
-            more information, please read <a href="http://www.mysql.com/doc/en/Threaded_clients.html">http://www.mysql.com/doc/en/Threaded_clients.html</a>.</td></tr>
-<tr class="odd"><td><a href="http://www.opaque.net/ming/">Ming</a></td>
+            more information, please read <a href="http://dev.mysql.com/doc/mysql/en/Threaded_clients.html">http://dev.mysql.com/doc/mysql/en/Threaded_clients.html</a>.</td></tr>
+<tr><td><a href="http://www.opaque.net/ming/">Ming</a></td>
         <td>0.2a</td>
         <td>?</td>
         <td> </td></tr>
-<tr><td><a href="http://net-snmp.sourceforge.net/">Net-SNMP</a></td>
+<tr class="odd"><td><a href="http://net-snmp.sourceforge.net/">Net-SNMP</a></td>
         <td>5.0.x</td>
         <td>?</td>
         <td> </td></tr>
-<tr class="odd"><td><a href="http://www.openldap.org/">OpenLDAP</a></td>
+<tr><td><a href="http://www.openldap.org/">OpenLDAP</a></td>
         <td>2.1.x</td>
         <td>Yes</td>
         <td>Use <code>ldap_r</code> library variant to ensure
         thread-safety.</td></tr>
-<tr><td><a href="http://www.openssl.org/">OpenSSL</a></td>
+<tr class="odd"><td><a href="http://www.openssl.org/">OpenSSL</a></td>
         <td>0.9.6g</td>
         <td>Yes</td>
         <td>Requires proper usage of <code>CRYPTO_num_locks</code>,
         <code>CRYPTO_set_locking_callback</code>,
         <code>CRYPTO_set_id_callback</code></td></tr>
-<tr class="odd"><td><a href="http://www.oracle.com/">liboci8 (Oracle 8+)</a></td>
+<tr><td><a href="http://www.oracle.com/">liboci8 (Oracle 8+)</a></td>
         <td>8.x,9.x</td>
         <td>?</td>
         <td> </td></tr>
-<tr><td><a href="http://pdflib.com/">pdflib</a></td>
+<tr class="odd"><td><a href="http://pdflib.com/">pdflib</a></td>
         <td>5.0.x</td>
         <td>Yes</td>
         <td>PDFLib docs claim it is thread safe; changes.txt indicates it
-            has been partially thread-safe since V1.91: <a href="http://www.pdflib.com/products/pdflib/index.html">http://www.pdflib.com/products/pdflib/index.html</a>.</td></tr>
-<tr class="odd"><td><a href="http://www.libpng.org/pub/png/libpng.html">libpng</a></td>
+            has been partially thread-safe since V1.91: <a href="http://www.pdflib.com/products/pdflib-family/pdflib/">http://www.pdflib.com/products/pdflib-family/pdflib/</a>.</td></tr>
+<tr><td><a href="http://www.libpng.org/pub/png/libpng.html">libpng</a></td>
         <td>1.0.x</td>
         <td>?</td>
         <td> </td></tr>
-<tr><td><a href="http://www.libpng.org/pub/png/libpng.html">libpng</a></td>
+<tr class="odd"><td><a href="http://www.libpng.org/pub/png/libpng.html">libpng</a></td>
         <td>1.2.x</td>
         <td>?</td>
         <td> </td></tr>
-<tr class="odd"><td><a href="http://www.postgresql.org/idocs/index.php?libpq-threading.html">libpq (PostgreSQL)</a></td>
-        <td>7.x</td>
+<tr><td><a href="http://www.postgresql.org/docs/8.4/static/libpq-threading.html">libpq (PostgreSQL)</a></td>
+        <td>8.x</td>
         <td>Yes</td>
         <td>Don't share connections across threads and watch out for
         <code>crypt()</code> calls</td></tr>
-<tr><td><a href="http://www.gingerall.com/charlie/ga/xml/p_sab.xml">Sablotron</a></td>
+<tr class="odd"><td><a href="http://www.gingerall.com/charlie/ga/xml/p_sab.xml">Sablotron</a></td>
         <td>0.95</td>
         <td>?</td>
         <td /></tr>
-<tr class="odd"><td><a href="http://www.gzip.org/zlib/">zlib</a></td>
+<tr><td><a href="http://www.gzip.org/zlib/">zlib</a></td>
         <td>1.1.4</td>
         <td>Yes</td>
         <td>Relies upon thread-safe zalloc and zfree functions  Default is to
Index: docs/manual/env.html.en
===================================================================
--- docs/manual/env.html.en	(revision 61)
+++ docs/manual/env.html.en	(working copy)
@@ -93,7 +93,7 @@
         Apache configuration and passed from the shell, CGI scripts and
         SSI pages are provided with a set of environment variables
         containing meta-information about the request as required by
-        the <a href="http://cgi-spec.golux.com/">CGI
+        the <a href="http://www.w3.org/CGI/">CGI
         specification</a>.</p>
 
     
@@ -283,7 +283,7 @@
     
 
     <h3><a name="no-cache" id="no-cache">no-cache</a></h3>
-        <p><em>Available in versions after 2.2.11</em></p>
+        <p><em>Available in versions 2.2.12 and later</em></p>
 
         <p>When set, <code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code> will not save an otherwise
         cacheable response.  This environment variable does not influence
Index: docs/manual/howto/auth.html.ja.utf8
===================================================================
--- docs/manual/howto/auth.html.ja.utf8	(revision 61)
+++ docs/manual/howto/auth.html.ja.utf8	(working copy)
@@ -20,7 +20,8 @@
 <div class="toplang">
 <p><span>Available Languages: </span><a href="../en/howto/auth.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/howto/auth.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/howto/auth.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/howto/auth.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/howto/auth.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">This translation may be out of date. Check the
             English version for recent changes.</div>
@@ -379,7 +380,8 @@
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/howto/auth.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/howto/auth.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/howto/auth.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/howto/auth.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/howto/auth.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
 <p class="apache">Copyright 2009 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
Index: docs/manual/howto/cgi.html.ja.utf8
===================================================================
--- docs/manual/howto/cgi.html.ja.utf8	(revision 61)
+++ docs/manual/howto/cgi.html.ja.utf8	(working copy)
@@ -22,6 +22,8 @@
 <a href="../ja/howto/cgi.html" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/howto/cgi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
 </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#intro">はじめに</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#configuring">CGI を許可するように Apache を設定する</a></li>
Index: docs/manual/howto/auth.html.ko.euc-kr
===================================================================
--- docs/manual/howto/auth.html.ko.euc-kr	(revision 61)
+++ docs/manual/howto/auth.html.ko.euc-kr	(working copy)
@@ -22,7 +22,8 @@
 <div class="toplang">
 <p><span>������ ���: </span><a href="../en/howto/auth.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/howto/auth.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/howto/auth.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/howto/auth.html" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/howto/auth.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">�� ������ �ֽ��� ������ �ƴմϴ�.
             �ֱٿ� ����� ������ ���� ������ �����ϼ���.</div>
@@ -316,7 +317,8 @@
 <div class="bottomlang">
 <p><span>������ ���: </span><a href="../en/howto/auth.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/howto/auth.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/howto/auth.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/howto/auth.html" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/howto/auth.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
 <p class="apache">Copyright 2009 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">���</a> | <a href="../mod/directives.html">���þ��</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">���</a> | <a href="../sitemap.html">����Ʈ��</a></p></div>
Index: docs/manual/howto/auth.html
===================================================================
--- docs/manual/howto/auth.html	(revision 61)
+++ docs/manual/howto/auth.html	(working copy)
@@ -11,3 +11,7 @@
 URI: auth.html.ko.euc-kr
 Content-Language: ko
 Content-type: text/html; charset=EUC-KR
+
+URI: auth.html.tr.utf8
+Content-Language: tr
+Content-type: text/html; charset=UTF-8
Index: docs/manual/howto/auth.html.en
===================================================================
--- docs/manual/howto/auth.html.en	(revision 61)
+++ docs/manual/howto/auth.html.en	(working copy)
@@ -20,7 +20,8 @@
 <div class="toplang">
 <p><span>Available Languages: </span><a href="../en/howto/auth.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/howto/auth.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/howto/auth.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/howto/auth.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/howto/auth.html" hreflang="tr" rel="alternate" title="T�rk�e">&nbsp;tr&nbsp;</a></p>
 </div>
 
     <p>Authentication is any process by which you verify that
@@ -388,7 +389,8 @@
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/howto/auth.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/howto/auth.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/howto/auth.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/howto/auth.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/howto/auth.html" hreflang="tr" rel="alternate" title="T�rk�e">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
 <p class="apache">Copyright 2009 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
Index: docs/manual/howto/cgi.html.en
===================================================================
--- docs/manual/howto/cgi.html.en	(revision 61)
+++ docs/manual/howto/cgi.html.en	(working copy)
@@ -530,7 +530,7 @@
     specification, which has all the details on the operation of
     CGI programs. You can find the original version at the 
     <a href="http://hoohoo.ncsa.uiuc.edu/cgi/interface.html">NCSA</a> and there is an updated draft at the 
-    <a href="http://web.golux.com/coar/cgi/">Common Gateway
+    <a href="http://www.w3.org/CGI/">Common Gateway
     Interface RFC project</a>.</p>
 
     <p>When you post a question about a CGI problem that you're
Index: docs/manual/sitemap.html.ja.utf8
===================================================================
--- docs/manual/sitemap.html.ja.utf8	(revision 61)
+++ docs/manual/sitemap.html.ja.utf8	(working copy)
@@ -221,6 +221,7 @@
 <li><a href="mod/mod_proxy_connect.html">Apache モジュール mod_proxy_connect</a></li>
 <li><a href="mod/mod_proxy_ftp.html">Apache モジュール mod_proxy_ftp</a></li>
 <li><a href="mod/mod_proxy_http.html">Apache モジュール mod_proxy_http</a></li>
+<li><a href="mod/mod_proxy_scgi.html">Apache モジュール mod_proxy_scgi</a></li>
 <li><a href="mod/mod_rewrite.html">Apache モジュール mod_rewrite</a></li>
 <li><a href="mod/mod_setenvif.html">Apache モジュール mod_setenvif</a></li>
 <li><a href="mod/mod_so.html">Apache モジュール mod_so</a></li>
Index: docs/manual/misc/security_tips.html.tr.utf8
===================================================================
--- docs/manual/misc/security_tips.html.tr.utf8	(revision 61)
+++ docs/manual/misc/security_tips.html.tr.utf8	(working copy)
@@ -171,7 +171,7 @@
       bir betik yazıp B’nin CGI veritabanını silebilir. Bu gibi durumların
       ortaya çıkmaması için betiklerin farklı kullanıcıların aidiyetlerinde
       çalışmasını sağlayan ve 1.2 sürümünden beri Apache ile dağıtılan <a href="../suexec.html">suEXEC</a> diye bir program vardır. Başka bir yol
-      da <a href="http://cgiwrap.unixtools.org/">CGIWrap</a> kullanmaktır.</p>
+      da <a href="http://cgiwrap.sourceforge.net/">CGIWrap</a> kullanmaktır.</p>
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
Index: docs/manual/misc/perf-tuning.html.en
===================================================================
--- docs/manual/misc/perf-tuning.html.en	(revision 61)
+++ docs/manual/misc/perf-tuning.html.en	(working copy)
@@ -385,7 +385,7 @@
     connection. The default <code class="directive"><a href="../mod/core.html#keepalivetimeout">KeepAliveTimeout</a></code> of <code>5</code>
     seconds attempts to minimize this effect. The tradeoff here is
     between network bandwidth and server resources. In no event
-    should you raise this above about <code>60</code> seconds, as <a href="http://www.research.digital.com/wrl/techreports/abstracts/95.4.html">
+    should you raise this above about <code>60</code> seconds, as <a href="http://www.hpl.hp.com/techreports/Compaq-DEC/WRL-95-4.html">
     most of the benefits are lost</a>.</p>
 
     
Index: docs/manual/misc/password_encryptions.html.en
===================================================================
--- docs/manual/misc/password_encryptions.html.en	(revision 61)
+++ docs/manual/misc/password_encryptions.html.en	(working copy)
@@ -50,7 +50,7 @@
        <dd>"$apr1$" + the result of an Apache-specific algorithm using an
        iterated (1,000 times) MD5 digest of various combinations of a
        random 32-bit salt and the password. See the APR source file
-       <a href="http://svn.apache.org/viewvc/apr/apr-util/trunk/crypto/apr_md5.c?view=markup">apr_md5.c</a>
+       <a href="http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/crypto/apr_md5.c?view=co">apr_md5.c</a>
        for the details of the algorithm.</dd>
     </dl>
     
@@ -163,7 +163,7 @@
     digest-authentication passwords - the MD5 hash of the string
     <code>user:realm:password</code> as a 32-character string of hexadecimal
     digits. <code>realm</code> is the Authorization Realm argument to the
-    <code class="directive"><a href="../mod/mod_authn_core.html#authname">AuthName</a></code> directive in
+    <code class="directive"><a href="../mod/core.html#authname">AuthName</a></code> directive in
     httpd.conf.</p>
     
     <h3>Database password fields for mod_dbd</h3>
Index: docs/manual/misc/rewriteguide.html.en
===================================================================
--- docs/manual/misc/rewriteguide.html.en	(revision 61)
+++ docs/manual/misc/rewriteguide.html.en	(working copy)
@@ -1300,9 +1300,9 @@
 
               <p>A sophisticated DNS-based method for
               load-balancing is to use the program
-              <code>lbnamed</code> which can be found at <a href="http://www.stanford.edu/~schemers/docs/lbnamed/lbnamed.html">
-              http://www.stanford.edu/~schemers/docs/lbnamed/lbnamed.html</a>.
-              It is a Perl 5 program in conjunction with auxilliary
+              <code>lbnamed</code> which can be found at <a href="http://www.stanford.edu/~riepel/lbnamed/">
+              http://www.stanford.edu/~riepel/lbnamed/</a>.
+              It is a Perl 5 program in conjunction with auxiliary
               tools which provides a real load-balancing for
               DNS.</p>
             </li>
Index: docs/manual/misc/perf-tuning.html.tr.utf8
===================================================================
--- docs/manual/misc/perf-tuning.html.tr.utf8	(revision 61)
+++ docs/manual/misc/perf-tuning.html.tr.utf8	(working copy)
@@ -404,7 +404,7 @@
         değeri <code>5</code> saniye olup bu etkiyi en aza indirmeye yönelik
         süredir. Burada ağ band genişliği ile sunucu kaynaklarının kullanımı
         arasında bir seçim yapmak söz konusudur. Hiçbir şey umurunuzda
-        değilse <a href="http://www.research.digital.com/wrl/techreports/abstracts/95.4.html">
+        değilse <a href="http://www.hpl.hp.com/techreports/Compaq-DEC/WRL-95-4.html">
         çoğu ayrıcalığın yitirilmesi pahasına</a> bu değeri rahatça
         <code>60</code> saniyenin üzerine çıkarabilirsiniz.</p>
 
Index: docs/manual/misc/security_tips.html.en
===================================================================
--- docs/manual/misc/security_tips.html.en	(revision 61)
+++ docs/manual/misc/security_tips.html.en	(working copy)
@@ -168,7 +168,7 @@
     <a href="../suexec.html">suEXEC</a> which is included with Apache as of
     1.2 and is called from special hooks in the Apache server code. Another
     popular way of doing this is with
-    <a href="http://cgiwrap.unixtools.org/">CGIWrap</a>.</p>
+    <a href="http://cgiwrap.sourceforge.net/">CGIWrap</a>.</p>
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
Index: docs/manual/sitemap.html.ko.euc-kr
===================================================================
--- docs/manual/sitemap.html.ko.euc-kr	(revision 61)
+++ docs/manual/sitemap.html.ko.euc-kr	(working copy)
@@ -223,6 +223,7 @@
 <li><a href="mod/mod_proxy_connect.html">����ġ ��� mod_proxy_connect</a></li>
 <li><a href="mod/mod_proxy_ftp.html">����ġ ��� mod_proxy_ftp</a></li>
 <li><a href="mod/mod_proxy_http.html">����ġ ��� mod_proxy_http</a></li>
+<li><a href="mod/mod_proxy_scgi.html">����ġ ��� mod_proxy_scgi</a></li>
 <li><a href="mod/mod_rewrite.html">����ġ ��� mod_rewrite</a></li>
 <li><a href="mod/mod_setenvif.html">����ġ ��� mod_setenvif</a></li>
 <li><a href="mod/mod_so.html">����ġ ��� mod_so</a></li>
Index: docs/manual/platform/windows.html.en
===================================================================
--- docs/manual/platform/windows.html.en	(revision 61)
+++ docs/manual/platform/windows.html.en	(working copy)
@@ -5,7 +5,7 @@
               This file is generated from xml source: DO NOT EDIT
         XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
       -->
-<title>Using Apache with Microsoft Windows - Apache HTTP Server</title>
+<title>Using Apache HTTP Server on Microsoft Windows - Apache HTTP Server</title>
 <link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
 <link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
 <link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
@@ -16,36 +16,24 @@
 <img alt="" src="../images/feather.gif" /></div>
 <div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
 <div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a> &gt; <a href="../">Version 2.2</a> &gt; <a href="./">Platform Specific Notes</a></div><div id="page-content"><div id="preamble"><h1>Using Apache with Microsoft Windows</h1>
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a> &gt; <a href="../">Version 2.2</a> &gt; <a href="./">Platform Specific Notes</a></div><div id="page-content"><div id="preamble"><h1>Using Apache HTTP Server on Microsoft Windows</h1>
 <div class="toplang">
 <p><span>Available Languages: </span><a href="../en/platform/windows.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/platform/windows.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
 
-
     <p>This document explains how to install, configure and run
-    Apache 2.0 under Microsoft Windows. If you find any bugs, or
-    wish to contribute in other ways, please use our <a href="http://httpd.apache.org/bug_report.html">bug reporting
-    page</a>.</p>
+    Apache 2.2 under Microsoft Windows.  If you have questions after
+    reviewing the documentation (and any event and error logs), you
+    should consult the peer-supported 
+    <a href="http://httpd.apache.org/userslist.html">users' mailing
+    list</a>.</p>
 
     <p>This document assumes that you are installing a binary
     distribution of Apache. If you want to compile Apache yourself
     (possibly to help with development or tracking down bugs),
     see <a href="win_compiling.html">Compiling Apache for Microsoft
     Windows</a>.</p>
-
-    <p><strong>Because of the current versioning policies on Microsoft
-    Windows operating system families, this document assumes the
-    following:</strong></p>
-    <ul>
-      <li><strong>Windows NT:</strong> This means all versions of
-      Windows that are based on the Windows NT kernel. Includes Windows
-      NT, Windows 2000, Windows XP and Windows .Net Server 2003.</li>
-      <li><strong>Windows 9x:</strong> This means older,
-      consumer-oriented versions of Windows. Includes Windows 95 (also
-      OSR2), Windows 98 and Windows ME.</li>
-    </ul>
-
   </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#req">Operating System Requirements</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#down">Downloading Apache for Windows</a></li>
@@ -60,21 +48,15 @@
 <h2><a name="req" id="req">Operating System Requirements</a></h2>
     
 
-    <p>The primary Windows platform for running Apache 2.0 is Windows
-    NT. The binary installer only works with the x86 family of
-    processors, such as Intel and AMD processors. Running Apache on
-    Windows 9x is not thoroughly tested, and it is never recommended on
-    production systems.
-    </p>
+    <p>The primary Windows platform for running Apache 2.2 is Windows
+    2000 or later.  The binary installer only works with the x86 family
+    of processors, such as Intel and AMD processors.  Always obtain and
+    install the current service pack to avoid operating system bugs.</p>
 
-    <p>On all operating systems, TCP/IP networking must be installed
-    and working. If running on Windows 95, the Winsock 2 upgrade must
-    be installed. Winsock 2 for Windows 95 can be downloaded from <a href="http://www.microsoft.com/windows95/downloads/contents/WUAdminTools/S_WUNetworkingTools/W95Sockets2/Default.asp">here</a>.
-    </p>
-
-    <p>On Windows NT 4.0, installing Service Pack 6 is strongly
-    recommended, as Service Pack 4 created known issues with TCP/IP
-    and Winsock integrity that were resolved in later Service Packs.</p>
+    <div class="note">Running Apache on Windows 9x is ignored by the developers, and
+    is strongly discouraged.  On Windows NT 4.0, installing Service
+    Pack 6 is required.  Apache HTTP Server versions later than 2.2 will
+    not run on any operating system earlier than Windows 2000.</div>
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="down" id="down">Downloading Apache for Windows</a></h2>
@@ -91,26 +73,25 @@
     <p>For Windows installations you should download the version of
     Apache for Windows with the <code>.msi</code> extension. This is a
     single Microsoft Installer file, which contains a ready-to-run
-    version of Apache. There is a separate <code>.zip</code> file,
-    which contains only the source code. You can compile Apache
-    yourself with the Microsoft Visual C++ (Visual Studio) tools.</p>
+    build of Apache.  There is a separate <code>.zip</code> file,
+    which contains only the source code, see the summary above.</p>
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="inst" id="inst">Installing Apache for Windows</a></h2>
     
 
-    <p>You need Microsoft Installer 1.2 or above for the installation
-    to work. On Windows 9x you can update your Microsoft Installer to
-    version 2.0 <a href="http://www.microsoft.com/downloads/release.asp?ReleaseID=32831">here</a>
-    and on Windows NT 4.0 and 2000 the version 2.0 update can be found
-    <a href="http://www.microsoft.com/downloads/release.asp?ReleaseID=32832">here</a>.
-    Windows XP does not need this update.</p>
+    <p>You need Microsoft Installer 2.0 or above for the installation
+    to work.  For Windows NT 4.0 and 2000 refer to Microsoft's article
+    <a href="http://support.microsoft.com/kb/292539/">KB 292539</a>.
+    Windows XP and later do not require this update.  The Windows 98/ME
+    installer engine appears to no longer be available from Microsoft,
+    and these instructions no longer detail such prerequisites.</p>
 
-    <p>Note that you cannot install two versions of Apache 2.0 on the
+    <p>Note that you cannot install two versions of Apache 2.2 on the
     same computer with the binary installer. You can, however, install
     a version of the 1.3 series <strong>and</strong> a version of the
-    2.0 series on the same computer without problems. If you need to
-    have two different 2.0 versions on the same computer, you have to
+    2.2 series on the same computer without problems. If you need to
+    have two different 2.2 versions on the same computer, you have to
     <a href="win_compiling.html">compile and install Apache from the
     source</a>.</p>
 
@@ -194,7 +175,7 @@
     <p>The main differences in Apache for Windows are:</p>
     <ul>
       <li><p>Because Apache for Windows is multithreaded, it does not
-      use a separate process for each request, as Apache does on Unix.
+      use a separate process for each request, as Apache can on Unix.
       Instead there are usually only two Apache processes running: a
       parent process, and a child which handles the requests. Within
       the child process each request is handled by a separate thread.
@@ -203,12 +184,12 @@
       <p>The process management directives are also different:</p>
 
       <p><code class="directive"><a href="../mod/mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></code>:
-      Like the Unix directive, this controls how many requests a single
-      child process will serve before exiting. However, unlike on Unix,
-      a single process serves all the requests at once, not just one.
-      If this is set, it is recommended that a very high number is
-      used. The recommended default, <code>MaxRequestsPerChild 0</code>,
-      causes the child process to never exit.</p>
+      Like the Unix directive, this controls how many requests (actually,
+      connections) which a single child process will serve before exiting.
+      However, unlike on Unix, a replacement process is not instantly
+      available.  Use the default <code>MaxRequestsPerChild 0</code>,
+      unless instructed to change the behavior to overcome a memory leak
+      in third party modules or in-process applications.</p>
 
       <div class="warning"><strong>Warning: The server configuration
       file is reread when a new child process is started. If you have
@@ -220,13 +201,17 @@
       should use. This is the maximum number of connections the server
       can handle at once, so be sure to set this number high enough for
       your site if you get a lot of hits. The recommended default is
-      <code>ThreadsPerChild 50</code>.</p></li>
+      <code>ThreadsPerChild 150</code>, but this must be adjusted to
+      reflect the greatest anticipated number of simultanious
+      connections to accept.</p></li>
 
       <li><p>The directives that accept filenames as arguments must use
       Windows filenames instead of Unix ones. However, because Apache
-      uses Unix-style names internally, you must use forward slashes,
-      not backslashes. Drive letters can be used; if omitted, the drive
-      with the Apache executable will be assumed.</p></li>
+      may interpret backslashes as an "escape character" sequence, you
+      should consistently use forward slashes in path names, not 
+      backslashes.  Drive letters can be used; if omitted, the drive
+      of the SystemRoot directive (or -d command line option) becomes
+      the default.</p></li>
 
       <li><p>While filenames are generally case-insensitive on
       Windows, URLs are still treated internally as case-sensitive
@@ -247,6 +232,16 @@
       RewriteRule (.*) ${lowercase:$1} [R,L]
       </code></p></div></li>
 
+      <li><p>When running, Apache needs write access only to the logs
+      directory and any configured cache directory tree.  Due to the
+      issue of case insensitive and short 8.3 format names, Apache must
+      validate all path names given.  This means that each directory
+      which Apache evaluates, from the drive root up to the directory
+      leaf, must have read, list and traverse directory permissions.
+      If Apache2.2 is installed at C:\Program Files, then the root
+      directory, Program Files and Apache2.2 must all be visible
+      to Apache.</p></li>
+
       <li><p>Apache for Windows contains the ability to load modules at
       runtime, without recompiling the server. If Apache is compiled
       normally, it will install a number of optional modules in the
@@ -264,11 +259,11 @@
       loadable modules</a> is also available.</p></li>
 
       <li><p>Apache can also load ISAPI (Internet Server Application
-      Programming Interface) extensions (i.e. internet server
-      applications), such as those used by Microsoft IIS and other
-      Windows servers. <a href="../mod/mod_isapi.html">More information
-      is available</a>. Note that Apache <strong>cannot</strong> load
-      ISAPI Filters.</p></li>
+      Programming Interface) extensions such as those used by Microsoft
+      IIS and other Windows servers. <a href="../mod/mod_isapi.html">More
+      information is available</a>. Note that Apache <strong>cannot</strong>
+      load ISAPI Filters, and ISAPI Handlers with some Microsoft feature
+      extensions will not work.</p></li>
 
       <li><p>When running CGI scripts, the method Apache uses to find
       the interpreter for the script is configurable using the
@@ -283,15 +278,11 @@
 
       <li><p>Any errors during Apache startup are logged into the
       Windows event log when running on Windows NT. This mechanism
-      acts as a backup for those situations where Apache cannot even
-      access the normally used <code>error.log</code> file. You can
-      view the Windows event log by using the Event Viewer application
-      on Windows NT 4.0, and the Event Viewer MMC snap-in on newer
-      versions of Windows.</p>
-
-      <div class="note"><strong>Note that there is no startup error logging on
-      Windows 9x because no Windows event log exists on those operating
-      systems.</strong></div></li>
+      acts as a backup for those situations where Apache is not yet
+      prepared to use the <code>error.log</code> file. You can
+      review the Windows Applicat Event Log by using the Event Viewer,
+      e.g. Start - Settings - Control Panel - Administrative Tools
+      - Event Viewer.</p></li>
     </ul>
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -299,9 +290,6 @@
 <h2><a name="winsvc" id="winsvc">Running Apache as a Service</a></h2>
     
 
-    <p>Apache can be run as a service on Windows NT. There is some
-    highly experimental support for similar behavior on Windows 9x.</p>
-
     <p>You can install Apache as a service automatically during the
     installation. If you chose to install for all users, the
     installation will create an Apache service for you. If you specify
@@ -340,7 +328,7 @@
     </code></p></div>
 
     <p>If you use the first command without any special parameters except
-    <code>-k install</code>, the service will be called <code>Apache2</code>
+    <code>-k install</code>, the service will be called <code>Apache2.2</code>
     and the configuration will be assumed to be <code>conf\httpd.conf</code>.
     </p>
 
@@ -358,8 +346,8 @@
 
     <p>Normal starting, restarting and shutting down of an Apache
     service is usually done via the Apache Service Monitor, by using
-    commands like <code>NET START Apache2</code> and <code>NET STOP
-    Apache2</code> or via normal Windows service management. Before
+    commands like <code>NET START Apache2.2</code> and <code>NET STOP
+    Apache2.2</code> or via normal Windows service management. Before
     starting Apache as a service by any means, you should test the
     service's configuration file by using:</p>
 
@@ -406,9 +394,9 @@
     to access network resources, create a separate account for Apache as
     noted below.</strong></div>
 
-    <p>You may want to create a separate account for running Apache
-    service(s). Especially, if you have to access network resources
-    via Apache, this is strongly recommended.</p>
+    <p>It is recommended that users create a separate account for running
+    Apache service(s). If you have to access network resources via Apache,
+    this is required.</p>
 
     <ol>
       <li>Create a normal domain user account, and be sure to
@@ -437,13 +425,13 @@
     </ol>
 
     <div class="note">It is usually a good practice to grant the user the Apache
-    service runs as read and execute (RX) access to the whole Apache2
+    service runs as read and execute (RX) access to the whole Apache2.2
     directory, except the <code>logs</code> subdirectory, where the
     user has to have at least change (RWXD) rights.</div>
 
     <p>If you allow the account to log in as a user and as a service,
-    then you can log on with that account and test that the account has the
-    privileges to execute the scripts, read the web pages, and that
+    then you can log on with that account and test that the account has
+    the privileges to execute the scripts, read the web pages, and that
     you can start Apache in a console window. If this works, and you
     have followed the steps above, Apache should execute as a service
     with no problems.</p>
@@ -460,7 +448,7 @@
     Windows Control Panel, you may get the following message:</p>
 
     <div class="example"><p><code>
-      Could not start the Apache2 service on \\COMPUTER <br />
+      Could not start the Apache2.2 service on \\COMPUTER <br />
       Error 1067; The process terminated unexpectedly.
     </code></p></div>
 
@@ -469,54 +457,10 @@
     the problem you should follow the instructions for Running Apache
     for Windows from the Command Prompt.</p>
 
-    <p>There is some support for Apache on Windows 9x to behave in a
-    similar manner as a service on Windows NT. It is <strong>highly
-    experimental</strong>. It is not of production-class reliability,
-    and its future is not guaranteed. It can be mostly regarded as
-    a risky thing to play with - proceed with caution!</p>
-
-    <p>There are some differences between the two kinds of services
-    you should be aware of:</p>
-
-    <ul>
-      <li><p>Apache will attempt to start and if successful it will run
-      in the background. If you run the command</p>
-
-      <div class="example"><p><code>
-        httpd.exe -n "MyServiceName" -k start
-      </code></p></div>
-
-      <p>via a shortcut on your desktop, for example, then if the
-      service starts successfully, a console window will flash up but
-      it immediately disappears. If Apache detects any errors on startup
-      such as incorrect entries in the httpd.conf configuration file,
-      the console window will remain visible. This will display an error
-      message which will be useful in tracking down the cause of the
-      problem.</p></li>
-
-      <li><p>Windows 9x does not support <code>NET START</code> or
-      <code>NET STOP</code> commands. You must control the Apache
-      service on the command prompt via the <code>-k</code> switches.
-      </p></li>
-
-      <li><p>Apache and Windows 9x offer no support for running Apache
-      as a specific user with network privileges. In fact, Windows 9x
-      offers no security on the local machine, either. This is the
-      simple reason because of which the Apache Software Foundation
-      never endorses use of a Windows 9x -based system as a public
-      Apache server. The primitive support for Windows 9x exists only
-      to assist the user in developing web content and learning the
-      Apache server, and perhaps as an intranet server on a secured,
-      private network.</p></li>
-
-    </ul>
-
-    <p>Once you have confirmed that Apache runs correctly as a
-    console application you can install, control and uninstall the
-    pseudo-service with the same commands as on Windows NT. You can
-    also use the Apache Service Monitor to manage Windows 9x
-    pseudo-services.</p>
-
+    <p>If you are having problems with the service, it is suggested
+    you follow the instructions below to try starting httpd.exe from
+    a console window, and work out the errors before struggling to
+    start it as a service again.</p>
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="wincons" id="wincons">Running Apache as a Console Application</a></h2>
@@ -539,7 +483,7 @@
 
     <p>You can also run Apache via the shortcut Start Apache in Console
     placed to <code>Start Menu --&gt; Programs --&gt; Apache HTTP Server
-    2.0.xx --&gt; Control Apache Server</code> during the installation.
+    2.2.xx --&gt; Control Apache Server</code> during the installation.
     This will open a console window and start Apache inside it. If you
     don't have Apache installed as a service, the window will remain
     visible until you stop Apache by pressing Control-C in the console
@@ -702,7 +646,6 @@
     location it is vital that you update the
     <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> directive in the
     <code>httpd.conf</code> file to reflect the new location.</p>
-
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="test" id="test">Testing the Installation</a></h2>
@@ -746,9 +689,9 @@
     <p>Because Apache <strong>cannot</strong> share the same port with
     another TCP/IP application, you may need to stop, uninstall or reconfigure
     certain other services before running Apache. These conflicting
-    services include other WWW servers and some firewall implementations.
-    </p>
-
+    services include other WWW servers, some firewall implementations,
+    and even some client applications (such as Skype) which will use port
+    80 to attempt to bypass firewall issues.</p>
   </div></div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/platform/windows.html" title="English">&nbsp;en&nbsp;</a> |
Index: docs/manual/platform/perf-hp.html.ko.euc-kr
===================================================================
--- docs/manual/platform/perf-hp.html.ko.euc-kr	(revision 61)
+++ docs/manual/platform/perf-hp.html.ko.euc-kr	(working copy)
@@ -21,6 +21,8 @@
 <p><span>������ ���: </span><a href="../en/platform/perf-hp.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/platform/perf-hp.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
+<div class="outofdate">�� ������ �ֽ��� ������ �ƴմϴ�.
+            �ֱٿ� ����� ������ ���� ������ �����ϼ���.</div>
 
 
 <pre>
Index: docs/manual/platform/win_compiling.html.en
===================================================================
--- docs/manual/platform/win_compiling.html.en	(revision 61)
+++ docs/manual/platform/win_compiling.html.en	(working copy)
@@ -31,7 +31,9 @@
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#requirements">Requirements</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#commandbuild">Command-Line Build</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#workspacebuild">Developer Studio Workspace IDE Build</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#projectcomponents">Project Components</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#exportingmakfiles">Exporting command-line .mak files</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#installation">Installation</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#projectcomponents-warn">Warning about building Apache from the development tree</a></li>
 </ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
@@ -45,9 +47,10 @@
     <ul>
       <li>
         <p>Disk Space</p>
-        <p>Make sure you have at least 180 MB of free disk space
+
+        <p>Make sure you have at least 200 MB of free disk space
         available. After installation Apache requires approximately
-        70 MB of disk space, plus space for log and cache files,
+        80 MB of disk space, plus space for log and cache files,
         which can grow rapidly. The actual disk space requirements
         will vary considerably based on your chosen configuration and
         any third-party modules or libraries, especially when OpenSSL
@@ -57,67 +60,85 @@
       </li>
 
       <li>
-        <p>Microsoft Visual C++ (Microsoft Visual Studio) 6.0 or higher.</p>
+        <p>Appropriate Patches</p>
 
+        <p>The httpd binary is built with the help of several patches to
+        third party packages, which ensure the released code is buildable
+        and debuggable.  These patches are available and distributed from <a href="http://www.apache.org/dist/httpd/binaries/win32/patches_applied/">http://www.apache.org/dist/httpd/binaries/win32/patches_applied/</a>
+        and are recommended to be applied to obtain identical results as the
+        "official" ASF distributed binaries.</p>
+      </li>
+
+      <li>
+        <p>Microsoft Visual C++ 6.0 (Visual Studio 97) or later.</p>
+
         <p>Apache can be built using the command line tools, or from
         within the Visual Studio IDE Workbench.  The command line
         build requires the environment to reflect the <code>PATH</code>,
         <code>INCLUDE</code>, <code>LIB</code> and other variables
-        that can be configured with the <code>vcvars32.bat</code> file:</p>
+        that can be configured with the <code>vcvars32.bat</code> script.</p>
 
-        <div class="example"><p><code>
-          "c:\Program Files\Microsoft Visual Studio\VC98\Bin\VCVARS32"
-        </code></p></div>
+        <div class="note">You may want the Visual Studio Processor Pack for your older
+        version of Visual Studio, or a full (not Express) version of newer
+        Visual Studio editions, for the ml.exe assembler.  This will allow
+        you to build OpenSSL, if desired, using the more efficient assembly
+        code implementation.</div>
+
+        <div class="note">Only the Microsoft compiler tool chain is actively supported by
+        the active httpd contributors.  Although the project regularly accepts
+        patches to ensure MinGW and other alternative builds work and improve
+        upon them, they are not actively maintained and are often broken in
+        the course of normal development.</div>
       </li>
 
       <li>
-        <p>The Windows Platform SDK for Visual C++ 6.0 (97) or 7.0 (.NET)</p>
+        <p>Updated Microsoft Windows Platform SDK, February 2003 or later.</p>
 
-        <p>Apache's APR and APR-util builds require an updated Microsoft
-        Windows Platform SDK, from Feb 2003 or later, included in the
-        Visual C++ 7.1 (Studio 2003) and later.  For command line builds with 
-        Visual C++ 6.0 or 7.0, the Platform SDK environment is prepared by 
-        the <code>setenv.bat</code> file:</p>
+        <p>An appropriate Windows Platform SDK is included by default in the
+        full (not express/lite) versions  of Visual C++ 7.1 (Visual Studio 2002)
+        and later, these users can ignore these steps unless explicitly choosing
+        a newer or different version of the Platform SDK.</p>
+
+        <p>To use Visual C++ 6.0 or 7.0 (Studio 2000 .NET), the Platform SDK
+        environment must be prepared using the <code>setenv.bat</code> 
+        script (installed by the Platform SDK) before starting the command
+        line build or launching the msdev/devenv GUI environment.  Installing
+        the Platform SDK for Visual Studio Express versions (2003 and later)
+        should adjust the default environment appropriately.</p>
+
         <div class="example"><p><code>
+          "c:\Program Files\Microsoft Visual Studio\VC98\Bin\VCVARS32"<br />
           "c:\Program Files\Platform SDK\setenv.bat"
         </code></p></div>
-
-        <p>The Platform SDK files distributed with Visual C++ 6.0 and
-        Visual Studio .NET (2000) are no longer sufficient and cause many
-        compilation warnings and linkage errors.  Users of Visual C++ 7.1
-        (Studio 2003) and later versions (of the full product, not the 
-        'Visual Studio Express' flavor) may skip this requirement.</p>
-
-        <p>If using the GUI, either start msdev or devenv with the /setenv
-        flag (after invoking setenv.bat), or ensure the paths are correct
-        under the Tools -&gt; Options -&gt; (Projects -&gt;) Directories 
-        menu option.  The Platform SDK installer will generally help you
-        configure this.</p>
       </li>
 
       <li>
-        <p>The awk utility (awk, gawk or similar).</p>
+        <p>Perl and awk</p>
+
+        <p>Several steps recommended here require a perl interpreter during
+        the build preparation process, but it is otherwise not required.</p>
+ 
         <p>To install Apache within the build system, several files are
         modified using the <code>awk.exe</code> utility. awk was chosen since
         it is a very small download (compared with Perl or WSH/VB) and
         accomplishes the task of modifying configuration files upon
         installation.  Brian Kernighan's
-        <a href="http://cm.bell-labs.com/cm/cs/who/bwk/">http://cm.bell-labs.com/cm/cs/who/bwk/</a>
+        <a href="http://www.cs.princeton.edu/~bwk/btl.mirror/">http://www.cs.princeton.edu/~bwk/btl.mirror/</a>
         site has a compiled native Win32 binary,
-        <a href="http://cm.bell-labs.com/cm/cs/who/bwk/awk95.exe">http://cm.bell-labs.com/cm/cs/who/bwk/awk95.exe</a> which
-        you must save with the name <code>awk.exe</code> rather than
-        <code>awk95.exe</code>.</p>
+        <a href="http://www.cs.princeton.edu/~bwk/btl.mirror/awk95.exe">http://www.cs.princeton.edu/~bwk/btl.mirror/awk95.exe</a> which
+        you must save with the name <code>awk.exe</code> (rather than
+        <code>awk95.exe</code>).</p>
 
         <div class="note">If awk.exe is not found, Makefile.win's install target
         will not perform substitutions in the installed .conf files.
-        The installed .conf files must then be modified by hand for
-        this situation.</div>
+        You must manually modify the installed .conf files to allow
+        the server to start.  Search and replace all "@token@" tags
+        as appropriate.</div>
 
-        <p>Note that Developer Studio IDE will only find
-        <code>awk.exe</code> from the Executable path specified in the menu 
-        option Tools -&gt; Options -&gt; (Projects -&gt;) Directories.
-        Add the path for <code>awk.exe</code> to this list, and your 
-        system <code>PATH</code> environment variable, as needed.</p>
+        <div class="note">The Visual Studio IDE will only find <code>awk.exe</code>
+        from the PATH, or executable path specified in the menu option
+        Tools -&gt; Options -&gt; (Projects -&gt;) Directories.  Ensure
+        awk.exe is in your system path.</div>
 
         <div class="note">Also note that if you are using Cygwin tools
         (<a href="http://www.cygwin.com/">http://www.cygwin.com/</a>) 
@@ -133,6 +154,7 @@
 
       <li>
         <p>[Optional] zlib library (for <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>)</p>
+
         <p>Zlib must be installed into a <code>srclib</code> subdirectory named
         <code>zlib</code>.  This must be built in-place.  Zlib can be obtained 
         from <a href="http://www.zlib.net/">http://www.zlib.net/</a> -- the
@@ -148,40 +170,80 @@
       <li>
         <p>[Optional] OpenSSL libraries (for <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code>
         and <code>ab.exe</code> with ssl support)</p>
-        <p><strong>Caution: there are significant restrictions and
-        prohibitions on the use and distribution of strong cryptography
-        and patented intellectual property throughout the world.</strong>
-        OpenSSL includes strong cryptography controlled by both export
-        regulations and domestic law, as well as intellectual property
-        protected by patent, in the United States and elsewhere.  Neither
-        the Apache Software Foundation nor the OpenSSL project can provide
-        legal advise regarding possession, use, or distribution of the code
-        provided by the OpenSSL project. <strong>Consult your own legal
-        counsel, you are responsible for your own actions.</strong></p>
 
+        <div class="note">The OpenSSL library is cryptographic software.  The country
+        in which you currently reside may have restrictions on the import,
+        possession, use, and/or re-export to another country, of encryption
+        software.  BEFORE using any encryption software, please check your
+        country's laws, regulations and policies concerning the import,
+        possession, or use, and re-export of encryption software, to see
+        if this is permitted.  See 
+        <a href="http://www.wassenaar.org/">http://www.wassenaar.org/</a>
+        for more information.</div>
+
+        <p>Configuring and building OpenSSL requires perl to be installed.</p>
+
         <p>OpenSSL must be installed into a <code>srclib</code> subdirectory 
         named <code>openssl</code>, obtained from 
         <a href="http://www.openssl.org/source/">http://www.openssl.org/source/</a>, in order to compile 
-        <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> or the abs project (<code>ab.exe</code> 
-        enabled with SSL support.) To prepare OpenSSL for both 
-        <code>release</code> and <code>debug</code> builds of Apache, and
-        disable the patent protected features in OpenSSL,  you might use 
-        the following build commands:</p>
+        <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> or the <code>abs.exe</code> project, which
+        is ab.c with SSL support enabled.  To prepare OpenSSL to be linked 
+        to Apache mod_ssl or abs.exe, and disable patent encumbered features
+        in OpenSSL,  you might use the following build commands:</p>
 
         <div class="example"><p><code>
-          perl Configure no-mdc2 no-rc5 no-idea enable-zlib VC-WIN32 -Ipath/to/srclib/zlib<br />
+          perl Configure no-rc5 no-idea enable-mdc2 enable-zlib VC-WIN32 
+               -Ipath/to/srclib/zlib -Lpath/to/srclib/zlib<br />
           ms\do_masm.bat<br />
           nmake -f ms\ntdll.mak
         </code></p></div>
 
-        <p>Note: It is not advisable to use zlib-dynamic, as that could
-        pose a thread race condition.  If building zlib on win32, be sure
-        to adjust the resulting ms\ntdll.mak file to link to the full
-        path of srclib\zlib\zdll.lib rather than zlib1.lib (that error in
-        configuration of OpenSSL through 0.9.8h and earlier reflects older 
-        zlib 1.1 versions.)</p>
+        <div class="note">It is not advisable to use zlib-dynamic, as that transfers
+        the cost of deflating SSL streams to the first request which must
+        load the zlib dll.  Note the suggested patch enables the -L flag to
+        work with windows builds, corrects the name of zdll.lib and ensures
+        .pdb files are generated for troubleshooting.  If the assembler is
+        not installed, you would add no-asm above and use ms\do_ms.bat 
+        instead of the ms\do_masm.bat script.</div>
       </li>
 
+      <li>
+        <p>[Optional] Database libraries (for <code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code>
+        and <code class="module"><a href="../mod/mod_authn_dbm.html">mod_authn_dbm</a></code>)</p>
+
+        <p>The apr-util library exposes dbm (keyed database) and dbd (query
+        oriented database) client functionality to the httpd server and its
+        modules, such as authentication and authorization.  The sdbm dbm and
+        odbc dbd providers are compiled unconditionally.</p>
+
+        <p>The dbd support includes the Oracle instantclient package, MySQL,
+        PostgreSQL and sqlite.  To build these all, for example, set up the
+        LIB to include the library path, INCLUDE to include the headers path,
+        and PATH to include the dll bin path of all four SDK's, and set the
+        DBD_LIST environment variable to inform the build which client driver
+        SDKs are installed correctly, e.g.;</p>
+
+        <div class="example"><p><code>
+          set DBD_LIST=sqlite3 pgsql oracle mysql
+        </code></p></div>
+
+        <p>Similarly, the dbm support can be extended with DBM_LIST to
+        build a Berkeley DB provider (db) and/or gdbm provider, by similarly
+        configuring LIB, INCLUDE and PATH first to ensure the client library
+        libs and headers are available.</p>
+
+        <div class="example"><p><code>
+          set DBM_LIST=db gdbm
+        </code></p></div>
+
+        <div class="note">Depending on the choice of database distributions, it may be
+        necessary to change the actual link target name (e.g. gdbm.lib vs.
+        libgdb.lib) that are listed in the corresponding .dsp/.mak files
+        within the directories srclib\apr-util\dbd or ...\dbm.</div>
+
+        <p>See the README-win32.txt file for more hints on obtaining the
+        various database driver SDKs.</p>
+      </li>
     </ul>
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -190,31 +252,24 @@
 
     
 
-    <p>First, unpack the Apache distribution into an appropriate
-    directory. Open a command-line prompt and <code>cd</code> to that
-    directory.</p>
+    <p><code>Makefile.win</code> is the top level Apache makefile.
+    To compile Apache on Windows, simply use one of the following commands
+    to build the <code>release</code> or <code>debug</code> flavor:</p>
 
-    <p>The master Apache makefile instructions are contained in the
-    <code>Makefile.win</code> file. To compile Apache on Windows
-    NT, simply use one of the following commands to compiled the
-    <code>release</code> or <code>debug</code> build, respectively:</p>
+    <div class="example"><p><code>
+      nmake /f Makefile.win _apacher<br /><br />
+      nmake /f Makefile.win _apached
+    </code></p></div>
 
-    <div class="example"><pre>
-nmake /f Makefile.win _apacher
-
-nmake /f Makefile.win _apached
-    </pre></div>
-
     <p>Either command will compile Apache. The latter will disable
     optimization of the resulting files, making it easier to single
     step the code to find bugs and track down problems.</p>
 
-    <p>You can add your apr-util dbd provider choices with the additional
-    make variable DBD_LIST, e.g. DBD_LIST="mysql oracle pgsql sqlite3"
-    to build these four providers.  However it's necessary to have 
-    the include headers in the INCLUDE path list, db client libraries 
-    in the LIB path list, and the db client dll files in the PATH.  The
-    specifics for each provider are an exercise left to the reader.</p>
+    <p>You can add your apr-util dbd and dbm provider choices with the
+    additional make (environment) variables DBD_LIST and DBM_LIST, 
+    see the comments about [Optional] Database libraries, above.
+    Review the initial comments in Makefile.win for additional options
+    that can be provided when invoking the build.</p>
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
@@ -240,48 +295,56 @@
     <code>/Apache2</code> directory. If you only want a test compile (without
     installing) you may build the <code>BuildBin</code> project instead.</p>
 
-    <p>The <code>.dsp</code> project files are distributed in Visual
-    C++ 6.0 format. Visual C++ 5.0 (97) will recognize them. Visual C++
-    7.0 (.net) must convert <code>Apache.dsw</code> plus the <code>.dsp</code>
-    files into an <code>Apache.sln</code> plus <code>.msproj</code> files,
-    be sure you reconvert the <code>.msproj</code> file if any of the source
-    <code>.dsp</code> files change! This is really trivial, just open
-    <code>Apache.dsw</code> in the VC++ 7.0 IDE once again.</p>
+    <p>The <code>.dsp</code> project files are distributed in Visual Studio 6.0
+    (98) format. Visual C++ 5.0 (97) will recognize them. Visual Studio
+    2002 (.NET) and later users must convert <code>Apache.dsw</code> plus
+    the <code>.dsp</code> files into an <code>Apache.sln</code> plus
+    <code>.msproj</code> files.  Be sure you reconvert the <code>.msproj</code>
+    file again if its source <code>.dsp</code> file changes! This is really
+    trivial, just open <code>Apache.dsw</code> in the VC++ 7.0 IDE once again
+    and reconvert.</p>
 
-    <div class="note">There is a flaw in the .vcproj conversion of .dsp through 
-    Visual Studio 2005 SP1; devenv.exe will mis-parse the /D flag for RC 
-    flags containing long quoted /D'efines containing spaces.  The command:
+    <div class="note">There is a flaw in the .vcproj conversion of .dsp files.  devenv.exe
+    will mis-parse the /D flag for RC flags containing long quoted /D'efines
+    which contain spaces.  The command:
     <div class="example"><p><code>
       perl srclib\apr\build\cvtdsp.pl -2005
     </code></p></div>
     will convert the /D flags for RC flags to use an alternate, parseable
     syntax; unfortunately this syntax isn't supported by Visual Studio 97
-    or it's exported .mak files.  These /D flags are used to pass the long
-    description of the mod_apachemodule.so files to their .rc resource
-    version-identifier compilations, and replace the use of awk for generating
-    .rc files formerly used for Apache 2.0.</div>
+    or its exported .mak files.  These /D flags are used to pass the long
+    description of the mod_apachemodule.so files to the shared .rc resource
+    version-identifier build.</div>
 
-    <p>Visual C++ 7.0 (.net) users should also use the Build
+    <p>Visual Studio 2002 (.NET) and later users should also use the Build
     menu, Configuration Manager dialog to uncheck both the <code>Debug</code>
-    and <code>Release</code> Solution modules abs, <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code>
-    and <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>.
-    These modules are built by invoking <code>nmake</code> or the IDE directly
-    with the <code>BinBuild</code> target to build those modules conditionally
+    and <code>Release</code> Solution modules <code>abs</code>, 
+    <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> and <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> components, as
+    well as every component starting with <code>apr_db*</code>.  These modules
+    are built by invoking <code>nmake</code>, or the IDE directly with the
+    <code>BinBuild</code> target, which builds those modules conditionally
     if the <code>srclib</code> directories <code>openssl</code> and/or
-    <code>zlib</code> exist.</p>
+    <code>zlib</code> exist, and based on the setting of <code>DBD_LIST</code>
+    and <code>DBM_LIST</code> environment variables.</p>
 
+  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="exportingmakfiles" id="exportingmakfiles">Exporting command-line .mak files</a></h2>
+
+    
+
     <p>Exported <code>.mak</code> files pose a greater hassle, but they are
     required for Visual C++ 5.0 users to build <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code>,
     abs (<code class="program"><a href="../programs/ab.html">ab</a></code> with SSL support) and/or
-    <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>.  VC++ 7.0 (Visual Studio .NET) users 
-    also benefit, <code>nmake</code> builds were faster than 
-    <code>binenv</code> builds until the parallel compilation features
-    introduced in Visual Studio 2005.  Build the entire project from within 
-    the VC++ 5.0 or 6.0 IDE, preferably with mod_deflate, mod_ssl and abs,
-    then use the Project Menu Export for all makefiles (preferably, with 
-    dependencies.)  You must build the projects first in order to create 
-    all dynamic auto-generated targets, so that dependencies can be parsed
-    correctly. Run the following command to fix the paths so they will build 
+    <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>.  The .mak files also support a broader
+    range of C++ tool chain distributions, such as Visual Studio Express.</p>
+
+    <p>You must first build all projects in order to create all dynamic 
+    auto-generated targets, so that dependencies can be parsed correctly. 
+    Build the entire project from within the Visual Studio 6.0 (98) IDE,
+    using the <code>BuildAll</code> target, then use the Project Menu Export
+    for all makefiles (checking on "with dependencies".)  Run the following
+    command to correct absolute paths into relative paths so they will build
     anywhere:</p>
 
     <div class="example"><p><code>
@@ -294,72 +357,26 @@
     the current directory and below will be corrected, and the
     timestamps adjusted to reflect the <code>.dsp</code>.</p>
 
+    <p>Always review the generated <code>.mak</code> and <code>.dep</code>
+    files for Platform SDK or other local, machine specific file paths.
+    The <code>DevStudio\Common\MSDev98\bin\</code> (VC6) directory contains
+    a <code>sysincl.dat</code> file, which lists all exceptions.  Update
+    this file (including both forward and backslashed paths, such as both
+    <code>sys/time.h</code> and <code>sys\time.h</code>) to ignore such
+    newer dependencies.  Including local-install paths in a distributed 
+    <code>.mak</code> file will cause the build to fail completely.</p>
+
     <p>If you contribute back a patch that revises project files, we
     must commit project files in Visual Studio 6.0 format. Changes
     should be simple, with minimal compilation and linkage flags that
-    will be recognized by all VC++ 5.0 through 7.0 environments.</p>
+    can be recognized by all Visual Studio environments.</p>
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
-<h2><a name="projectcomponents" id="projectcomponents">Project Components</a></h2>
+<h2><a name="installation" id="installation">Installation</a></h2>
 
     
 
-    <p>The <code>Apache.dsw</code> workspace and <code>makefile.win</code>
-    <code>nmake</code> script both build the <code>.dsp</code> projects
-    of the Apache server in the following sequence:</p>
-
-    <ol>
-      <li><code>srclib\apr\apr.dsp</code></li>
-
-      <li><code>srclib\apr\libapr.dsp</code></li>
-
-      <li><code>srclib\apr-util\uri\gen_uri_delims.dsp</code></li>
-
-      <li><code>srclib\apr-util\xml\expat\lib\xml.dsp</code></li>
-
-      <li><code>srclib\apr-util\aprutil.dsp</code></li>
-
-      <li><code>srclib\apr-util\libaprutil.dsp</code></li>
-
-      <li><code>srclib\pcre\dftables.dsp</code></li>
-
-      <li><code>srclib\pcre\pcre.dsp</code></li>
-
-      <li><code>srclib\pcre\pcreposix.dsp</code></li>
-
-      <li><code>server\gen_test_char.dsp</code></li>
-
-      <li><code>libhttpd.dsp</code></li>
-
-      <li><code>Apache.dsp</code></li>
-    </ol>
-
-    <p>In addition, the <code>modules\</code> subdirectory tree contains
-    project files for the majority of the modules.</p>
-
-    <p>The <code>support\</code> directory contains project files for
-    additional programs that are not part of the Apache runtime,
-    but are used by the administrator to test Apache and maintain
-    password and log files. Windows-specific support projects are
-    broken out in the <code>support\win32\</code> directory.</p>
-
-    <ol>
-      <li><code>support\ab.dsp</code></li>
-
-      <li><code>support\htdigest.dsp</code></li>
-
-      <li><code>support\htpasswd.dsp</code></li>
-
-      <li><code>support\logresolve.dsp</code></li>
-
-      <li><code>support\rotatelogs.dsp</code></li>
-
-      <li><code>support\win32\ApacheMonitor.dsp</code></li>
-
-      <li><code>support\win32\wintty.dsp</code></li>
-    </ol>
-
     <p>Once Apache has been compiled, it needs to be installed in
     its server root directory. The default is the
     <code>\Apache2</code> directory, of the same drive.</p>
@@ -368,101 +385,30 @@
     <em>dir</em> automatically, use one of the following
     <code>nmake</code> commands:</p>
 
-    <div class="example"><pre>
-nmake /f Makefile.win installr INSTDIR=<em>dir</em>
+    <div class="example"><p><code>
+      nmake /f Makefile.win installr INSTDIR=<em>dir</em><br />
+      nmake /f Makefile.win installd INSTDIR=<em>dir</em>
+    </code></p></div>
 
-nmake /f Makefile.win installd INSTDIR=<em>dir</em>
-    </pre></div>
-
-    <p>The <em>dir</em> argument to <code>INSTDIR</code> gives
+    <p>The <em>dir</em> argument to <code>INSTDIR</code> provides
     the installation directory; it can be omitted if Apache is
-    to be installed into <code>\Apache2</code>.</p>
+    to be installed into <code>\Apache22</code> (of the current
+    drive).</p>
 
-    <p>This will install the following:</p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="projectcomponents-warn" id="projectcomponents-warn">Warning about building Apache from the development tree</a></h2>
 
-    <ul>
-      <li><code><em>dir</em>\bin\httpd.exe</code> - Apache
-      executable</li>
-
-      <li><code><em>dir</em>\bin\ApacheMonitor.exe</code> - Service
-      monitor taskbar icon utility</li>
-
-      <li><code><em>dir</em>\bin\htdigest.exe</code> - Digest auth
-      password file utility</li>
-
-      <li><code><em>dir</em>\bin\htdbm.exe</code> - SDBM auth
-      database password file utility</li>
-
-      <li><code><em>dir</em>\bin\htpasswd.exe</code> - Basic auth
-      password file utility</li>
-
-      <li><code><em>dir</em>\bin\logresolve.exe</code> - Log file
-      dns name lookup utility</li>
-
-      <li><code><em>dir</em>\bin\rotatelogs.exe</code> - Log file
-      cycling utility</li>
-
-      <li><code><em>dir</em>\bin\wintty.exe</code> - Console window
-      utility</li>
-
-      <li><code><em>dir</em>\bin\libapr.dll</code> - Apache
-      Portable Runtime shared library</li>
-
-      <li><code><em>dir</em>\bin\libaprutil.dll</code> - Apache
-      Utility Runtime shared library</li>
-
-      <li><code><em>dir</em>\bin\libhttpd.dll</code> - Apache Core
-      library</li>
-
-      <li><code><em>dir</em>\modules\mod_*.so</code> - Loadable
-      Apache modules</li>
-
-      <li><code><em>dir</em>\conf</code> - Configuration
-      directory</li>
-
-      <li><code><em>dir</em>\logs</code> - Empty logging
-      directory</li>
-
-      <li><code><em>dir</em>\include</code> - C language header
-      files</li>
-
-      <li><code><em>dir</em>\lib</code> - Link library files</li>
-    </ul>
-
-    <h3><a name="projectcomponents-warn" id="projectcomponents-warn">Warning about building Apache from the development tree</a></h3>
-
-      
-
-      <div class="note">Note only the <code>.dsp</code> files are maintained between <code>release</code>
-      builds. The <code>.mak</code> files are NOT regenerated, due to the tremendous
-      waste of reviewer's time. Therefore, you cannot rely on the <code>NMAKE</code>
-      commands above to build revised <code>.dsp</code> project files unless you
-      then export all <code>.mak</code> files yourself from the project. This is
-      unnecessary if you build from within the Microsoft
-      Developer Studio environment.</div>
-
-      <div class="note">Also note it is very worthwhile to build the <code>BuildBin</code>
-      target project (or the command line <code>_apacher</code> or
-      <code>_apached</code> target) prior to exporting the make files.
-      Many files are autogenerated in the build process. Only a full
-      build provides all of the dependent files required to build proper
-      dependency trees for correct build behavior.</div>
-
-      <p>In order to create distribution <code>.mak</code> files, always 
-      review the generated <code>.mak</code> (or <code>.dep</code>) 
-      dependencies for Platform SDK or other garbage, machine specific
-      includes.  The <code>DevStudio\SharedIDE\bin\</code> (VC5) or 
-      <code>DevStudio\Common\MSDev98\bin\</code> (VC6) directory contains
-      the <code>sysincl.dat</code> file, which must list all exceptions. 
-      Update this file (including both forward and backslashed paths, such 
-      as both <code>sys/time.h</code> and <code>sys\time.h</code>) to ignore 
-      such dependencies.  Including local-install paths in a distributed 
-      <code>.mak</code> file will cause the build to fail completely. And 
-      don't forget to run <code>srclib/apr/build/fixwin32mak.pl</code> in 
-      order to fix absolute paths within the <code>.mak</code> files.</p>
-
     
 
+    <div class="note">Note only the <code>.dsp</code> files are maintained between <code>release</code>
+    builds. The <code>.mak</code> files are NOT regenerated, due to the tremendous
+    waste of reviewer's time. Therefore, you cannot rely on the <code>NMAKE</code>
+    commands above to build revised <code>.dsp</code> project files unless you
+    then export all <code>.mak</code> files yourself from the project. This is
+    unnecessary if you build from within the Microsoft
+    Developer Studio environment.</div>
+
   </div></div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/platform/win_compiling.html" title="English">&nbsp;en&nbsp;</a> |
Index: docs/manual/platform/perf-hp.html.en
===================================================================
--- docs/manual/platform/perf-hp.html.en	(revision 61)
+++ docs/manual/platform/perf-hp.html.en	(working copy)
@@ -92,7 +92,7 @@
 
     <p>rick jones</p>
 
-    <p><a href="http://www.cup.hp.com/netperf/NetperfPage.html">http://www.cup.hp.com/netperf/NetperfPage.html</a></p>
+    <p><a href="http://www.netperf.org/netperf/">http://www.netperf.org/netperf/</a></p>
 
   </div>
 </div>
Index: docs/manual/platform/ebcdic.html.en
===================================================================
--- docs/manual/platform/ebcdic.html.en	(revision 61)
+++ docs/manual/platform/ebcdic.html.en	(working copy)
@@ -55,7 +55,7 @@
     <p>The port was started initially to</p>
 
     <ul>
-      <li>prove the feasibility of porting <a href="http://dev.apache.org/">the Apache HTTP server</a> to
+      <li>prove the feasibility of porting <a href="http://httpd.apache.org/">the Apache HTTP server</a> to
       this platform</li>
 
       <li>find a "worthy and capable" successor for the venerable
Index: docs/manual/env.html.tr.utf8
===================================================================
--- docs/manual/env.html.tr.utf8	(revision 61)
+++ docs/manual/env.html.tr.utf8	(working copy)
@@ -88,7 +88,7 @@
         
 
         <p>Apache yapılandırmasıyla atanan ve kabuğa aktarılan ortam
-          değişkenlerinden başka <a href="http://cgi-spec.golux.com/">CGI
+          değişkenlerinden başka <a href="http://www.w3.org/CGI/">CGI
           Belirtimi</a>nin gerektirdiği istekler hakkında temel bilgileri
           içeren ortam değişkenlerinin CGI betikleri ve SSI sayfalarınca
           atanabilmesi sağlanmıştır.</p>
@@ -281,7 +281,7 @@
 
     
     <h3><a name="no-cache" id="no-cache">no-cache</a></h3>
-        <p><em>2.2.11'den sonraki sürümlerde kullanılabilmektedir.</em></p>
+        <p><em>2.2.12'den sonraki sürümlerde kullanılabilmektedir.</em></p>
         
         <p>Atandığı takdirde, <code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code> başka bir
           önbelleklenebilir yanıtı kaydetmeyecektir. Bu ortam değişkeni, bir
Index: docs/manual/sitemap.html.tr.utf8
===================================================================
--- docs/manual/sitemap.html.tr.utf8	(revision 61)
+++ docs/manual/sitemap.html.tr.utf8	(working copy)
@@ -222,6 +222,7 @@
 <li><a href="mod/mod_proxy_connect.html">Apache Modülü mod_proxy_connect</a></li>
 <li><a href="mod/mod_proxy_ftp.html">Apache Modülü mod_proxy_ftp</a></li>
 <li><a href="mod/mod_proxy_http.html">Apache Modülü mod_proxy_http</a></li>
+<li><a href="mod/mod_proxy_scgi.html">Apache Modülü mod_proxy_scgi</a></li>
 <li><a href="mod/mod_rewrite.html">Apache Modülü mod_rewrite</a></li>
 <li><a href="mod/mod_setenvif.html">Apache Modülü mod_setenvif</a></li>
 <li><a href="mod/mod_so.html">Apache Modülü mod_so</a></li>
Index: docs/manual/mod/index.html.de
===================================================================
--- docs/manual/mod/index.html.de	(revision 61)
+++ docs/manual/mod/index.html.de	(working copy)
@@ -157,6 +157,7 @@
 <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dd>
 <dt><a href="mod_proxy_http.html">mod_proxy_http</a></dt><dd>HTTP support module for
 <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dd>
+<dt><a href="mod_proxy_scgi.html">mod_proxy_scgi</a></dt><dd>SCGI gateway module for <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dd>
 <dt><a href="mod_rewrite.html" id="R" name="R">mod_rewrite</a></dt><dd>Provides a rule-based rewriting engine to rewrite requested
 URLs on the fly</dd>
 <dt><a href="mod_setenvif.html" id="S" name="S">mod_setenvif</a></dt><dd>Allows the setting of environment variables based
Index: docs/manual/mod/quickreference.html.ko.euc-kr
===================================================================
--- docs/manual/mod/quickreference.html.ko.euc-kr	(revision 61)
+++ docs/manual/mod/quickreference.html.ko.euc-kr	(working copy)
@@ -484,6 +484,10 @@
 <tr><td><a href="mod_proxy.html#proxyremotematch">ProxyRemoteMatch <var>regex</var> <var>remote-server</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Remote proxy used to handle requests matched by regular
 expressions</td></tr>
 <tr class="odd"><td><a href="mod_proxy.html#proxyrequests">ProxyRequests On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables forward (standard) proxy requests</td></tr>
+<tr><td><a href="mod_proxy_scgi.html#proxyscgiinternalredirect">ProxySCGIInternalRedirect On|Off</a></td><td> On </td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Enable or disable internal redirect responses from the
+backend</td></tr>
+<tr class="odd"><td><a href="mod_proxy_scgi.html#proxyscgisendfile">ProxySCGISendfile On|Off|<var>Headername</var></a></td><td> Off </td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enable evaluation of <var>X-Sendfile</var> pseudo response
+header</td></tr>
 <tr><td><a href="mod_proxy.html#proxyset">ProxySet <var>url</var> <var>key=value [key=value ...]</var></a></td><td></td><td>d</td><td>E</td></tr><tr><td class="descr" colspan="4">Set various Proxy balancer or member parameters</td></tr>
 <tr class="odd"><td><a href="mod_proxy.html#proxystatus">ProxyStatus Off|On|Full</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Show Proxy LoadBalancer status in mod_status</td></tr>
 <tr><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>
Index: docs/manual/mod/index.html.en
===================================================================
--- docs/manual/mod/index.html.en	(revision 61)
+++ docs/manual/mod/index.html.en	(working copy)
@@ -155,6 +155,7 @@
 <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dd>
 <dt><a href="mod_proxy_http.html">mod_proxy_http</a></dt><dd>HTTP support module for
 <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dd>
+<dt><a href="mod_proxy_scgi.html">mod_proxy_scgi</a></dt><dd>SCGI gateway module for <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dd>
 <dt><a href="mod_rewrite.html" id="R" name="R">mod_rewrite</a></dt><dd>Provides a rule-based rewriting engine to rewrite requested
 URLs on the fly</dd>
 <dt><a href="mod_setenvif.html" id="S" name="S">mod_setenvif</a></dt><dd>Allows the setting of environment variables based
Index: docs/manual/mod/index.html.es
===================================================================
--- docs/manual/mod/index.html.es	(revision 61)
+++ docs/manual/mod/index.html.es	(working copy)
@@ -158,6 +158,7 @@
 <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dd>
 <dt><a href="mod_proxy_http.html">mod_proxy_http</a></dt><dd>HTTP support module for
 <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dd>
+<dt><a href="mod_proxy_scgi.html">mod_proxy_scgi</a></dt><dd>SCGI gateway module for <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dd>
 <dt><a href="mod_rewrite.html" id="R" name="R">mod_rewrite</a></dt><dd>Provides a rule-based rewriting engine to rewrite requested
 URLs on the fly</dd>
 <dt><a href="mod_setenvif.html" id="S" name="S">mod_setenvif</a></dt><dd>Allows the setting of environment variables based
Index: docs/manual/mod/quickreference.html.ru.koi8-r
===================================================================
--- docs/manual/mod/quickreference.html.ru.koi8-r	(revision 61)
+++ docs/manual/mod/quickreference.html.ru.koi8-r	(working copy)
@@ -225,553 +225,559 @@
 <tr class="odd"><td><a href="mod_cache.html#cacheignorenolastmod">CacheIgnoreNoLastMod On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Ignore the fact that a response has no Last Modified
 header.</td></tr>
 <tr><td><a href="mod_cache.html#cacheignorequerystring">CacheIgnoreQueryString On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Ignore query string when caching</td></tr>
-<tr class="odd"><td><a href="mod_cache.html#cachelastmodifiedfactor">CacheLastModifiedFactor <var>float</var></a></td><td> 0.1 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The factor used to compute an expiry date based on the
+<tr class="odd"><td><a href="mod_cache.html#cacheignoreurlsessionidentifiers">CacheIgnoreURLSessionIdentifiers <var>identifier</var> [<var>identifier</var>] ...</a></td><td> None </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Ignore defined session identifiers encoded in the URL when caching
+</td></tr>
+<tr><td><a href="mod_cache.html#cachelastmodifiedfactor">CacheLastModifiedFactor <var>float</var></a></td><td> 0.1 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">The factor used to compute an expiry date based on the
 LastModified date.</td></tr>
-<tr><td><a href="mod_cache.html#cachemaxexpire">CacheMaxExpire <var>seconds</var></a></td><td> 86400 (one day) </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">The maximum time in seconds to cache a document</td></tr>
-<tr class="odd"><td><a href="mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize <var>bytes</var></a></td><td> 1000000 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The maximum size (in bytes) of a document to be placed in the
+<tr class="odd"><td><a href="mod_cache.html#cachemaxexpire">CacheMaxExpire <var>seconds</var></a></td><td> 86400 (one day) </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The maximum time in seconds to cache a document</td></tr>
+<tr><td><a href="mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize <var>bytes</var></a></td><td> 1000000 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">The maximum size (in bytes) of a document to be placed in the
 cache</td></tr>
-<tr><td><a href="mod_disk_cache.html#cacheminfilesize">CacheMinFileSize <var>bytes</var></a></td><td> 1 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">The minimum size (in bytes) of a document to be placed in the
+<tr class="odd"><td><a href="mod_disk_cache.html#cacheminfilesize">CacheMinFileSize <var>bytes</var></a></td><td> 1 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The minimum size (in bytes) of a document to be placed in the
 cache</td></tr>
-<tr class="odd"><td><a href="mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs On|Off</a></td><td> Off </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Allows content-negotiated documents to be 
+<tr><td><a href="mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs On|Off</a></td><td> Off </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Allows content-negotiated documents to be 
 cached by proxy servers</td></tr>
-<tr><td><a href="mod_disk_cache.html#cacheroot">CacheRoot <var>directory</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">The directory root under which cache files are
+<tr class="odd"><td><a href="mod_disk_cache.html#cacheroot">CacheRoot <var>directory</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The directory root under which cache files are
 stored</td></tr>
-<tr class="odd"><td><a href="mod_cache.html#cachestorenostore">CacheStoreNoStore On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Attempt to cache requests or responses that have been marked as no-store.</td></tr>
-<tr><td><a href="mod_cache.html#cachestoreprivate">CacheStorePrivate On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Attempt to cache responses that the server has marked as private</td></tr>
-<tr class="odd"><td><a href="core.html#cgimapextension">CGIMapExtension <var>cgi-path</var> <var>.extension</var></a></td><td></td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Technique for locating the interpreter for CGI
+<tr><td><a href="mod_cache.html#cachestorenostore">CacheStoreNoStore On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Attempt to cache requests or responses that have been marked as no-store.</td></tr>
+<tr class="odd"><td><a href="mod_cache.html#cachestoreprivate">CacheStorePrivate On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Attempt to cache responses that the server has marked as private</td></tr>
+<tr><td><a href="core.html#cgimapextension">CGIMapExtension <var>cgi-path</var> <var>.extension</var></a></td><td></td><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">Technique for locating the interpreter for CGI
 scripts</td></tr>
-<tr><td><a href="mod_charset_lite.html#charsetdefault">CharsetDefault <var>charset</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Charset to translate into</td></tr>
-<tr class="odd"><td><a href="mod_charset_lite.html#charsetoptions">CharsetOptions <var>option</var> [<var>option</var>] ...</a></td><td> DebugLevel=0 NoImpl +</td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configures charset translation behavior</td></tr>
-<tr><td><a href="mod_charset_lite.html#charsetsourceenc">CharsetSourceEnc <var>charset</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Source charset of files</td></tr>
-<tr class="odd"><td><a href="mod_speling.html#checkcaseonly">CheckCaseOnly on|off</a></td><td> Off </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the action of the speling module to case corrections</td></tr>
-<tr><td><a href="mod_speling.html#checkspelling">CheckSpelling on|off</a></td><td> Off </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables the spelling 
+<tr class="odd"><td><a href="mod_charset_lite.html#charsetdefault">CharsetDefault <var>charset</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Charset to translate into</td></tr>
+<tr><td><a href="mod_charset_lite.html#charsetoptions">CharsetOptions <var>option</var> [<var>option</var>] ...</a></td><td> DebugLevel=0 NoImpl +</td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Configures charset translation behavior</td></tr>
+<tr class="odd"><td><a href="mod_charset_lite.html#charsetsourceenc">CharsetSourceEnc <var>charset</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Source charset of files</td></tr>
+<tr><td><a href="mod_speling.html#checkcaseonly">CheckCaseOnly on|off</a></td><td> Off </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Limits the action of the speling module to case corrections</td></tr>
+<tr class="odd"><td><a href="mod_speling.html#checkspelling">CheckSpelling on|off</a></td><td> Off </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables the spelling 
 module</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#chrootdir">ChrootDir <var>/path/to/directory</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Directory for apache to run chroot(8) after startup.</td></tr>
-<tr><td><a href="core.html#contentdigest">ContentDigest On|Off</a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Enables the generation of <code>Content-MD5</code> HTTP Response
+<tr><td><a href="mpm_common.html#chrootdir">ChrootDir <var>/path/to/directory</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Directory for apache to run chroot(8) after startup.</td></tr>
+<tr class="odd"><td><a href="core.html#contentdigest">ContentDigest On|Off</a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Enables the generation of <code>Content-MD5</code> HTTP Response
 headers</td></tr>
-<tr class="odd"><td><a href="mod_usertrack.html#cookiedomain">CookieDomain <em>domain</em></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The domain to which the tracking cookie applies</td></tr>
-<tr><td><a href="mod_usertrack.html#cookieexpires">CookieExpires <em>expiry-period</em></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Expiry time for the tracking cookie</td></tr>
-<tr class="odd"><td><a href="mod_log_config.html#cookielog">CookieLog <var>filename</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets filename for the logging of cookies</td></tr>
-<tr><td><a href="mod_usertrack.html#cookiename">CookieName <em>token</em></a></td><td> Apache </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Name of the tracking cookie</td></tr>
-<tr class="odd"><td><a href="mod_usertrack.html#cookiestyle">CookieStyle
-    <em>Netscape|Cookie|Cookie2|RFC2109|RFC2965</em></a></td><td> Netscape </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Format of the cookie header field</td></tr>
-<tr><td><a href="mod_usertrack.html#cookietracking">CookieTracking on|off</a></td><td> off </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables tracking cookie</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory <var>directory</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Directory where Apache attempts to
+<tr><td><a href="mod_usertrack.html#cookiedomain">CookieDomain <em>domain</em></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The domain to which the tracking cookie applies</td></tr>
+<tr class="odd"><td><a href="mod_usertrack.html#cookieexpires">CookieExpires <em>expiry-period</em></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Expiry time for the tracking cookie</td></tr>
+<tr><td><a href="mod_log_config.html#cookielog">CookieLog <var>filename</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets filename for the logging of cookies</td></tr>
+<tr class="odd"><td><a href="mod_usertrack.html#cookiename">CookieName <em>token</em></a></td><td> Apache </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Name of the tracking cookie</td></tr>
+<tr><td><a href="mod_usertrack.html#cookiestyle">CookieStyle
+    <em>Netscape|Cookie|Cookie2|RFC2109|RFC2965</em></a></td><td> Netscape </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Format of the cookie header field</td></tr>
+<tr class="odd"><td><a href="mod_usertrack.html#cookietracking">CookieTracking on|off</a></td><td> off </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables tracking cookie</td></tr>
+<tr><td><a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory <var>directory</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Directory where Apache attempts to
 switch before dumping core</td></tr>
-<tr><td><a href="mod_log_config.html#customlog">CustomLog  <var>file</var>|<var>pipe</var>
+<tr class="odd"><td><a href="mod_log_config.html#customlog">CustomLog  <var>file</var>|<var>pipe</var>
 <var>format</var>|<var>nickname</var>
-[env=[!]<var>environment-variable</var>]</a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets filename and format of log file</td></tr>
-<tr class="odd"><td><a href="mod_dav.html#dav" id="D" name="D">Dav On|Off|<var>provider-name</var></a></td><td> Off </td><td>d</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enable WebDAV HTTP methods</td></tr>
-<tr><td><a href="mod_dav.html#davdepthinfinity">DavDepthInfinity on|off</a></td><td> off </td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Allow PROPFIND, Depth: Infinity requests</td></tr>
-<tr class="odd"><td><a href="mod_dav_lock.html#davgenericlockdb">DavGenericLockDB <var>file-path</var></a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the DAV lock database</td></tr>
-<tr><td><a href="mod_dav_fs.html#davlockdb">DavLockDB <var>file-path</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Location of the DAV lock database</td></tr>
-<tr class="odd"><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Minimum amount of time the server holds a lock on
+[env=[!]<var>environment-variable</var>]</a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets filename and format of log file</td></tr>
+<tr><td><a href="mod_dav.html#dav" id="D" name="D">Dav On|Off|<var>provider-name</var></a></td><td> Off </td><td>d</td><td>E</td></tr><tr><td class="descr" colspan="4">Enable WebDAV HTTP methods</td></tr>
+<tr class="odd"><td><a href="mod_dav.html#davdepthinfinity">DavDepthInfinity on|off</a></td><td> off </td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Allow PROPFIND, Depth: Infinity requests</td></tr>
+<tr><td><a href="mod_dav_lock.html#davgenericlockdb">DavGenericLockDB <var>file-path</var></a></td><td></td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Location of the DAV lock database</td></tr>
+<tr class="odd"><td><a href="mod_dav_fs.html#davlockdb">DavLockDB <var>file-path</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the DAV lock database</td></tr>
+<tr><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum amount of time the server holds a lock on
 a DAV resource</td></tr>
-<tr><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
-<tr class="odd"><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td> 2 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum sustained number of connections</td></tr>
-<tr><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td> 10 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of connections</td></tr>
-<tr class="odd"><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td> 1 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Minimum number of connections</td></tr>
-<tr><td><a href="mod_dbd.html#dbdparams">DBDParams
-<var>param1</var>=<var>value1</var>[,<var>param2</var>=<var>value2</var>]</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Parameters for database connection</td></tr>
-<tr class="odd"><td><a href="mod_dbd.html#dbdpersist">DBDPersist On|Off</a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Whether to use persistent connections</td></tr>
-<tr><td><a href="mod_dbd.html#dbdpreparesql">DBDPrepareSQL <var>"SQL statement"</var> <var>label</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Define an SQL prepared statement</td></tr>
-<tr class="odd"><td><a href="mod_dbd.html#dbdriver">DBDriver <var>name</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Specify an SQL driver</td></tr>
-<tr><td><a href="mod_autoindex.html#defaulticon">DefaultIcon <var>url-path</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Icon to display for files when no specific icon is
+<tr class="odd"><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td> 2 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum sustained number of connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td> 10 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td> 1 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum number of connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdparams">DBDParams
+<var>param1</var>=<var>value1</var>[,<var>param2</var>=<var>value2</var>]</a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Parameters for database connection</td></tr>
+<tr><td><a href="mod_dbd.html#dbdpersist">DBDPersist On|Off</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Whether to use persistent connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdpreparesql">DBDPrepareSQL <var>"SQL statement"</var> <var>label</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Define an SQL prepared statement</td></tr>
+<tr><td><a href="mod_dbd.html#dbdriver">DBDriver <var>name</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Specify an SQL driver</td></tr>
+<tr class="odd"><td><a href="mod_autoindex.html#defaulticon">DefaultIcon <var>url-path</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Icon to display for files when no specific icon is
 configured</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#defaultlanguage">DefaultLanguage <var>MIME-lang</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets all files in the given scope to the specified
+<tr><td><a href="mod_mime.html#defaultlanguage">DefaultLanguage <var>MIME-lang</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets all files in the given scope to the specified
 language</td></tr>
-<tr><td><a href="core.html#defaulttype">DefaultType <var>MIME-type|none</var></a></td><td> text/plain </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">MIME content-type that will be sent if the
+<tr class="odd"><td><a href="core.html#defaulttype">DefaultType <var>MIME-type|none</var></a></td><td> text/plain </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">MIME content-type that will be sent if the
 server cannot determine a type in any other way</td></tr>
-<tr class="odd"><td><a href="mod_deflate.html#deflatebuffersize">DeflateBufferSize <var>value</var></a></td><td> 8096 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Fragment size to be compressed at one time by zlib</td></tr>
-<tr><td><a href="mod_deflate.html#deflatecompressionlevel">DeflateCompressionLevel <var>value</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">How much compression do we apply to the output</td></tr>
-<tr class="odd"><td><a href="mod_deflate.html#deflatefilternote">DeflateFilterNote [<var>type</var>] <var>notename</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Places the compression ratio in a note for logging</td></tr>
-<tr><td><a href="mod_deflate.html#deflatememlevel">DeflateMemLevel <var>value</var></a></td><td> 9 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">How much memory should be used by zlib for compression</td></tr>
-<tr class="odd"><td><a href="mod_deflate.html#deflatewindowsize">DeflateWindowSize <var>value</var></a></td><td> 15 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Zlib compression window size</td></tr>
-<tr><td><a href="mod_authz_host.html#deny"> Deny from all|<var>host</var>|env=[!]<var>env-variable</var>
-[<var>host</var>|env=[!]<var>env-variable</var>] ...</a></td><td></td><td>dh</td><td>B</td></tr><tr><td class="descr" colspan="4">Controls which hosts are denied access to the
+<tr><td><a href="mod_deflate.html#deflatebuffersize">DeflateBufferSize <var>value</var></a></td><td> 8096 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Fragment size to be compressed at one time by zlib</td></tr>
+<tr class="odd"><td><a href="mod_deflate.html#deflatecompressionlevel">DeflateCompressionLevel <var>value</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">How much compression do we apply to the output</td></tr>
+<tr><td><a href="mod_deflate.html#deflatefilternote">DeflateFilterNote [<var>type</var>] <var>notename</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Places the compression ratio in a note for logging</td></tr>
+<tr class="odd"><td><a href="mod_deflate.html#deflatememlevel">DeflateMemLevel <var>value</var></a></td><td> 9 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">How much memory should be used by zlib for compression</td></tr>
+<tr><td><a href="mod_deflate.html#deflatewindowsize">DeflateWindowSize <var>value</var></a></td><td> 15 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Zlib compression window size</td></tr>
+<tr class="odd"><td><a href="mod_authz_host.html#deny"> Deny from all|<var>host</var>|env=[!]<var>env-variable</var>
+[<var>host</var>|env=[!]<var>env-variable</var>] ...</a></td><td></td><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Controls which hosts are denied access to the
 server</td></tr>
-<tr class="odd"><td><a href="core.html#directory">&lt;Directory <var>directory-path</var>&gt;
-... &lt;/Directory&gt;</a></td><td></td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Enclose a group of directives that apply only to the
+<tr><td><a href="core.html#directory">&lt;Directory <var>directory-path</var>&gt;
+... &lt;/Directory&gt;</a></td><td></td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Enclose a group of directives that apply only to the
 named file-system directory and sub-directories</td></tr>
-<tr><td><a href="mod_dir.html#directoryindex">DirectoryIndex
-    <var>local-url</var> [<var>local-url</var>] ...</a></td><td> index.html </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">List of resources to look for when the client requests
+<tr class="odd"><td><a href="mod_dir.html#directoryindex">DirectoryIndex
+    <var>local-url</var> [<var>local-url</var>] ...</a></td><td> index.html </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">List of resources to look for when the client requests
 a directory</td></tr>
-<tr class="odd"><td><a href="core.html#directorymatch">&lt;DirectoryMatch <var>regex</var>&gt;
-... &lt;/DirectoryMatch&gt;</a></td><td></td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Enclose directives that apply to
+<tr><td><a href="core.html#directorymatch">&lt;DirectoryMatch <var>regex</var>&gt;
+... &lt;/DirectoryMatch&gt;</a></td><td></td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Enclose directives that apply to
 file-system directories matching a regular expression and their
 subdirectories</td></tr>
-<tr><td><a href="mod_dir.html#directoryslash">DirectorySlash On|Off</a></td><td> On </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Toggle trailing slash redirects on or off</td></tr>
-<tr class="odd"><td><a href="core.html#documentroot">DocumentRoot <var>directory-path</var></a></td><td> /usr/local/apache/h +</td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Directory that forms the main document tree visible
+<tr class="odd"><td><a href="mod_dir.html#directoryslash">DirectorySlash On|Off</a></td><td> On </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Toggle trailing slash redirects on or off</td></tr>
+<tr><td><a href="core.html#documentroot">DocumentRoot <var>directory-path</var></a></td><td> /usr/local/apache/h +</td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Directory that forms the main document tree visible
 from the web</td></tr>
-<tr><td><a href="mod_dumpio.html#dumpioinput">DumpIOInput On|Off</a></td><td> Off </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Dump all input data to the error log</td></tr>
-<tr class="odd"><td><a href="mod_dumpio.html#dumpiologlevel">DumpIOLogLevel <var>level</var></a></td><td> debug </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Controls the logging level of the DumpIO output</td></tr>
-<tr><td><a href="mod_dumpio.html#dumpiooutput">DumpIOOutput On|Off</a></td><td> Off </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Dump all output data to the error log</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#enableexceptionhook" id="E" name="E">EnableExceptionHook On|Off</a></td><td> Off </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Enables a hook that runs exception handlers
+<tr class="odd"><td><a href="mod_dumpio.html#dumpioinput">DumpIOInput On|Off</a></td><td> Off </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dump all input data to the error log</td></tr>
+<tr><td><a href="mod_dumpio.html#dumpiologlevel">DumpIOLogLevel <var>level</var></a></td><td> debug </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Controls the logging level of the DumpIO output</td></tr>
+<tr class="odd"><td><a href="mod_dumpio.html#dumpiooutput">DumpIOOutput On|Off</a></td><td> Off </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dump all output data to the error log</td></tr>
+<tr><td><a href="mpm_common.html#enableexceptionhook" id="E" name="E">EnableExceptionHook On|Off</a></td><td> Off </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Enables a hook that runs exception handlers
 after a crash</td></tr>
-<tr><td><a href="core.html#enablemmap">EnableMMAP On|Off</a></td><td> On </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Use memory-mapping to read files during delivery</td></tr>
-<tr class="odd"><td><a href="core.html#enablesendfile">EnableSendfile On|Off</a></td><td> On </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Use the kernel sendfile support to deliver files to the client</td></tr>
-<tr><td><a href="core.html#errordocument">ErrorDocument <var>error-code</var> <var>document</var></a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">What the server will return to the client
+<tr class="odd"><td><a href="core.html#enablemmap">EnableMMAP On|Off</a></td><td> On </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Use memory-mapping to read files during delivery</td></tr>
+<tr><td><a href="core.html#enablesendfile">EnableSendfile On|Off</a></td><td> On </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Use the kernel sendfile support to deliver files to the client</td></tr>
+<tr class="odd"><td><a href="core.html#errordocument">ErrorDocument <var>error-code</var> <var>document</var></a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">What the server will return to the client
 in case of an error</td></tr>
-<tr class="odd"><td><a href="core.html#errorlog"> ErrorLog <var>file-path</var>|syslog[:<var>facility</var>]</a></td><td> logs/error_log (Uni +</td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Location where the server will log errors</td></tr>
-<tr><td><a href="mod_example.html#example">Example</a></td><td></td><td>svdh</td><td>X</td></tr><tr><td class="descr" colspan="4">Demonstration directive to illustrate the Apache module
+<tr><td><a href="core.html#errorlog"> ErrorLog <var>file-path</var>|syslog[:<var>facility</var>]</a></td><td> logs/error_log (Uni +</td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Location where the server will log errors</td></tr>
+<tr class="odd"><td><a href="mod_example.html#example">Example</a></td><td></td><td>svdh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Demonstration directive to illustrate the Apache module
 API</td></tr>
-<tr class="odd"><td><a href="mod_expires.html#expiresactive">ExpiresActive On|Off</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables generation of <code>Expires</code>
+<tr><td><a href="mod_expires.html#expiresactive">ExpiresActive On|Off</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables generation of <code>Expires</code>
 headers</td></tr>
-<tr><td><a href="mod_expires.html#expiresbytype">ExpiresByType <var>MIME-type</var>
-<var>&lt;code&gt;seconds</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Value of the <code>Expires</code> header configured
+<tr class="odd"><td><a href="mod_expires.html#expiresbytype">ExpiresByType <var>MIME-type</var>
+<var>&lt;code&gt;seconds</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Value of the <code>Expires</code> header configured
 by MIME type</td></tr>
-<tr class="odd"><td><a href="mod_expires.html#expiresdefault">ExpiresDefault <var>&lt;code&gt;seconds</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Default algorithm for calculating expiration time</td></tr>
-<tr><td><a href="mod_status.html#extendedstatus">ExtendedStatus On|Off</a></td><td> Off </td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">Keep track of extended status information for each 
+<tr><td><a href="mod_expires.html#expiresdefault">ExpiresDefault <var>&lt;code&gt;seconds</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Default algorithm for calculating expiration time</td></tr>
+<tr class="odd"><td><a href="mod_status.html#extendedstatus">ExtendedStatus On|Off</a></td><td> Off </td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Keep track of extended status information for each 
 request</td></tr>
-<tr class="odd"><td><a href="mod_ext_filter.html#extfilterdefine">ExtFilterDefine <var>filtername</var> <var>parameters</var></a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Define an external filter</td></tr>
-<tr><td><a href="mod_ext_filter.html#extfilteroptions">ExtFilterOptions <var>option</var> [<var>option</var>] ...</a></td><td> DebugLevel=0 NoLogS +</td><td>d</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> options</td></tr>
-<tr class="odd"><td><a href="core.html#fileetag" id="F" name="F">FileETag <var>component</var> ...</a></td><td> INode MTime Size </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">File attributes used to create the ETag
+<tr><td><a href="mod_ext_filter.html#extfilterdefine">ExtFilterDefine <var>filtername</var> <var>parameters</var></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="