OpenXM_contrib2/asir2000/configure - diff

Return to configure CVS log

Up to [local] / OpenXM_contrib2 / asir2000

Diff for /OpenXM_contrib2/asir2000/configure between version 1.49 and 1.56

-version 1.49, 2009/03/16 16:08:05
+version 1.56, 2013/02/12 09:40:41
 Line 1
 Line 1
 Line 1
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.62.
+ # Generated by GNU Autoconf 2.69.
  #
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+ #
- # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # Copyright (C) 1992-1996, 1998-2012 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
-Line 20  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/
+Line 22  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/
 Line 20  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/
 Line 22  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
-   case `(set -o) 2>/dev/null` in
+   case `(set -o) 2>/dev/null` in #(
-   *posix*) set -o posix ;;
+   *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
-Line 44  export as_nl
+Line 38  export as_nl
 Line 44  export as_nl
 Line 38  export as_nl
  as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
- 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
 Line 55  else
 Line 55  else
 Line 55  else
      as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
      as_echo_n_body='eval
        arg=$1;
-       case $arg in
+       case $arg in #(
        *"$as_nl"*)
          expr "X$arg" : "X\\(.*\\)$as_nl";
          arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
 Line 78  if test "${PATH_SEPARATOR+set}" != set; then
 Line 78  if test "${PATH_SEPARATOR+set}" != set; then
 Line 78  if test "${PATH_SEPARATOR+set}" != set; then
    }
  fi
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-   as_unset=unset
- else
-   as_unset=false
- fi
  # IFS
  # We need space, tab and new line, in precisely that order.  Quoting is
  # there to prevent editors from complaining about space-tab.
-Line 94  fi
+Line 87  fi
 Line 94  fi
 Line 87  fi
  IFS=" ""        $as_nl"
  # Find who we are.  Look in the path if we contain no directory separator.
- case $0 in
+ as_myself=
+ 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
+     test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
- done
+   done
  IFS=$as_save_IFS
       ;;
-Line 114  if test "x$as_myself" = x; then
+Line 108  if test "x$as_myself" = x; then
 Line 114  if test "x$as_myself" = x; then
 Line 108  if test "x$as_myself" = x; then
  fi
  if test ! -f "$as_myself"; then
    $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-   { (exit 1); exit 1; }
+   exit 1
  fi
- # Work around bugs in pre-3.0 UWIN ksh.
+ # Unset variables that we do not need and which cause bugs (e.g. in
- for as_var in ENV MAIL MAILPATH
+ # pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ # 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='> '
-Line 131  export LC_ALL
+Line 129  export LC_ALL
 Line 131  export LC_ALL
 Line 129  export LC_ALL
  LANGUAGE=C
  export LANGUAGE
- # Required to use basename.
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-    test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
- else
-   as_expr=false
- fi
- if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-   as_basename=basename
- else
-   as_basename=false
- fi
- # Name of the executable.
- as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-          X"$0" : 'X\(//\)$' \| \
-          X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- $as_echo X/"$0" |
-     sed '/^.*\/\([^/][^/]*\)\/*$/{
-             s//\1/
-             q
-           }
-           /^X\/\(\/\/\)$/{
-             s//\1/
-             q
-           }
-           /^X\/\(\/\).*/{
-             s//\1/
-             q
-           }
-           s/.*/./; q'`
  # CDPATH.
- $as_unset CDPATH
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ # Use a proper internal environment variable to ensure we don't fall
+   # into an infinite loop, continuously re-executing ourselves.
+   if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+     _as_can_reexec=no; export _as_can_reexec;
+     # 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.
+ # Preserve -v and -x to the replacement shell.
+ BASH_ENV=/dev/null
+ ENV=/dev/null
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+ case $- in # ((((
+   *v*x* | *x*v* ) as_opts=-vx ;;
+   *v* ) as_opts=-v ;;
+   *x* ) as_opts=-x ;;
+   * ) as_opts= ;;
+ esac
+ exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+ # Admittedly, this is quite paranoid, since all the known shells bail
+ # out after a failed `exec'.
+ $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+ as_fn_exit 255
+   fi
+   # We don't want this to propagate to other subprocesses.
+           { _as_can_reexec=; unset _as_can_reexec;}
  if test "x$CONFIG_SHELL" = x; then
-   if (eval ":") 2>/dev/null; then
+   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-   as_have_required=yes
+   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
+ as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-   :
+ as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
- else
+ as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-   exitcode=1
+ as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-   echo as_func_success failed.
+ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
- fi
- if as_func_failure; then
-   exitcode=1
-   echo as_func_failure succeeded.
- fi
- if as_func_ret_success; then
-   :
  else
-   exitcode=1
+   exitcode=1; echo positional parameters were not saved.
-   echo as_func_ret_success failed.
  fi
+ test x\$exitcode = x0 || exit 1
- if as_func_ret_failure; then
+ test -x / || exit 1"
-   exitcode=1
+   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-   echo as_func_ret_failure succeeded.
+   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
- fi
+   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
- if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+ test \$(( 1 + 1 )) = 2 || exit 1"
-   :
+   if (eval "$as_required") 2>/dev/null; then :
+   as_have_required=yes
  else
-   exitcode=1
+   as_have_required=no
-   echo positional parameters were not saved.
  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
+       if test "x$CONFIG_SHELL" != x; then :
-          # Try only shells that exist, to save several forks.
+   export CONFIG_SHELL
-          if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+              # We cannot yet assume a decent shell, so we have to provide a
-                 { ("$as_shell") 2> /dev/null <<\_ASEOF
+ # neutralization value for shells without unset; and this also
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ # works around shells that cannot unset nonexistent variables.
-   emulate sh
+ # Preserve -v and -x to the replacement shell.
-   NULLCMD=:
+ BASH_ENV=/dev/null
-   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+ ENV=/dev/null
-   # is contrary to our usage.  Disable this feature.
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-   alias -g '${1+"$@"}'='"$@"'
+ case $- in # ((((
-   setopt NO_GLOB_SUBST
+   *v*x* | *x*v* ) as_opts=-vx ;;
- else
+   *v* ) as_opts=-v ;;
-   case `(set -o) 2>/dev/null` in
+   *x* ) as_opts=-x ;;
-   *posix*) set -o posix ;;
+   * ) as_opts= ;;
  esac
+ exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+ # Admittedly, this is quite paranoid, since all the known shells bail
+ # out after a failed `exec'.
+ $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+ exit 255
  fi
+     if test x$as_have_required = xno; then :
- :
+   $as_echo "$0: This script requires a shell more modern than all"
- _ASEOF
+   $as_echo "$0: the shells that I found on your system."
- }; then
+   if test x${ZSH_VERSION+set} = xset ; then
-   CONFIG_SHELL=$as_shell
+     $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-                as_have_required=yes
+     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-                if { "$as_shell" 2> /dev/null <<\_ASEOF
+   else
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+     $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
-   emulate sh
+ $0: including any error possibly output before this
-   NULLCMD=:
+ $0: message. Then install a modern shell, or manually run
-   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+ $0: the script under such a shell if you do have one."
-   # is contrary to our usage.  Disable this feature.
+   fi
-   alias -g '${1+"$@"}'='"$@"'
+   exit 1
-   setopt NO_GLOB_SUBST
- else
-   case `(set -o) 2>/dev/null` in
-   *posix*) set -o posix ;;
- esac
  fi
- :
- (as_func_return () {
-   (exit $1)
- }
- as_func_success () {
-   as_func_return 0
- }
- as_func_failure () {
-   as_func_return 1
- }
- as_func_ret_success () {
-   return 0
- }
- as_func_ret_failure () {
-   return 1
- }
- exitcode=0
- if as_func_success; then
-   :
- else
-   exitcode=1
-   echo as_func_success failed.
  fi
- if as_func_failure; then
-   exitcode=1
-   echo as_func_failure succeeded.
  fi
+ 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
+ ## --------------------- ##
-   :
+ ## M4sh Shell Functions. ##
- else
+ ## --------------------- ##
-   exitcode=1
+ # as_fn_unset VAR
-   echo as_func_ret_success failed.
+ # ---------------
- fi
+ # Portably unset VAR.
+ as_fn_unset ()
+ {
+   { eval $1=; unset $1;}
+ }
+ as_unset=as_fn_unset
- if as_func_ret_failure; then
+ # as_fn_set_status STATUS
-   exitcode=1
+ # -----------------------
-   echo as_func_ret_failure succeeded.
+ # Set $? to STATUS, without forking.
- fi
+ as_fn_set_status ()
+ {
+   return $1
+ } # as_fn_set_status
- if ( set x; as_func_ret_success y && test x = "$1" ); then
+ # as_fn_exit STATUS
-   :
+ # -----------------
- else
+ # Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-   exitcode=1
+ as_fn_exit ()
-   echo positional parameters were not saved.
+ {
- fi
+   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 ()
+ {
- (
+   case $as_dir in #(
-   as_lineno_1=$LINENO
+   -*) as_dir=./$as_dir;;
-   as_lineno_2=$LINENO
+   esac
-   test "x$as_lineno_1" != "x$as_lineno_2" &&
+   test -d "$as_dir" || eval $as_mkdir_p || {
-   test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+     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
-       done
+ # as_fn_executable_p FILE
+ # -----------------------
+ # Test if FILE is an executable regular file.
+ as_fn_executable_p ()
+ {
+   test -f "$1" && test -x "$1"
+ } # as_fn_executable_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
-       if test "x$CONFIG_SHELL" != x; then
+ # as_fn_arith ARG...
-   for as_var in BASH_ENV ENV
+ # ------------------
-         do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ # Perform arithmetic evaluation on the ARGs, and store the result in the
-         done
+ # global $as_val. Take advantage of shells that can avoid forks. The arguments
-         export CONFIG_SHELL
+ # must be portable across $(()) and expr.
-         exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
- fi
+   eval 'as_fn_arith ()
+   {
+     as_val=$(( $* ))
+   }'
+ else
+   as_fn_arith ()
+   {
+     as_val=`expr "$@" || test $? -eq 1`
+   }
+ fi # as_fn_arith
-     if test $as_have_required = no; then
+ # as_fn_error STATUS ERROR [LINENO LOG_FD]
-   echo This script requires a shell more modern than all the
+ # ----------------------------------------
-       echo shells that I found on your system.  Please install a
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-       echo modern shell, or manually run the script under such a
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-       echo shell if you do have one.
+ # script with STATUS, using 1 if that was 0.
-       { (exit 1); exit 1; }
+ as_fn_error ()
- fi
+ {
+   as_status=$1; test $as_status -eq 0 && as_status=1
+   if test "$4"; then
+     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+   fi
+   $as_echo "$as_me: error: $2" >&2
+   as_fn_exit $as_status
+ } # as_fn_error
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
- fi
+    test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
- fi
- (eval "as_func_return () {
-   (exit \$1)
- }
- as_func_success () {
-   as_func_return 0
- }
- as_func_failure () {
-   as_func_return 1
- }
- as_func_ret_success () {
-   return 0
- }
- as_func_ret_failure () {
-   return 1
- }
- exitcode=0
- if as_func_success; then
-   :
  else
-   exitcode=1
+   as_expr=false
-   echo as_func_success failed.
  fi
- if as_func_failure; then
+ if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-   exitcode=1
+   as_basename=basename
-   echo as_func_failure succeeded.
- fi
- if as_func_ret_success; then
-   :
  else
-   exitcode=1
+   as_basename=false
-   echo as_func_ret_success failed.
  fi
- if as_func_ret_failure; then
+ if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-   exitcode=1
+   as_dirname=dirname
-   echo as_func_ret_failure succeeded.
- fi
- if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-   :
  else
-   exitcode=1
+   as_dirname=false
-   echo positional parameters were not saved.
  fi
- test \$exitcode = 0") || {
+ as_me=`$as_basename -- "$0" ||
-   echo No shell found that supports shell functions.
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-   echo Please tell bug-autoconf@gnu.org about your system,
+          X"$0" : 'X\(//\)$' \| \
-   echo including any error possibly output before this message.
+          X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-   echo This can help us improve future autoconf versions.
+ $as_echo X/"$0" |
-   echo Configuration will now proceed without shell functions.
+     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_1=$LINENO as_lineno_1a=$LINENO
-   as_lineno_2=$LINENO
+   as_lineno_2=$LINENO as_lineno_2a=$LINENO
-   test "x$as_lineno_1" != "x$as_lineno_2" &&
+   eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-   test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+   test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+   # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-   # uniformly replaced by the line number.  The first 'sed' inserts a
-   # line-number line after each line using $LINENO; the second 'sed'
-   # does the real work.  The second script uses 'N' to pair each
-   # line-number line with the line containing $LINENO, and appends
-   # trailing '-' during substitution so that $LINENO is not a special
-   # case at line end.
-   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-   # scripts with optimization help from Paolo Bonzini.  Blame Lee
-   # E. McMahon (1931-1989) for sed's syntax.  :-)
    sed -n '
      p
      /[$]LINENO/=
-Line 471  test \$exitcode = 0") || {
+Line 483  test \$exitcode = 0") || {
 Line 471  test \$exitcode = 0") || {
 Line 483  test \$exitcode = 0") || {
        s/-\n.*//
      ' >$as_me.lineno &&
    chmod +x "$as_me.lineno" ||
-     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-    { (exit 1); exit 1; }; }
+   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+   # already done that, so ensure we don't try to do so again and fall
+   # in an infinite loop.  This has already happened in practice.
+   _as_can_reexec=no; export _as_can_reexec
    # 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).
-Line 482  test \$exitcode = 0") || {
+Line 497  test \$exitcode = 0") || {
 Line 482  test \$exitcode = 0") || {
 Line 497  test \$exitcode = 0") || {
    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
-Line 519  if (echo >conf$$.file) 2>/dev/null; then
+Line 523  if (echo >conf$$.file) 2>/dev/null; then
 Line 519  if (echo >conf$$.file) 2>/dev/null; then
 Line 523  if (echo >conf$$.file) 2>/dev/null; then
      # ... but there are two gotchas:
      # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
      # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-     # In both cases, we have to default to `cp -p'.
+     # In both cases, we have to default to `cp -pR'.
      ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-       as_ln_s='cp -p'
+       as_ln_s='cp -pR'
    elif ln conf$$.file conf$$ 2>/dev/null; then
      as_ln_s=ln
    else
-     as_ln_s='cp -p'
+     as_ln_s='cp -pR'
    fi
  else
-   as_ln_s='cp -p'
+   as_ln_s='cp -pR'
  fi
  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
  rmdir conf$$.dir 2>/dev/null
  if mkdir -p . 2>/dev/null; then
-   as_mkdir_p=:
+   as_mkdir_p='mkdir -p "$as_dir"'
  else
    test -d ./-p && rmdir ./-p
    as_mkdir_p=false
  fi
- if test -x / >/dev/null 2>&1; then
+ as_test_x='test -x'
-   as_test_x='test -x'
+ as_executable_p=as_fn_executable_p
- else
-   if ls -dL / >/dev/null 2>&1; then
-     as_ls_L_option=L
-   else
-     as_ls_L_option=
-   fi
-   as_test_x='
-     eval sh -c '\''
-       if test -d "$1"; then
-         test -d "$1/.";
-       else
-         case $1 in
-         -*)set "./$1";;
-         esac;
-         case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-         ???[sx]*):;;*)false;;esac;fi
-     '\'' sh
-   '
- fi
- as_executable_p=$as_test_x
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-Line 570  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS
+Line 554  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS
 Line 570  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS
 Line 554  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+ test -n "$DJDIR" || exec 7<&0 </dev/null
+ exec 6>&1
- exec 7<&0 </dev/null 6>&1
  # Name of the host.
- # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+ # hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
  # so uname gets run too.
  ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-Line 589  cross_compiling=no
+Line 573  cross_compiling=no
 Line 589  cross_compiling=no
 Line 573  cross_compiling=no
  subdirs=
  MFLAGS=
  MAKEFLAGS=
- SHELL=${CONFIG_SHELL-/bin/sh}
  # Identity of this package.
  PACKAGE_NAME=
-Line 597  PACKAGE_TARNAME=
+Line 580  PACKAGE_TARNAME=
 Line 597  PACKAGE_TARNAME=
 Line 580  PACKAGE_TARNAME=
  PACKAGE_VERSION=
  PACKAGE_STRING=
  PACKAGE_BUGREPORT=
+ PACKAGE_URL=
  ac_unique_file="LICENSE"
  # Factoring default headers for most tests.
-Line 635  ac_includes_default="\
+Line 619  ac_includes_default="\
 Line 635  ac_includes_default="\
 Line 619  ac_includes_default="\
  # include <unistd.h>
  #endif"
- ac_subst_vars='SHELL
+ ac_subst_vars='am__EXEEXT_FALSE
- PATH_SEPARATOR
+ am__EXEEXT_TRUE
- PACKAGE_NAME
+ LTLIBOBJS
- PACKAGE_TARNAME
- PACKAGE_VERSION
- PACKAGE_STRING
- PACKAGE_BUGREPORT
- exec_prefix
- prefix
- program_transform_name
- bindir
- sbindir
- libexecdir
- datarootdir
- datadir
- sysconfdir
- sharedstatedir
- localstatedir
- includedir
- oldincludedir
- docdir
- infodir
- htmldir
- dvidir
- pdfdir
- psdir
- libdir
- localedir
- mandir
- DEFS
- ECHO_C
- ECHO_N
- ECHO_T
- LIBS
- build_alias
- host_alias
- target_alias
- build
- build_cpu
- build_vendor
- build_os
- host
- host_cpu
- host_vendor
- host_os
- target
- target_cpu
- target_vendor
- target_os
- INSTALL_PROGRAM
- INSTALL_SCRIPT
- INSTALL_DATA
- am__isrc
- CYGPATH_W
- PACKAGE
- VERSION
- ACLOCAL
- AUTOCONF
- AUTOMAKE
- AUTOHEADER
- MAKEINFO
- install_sh
- STRIP
- INSTALL_STRIP_PROGRAM
- MKDIR_P
- mkdir_p
- AWK
- SET_MAKE
- am__leading_dot
- AMTAR
- am__tar
- am__untar
- MAINTAINER_MODE_TRUE
- MAINTAINER_MODE_FALSE
- MAINT
- CC
- CFLAGS
- LDFLAGS
- CPPFLAGS
- ac_ct_CC
- EXEEXT
- OBJEXT
- DEPDIR
- am__include
- am__quote
- AMDEP_TRUE
- AMDEP_FALSE
- AMDEPBACKSLASH
- CCDEPMODE
- am__fastdepCC_TRUE
- am__fastdepCC_FALSE
- LN_S
- RANLIB
- YACC
- YFLAGS
- XMKMF
- CPP
- X_CFLAGS
- X_PRE_LIBS
- X_LIBS
- X_EXTRA_LIBS
- ASIR_GCLIB
- GCLIB
- GCINC
- GC
- GC_CONFIGURE_ARGS
- USE_GC7_TRUE
- USE_GC7_FALSE
- GC_DISTDIR
- PARIINC
- PARILIB
- GREP
- EGREP
- XPMLIB
- USE_PLOT_TRUE
- USE_PLOT_FALSE
- FEPLIB
- LAPACKLIB
- libasir_postfix
- USE_GC_SPARC64
- asm_obj
  LIBOBJS
- LTLIBOBJS'
+ asm_obj
+ USE_GC_SPARC64
+ libasir_postfix
+ LAPACKLIB
+ FEPLIB
+ USE_PLOT_FALSE
+ USE_PLOT_TRUE
+ XPMLIB
+ EGREP
+ GREP
+ PARILIB
+ PARIINC
+ GC_DISTDIR
+ GC_CONFIGURE_ARGS
+ GC
+ GCINC
+ GCLIB
+ ASIR_GCLIB
+ X_EXTRA_LIBS
+ X_LIBS
+ X_PRE_LIBS
+ X_CFLAGS
+ CPP
+ XMKMF
+ YFLAGS
+ YACC
+ RANLIB
+ LN_S
+ am__fastdepCC_FALSE
+ am__fastdepCC_TRUE
+ CCDEPMODE
+ am__nodep
+ AMDEPBACKSLASH
+ AMDEP_FALSE
+ AMDEP_TRUE
+ am__quote
+ am__include
+ DEPDIR
+ OBJEXT
+ EXEEXT
+ ac_ct_CC
+ CPPFLAGS
+ LDFLAGS
+ CFLAGS
+ CC
+ MAINT
+ MAINTAINER_MODE_FALSE
+ MAINTAINER_MODE_TRUE
+ am__untar
+ am__tar
+ AMTAR
+ am__leading_dot
+ SET_MAKE
+ AWK
+ mkdir_p
+ MKDIR_P
+ INSTALL_STRIP_PROGRAM
+ STRIP
+ install_sh
+ MAKEINFO
+ AUTOHEADER
+ AUTOMAKE
+ AUTOCONF
+ ACLOCAL
+ VERSION
+ PACKAGE
+ CYGPATH_W
+ am__isrc
+ INSTALL_DATA
+ INSTALL_SCRIPT
+ INSTALL_PROGRAM
+ target_os
+ target_vendor
+ target_cpu
+ target
+ host_os
+ host_vendor
+ host_cpu
+ host
+ build_os
+ build_vendor
+ build_cpu
+ build
+ target_alias
+ host_alias
+ build_alias
+ LIBS
+ ECHO_T
+ ECHO_N
+ ECHO_C
+ DEFS
+ mandir
+ localedir
+ libdir
+ psdir
+ pdfdir
+ dvidir
+ htmldir
+ infodir
+ docdir
+ oldincludedir
+ includedir
+ localstatedir
+ sharedstatedir
+ sysconfdir
+ datadir
+ datarootdir
+ libexecdir
+ sbindir
+ bindir
+ program_transform_name
+ prefix
+ exec_prefix
+ PACKAGE_URL
+ PACKAGE_BUGREPORT
+ PACKAGE_STRING
+ PACKAGE_VERSION
+ PACKAGE_TARNAME
+ PACKAGE_NAME
+ PATH_SEPARATOR
+ SHELL'
  ac_subst_files=''
  ac_user_opts='
  enable_option_checking
-Line 766  enable_dependency_tracking
+Line 752  enable_dependency_tracking
 Line 766  enable_dependency_tracking
 Line 752  enable_dependency_tracking
  with_x
  enable_shared
  with_asir_gc
- with_gc7
  with_distdir
  with_pari
  enable_plot
-Line 848  do
+Line 833  do
 Line 848  do
 Line 833  do
    fi
    case $ac_option in
-   *=*)  ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+   *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-   *)    ac_optarg=yes ;;
+   *=)   ac_optarg= ;;
+   *)    ac_optarg=yes ;;
    esac
    # Accept the important Cygnus configure options, so we can diagnose typos.
-Line 894  do
+Line 880  do
 Line 894  do
 Line 880  do
      ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-       { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+       as_fn_error $? "invalid feature name: $ac_useropt"
-    { (exit 1); exit 1; }; }
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-Line 921  do
+Line 906  do
 Line 921  do
 Line 906  do
      ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-       { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+       as_fn_error $? "invalid feature name: $ac_useropt"
-    { (exit 1); exit 1; }; }
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-Line 1126  do
+Line 1110  do
 Line 1126  do
 Line 1110  do
      ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-       { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+       as_fn_error $? "invalid package name: $ac_useropt"
-    { (exit 1); exit 1; }; }
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-Line 1143  do
+Line 1126  do
 Line 1143  do
 Line 1126  do
      ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-       { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+       as_fn_error $? "invalid package name: $ac_useropt"
-    { (exit 1); exit 1; }; }
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-Line 1174  do
+Line 1156  do
 Line 1174  do
 Line 1156  do
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
-   -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
+   -*) as_fn_error $? "unrecognized option: \`$ac_option'
- Try \`$0 --help' for more information." >&2
+ Try \`$0 --help' for more information"
-    { (exit 1); exit 1; }; }
      ;;
    *=*)
      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 &&
+     case $ac_envvar in #(
-       { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+       '' | [0-9]* | *[!_$as_cr_alnum]* )
-    { (exit 1); exit 1; }; }
+       as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+     esac
      eval $ac_envvar=\$ac_optarg
      export $ac_envvar ;;
-Line 1193  Try \`$0 --help' for more information." >&2
+Line 1175  Try \`$0 --help' for more information." >&2
 Line 1193  Try \`$0 --help' for more information." >&2
 Line 1175  Try \`$0 --help' for more information." >&2
      $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
      expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
        $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
      ;;
    esac
-Line 1201  done
+Line 1183  done
 Line 1201  done
 Line 1183  done
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-   { $as_echo "$as_me: error: missing argument to $ac_option" >&2
+   as_fn_error $? "missing argument to $ac_option"
-    { (exit 1); exit 1; }; }
  fi
  if test -n "$ac_unrecognized_opts"; then
    case $enable_option_checking in
      no) ;;
-     fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2
+     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    { (exit 1); exit 1; }; } ;;
+     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-     *)     $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
    esac
  fi
-Line 1232  do
+Line 1212  do
 Line 1232  do
 Line 1212  do
      [\\/$]* | ?:[\\/]* )  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
+   as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
-    { (exit 1); exit 1; }; }
  done
  # There might be people who depend on the old broken behavior: `$host'
-Line 1247  target=$target_alias
+Line 1226  target=$target_alias
 Line 1247  target=$target_alias
 Line 1226  target=$target_alias
  if test "x$host_alias" != x; then
    if test "x$build_alias" = x; then
      cross_compiling=maybe
-     $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-     If a cross compiler is detected then cross compile mode will be used." >&2
    elif test "x$build_alias" != "x$host_alias"; then
      cross_compiling=yes
    fi
-Line 1263  test "$silent" = yes && exec 6>/dev/null
+Line 1240  test "$silent" = yes && exec 6>/dev/null
 Line 1263  test "$silent" = yes && exec 6>/dev/null
 Line 1240  test "$silent" = yes && exec 6>/dev/null
  ac_pwd=`pwd` && test -n "$ac_pwd" &&
  ac_ls_di=`ls -di .` &&
  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-   { $as_echo "$as_me: error: Working directory cannot be determined" >&2
+   as_fn_error $? "working directory cannot be determined"
-    { (exit 1); exit 1; }; }
  test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-   { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
+   as_fn_error $? "pwd does not report name of working directory"
-    { (exit 1); exit 1; }; }
  # Find the source files, if location was not specified.
-Line 1306  else
+Line 1281  else
 Line 1306  else
 Line 1281  else
  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
+   as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
-    { (exit 1); exit 1; }; }
  fi
  ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
  ac_abs_confdir=`(
-         cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
+         cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
-    { (exit 1); exit 1; }; }
          pwd)`
  # When building in place, set srcdir=.
  if test "$ac_abs_confdir" = "$ac_pwd"; then
-Line 1352  Configuration:
+Line 1325  Configuration:
 Line 1352  Configuration:
 Line 1325  Configuration:
        --help=short        display options specific to this package
        --help=recursive    display the short help of all the included packages
    -V, --version           display version information and exit
-   -q, --quiet, --silent   do not print \`checking...' messages
+   -q, --quiet, --silent   do not print \`checking ...' messages
        --cache-file=FILE   cache test results in FILE [disabled]
    -C, --config-cache      alias for \`--cache-file=config.cache'
    -n, --no-create         do not create output files
-Line 1419  Optional Features:
+Line 1392  Optional Features:
 Line 1419  Optional Features:
 Line 1392  Optional Features:
    --disable-option-checking  ignore unrecognized --enable/--with options
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-   --enable-maintainer-mode  enable make rules and dependencies not useful
+   --enable-maintainer-mode
-                           (and sometimes confusing) to the casual installer
+                           enable make rules and dependencies not useful (and
-   --disable-dependency-tracking  speeds up one-time build
+                           sometimes confusing) to the casual installer
-   --enable-dependency-tracking   do not reject slow dependency extractors
+   --enable-dependency-tracking
+                           do not reject slow dependency extractors
+   --disable-dependency-tracking
+                           speeds up one-time build
    --enable-shared         enable linking shared libraries.  [no]
    --enable-plot           enable plot feature. [no]
    --enable-interval       enable interval feature. [no]
-Line 1433  Optional Packages:
+Line 1409  Optional Packages:
 Line 1433  Optional Packages:
 Line 1409  Optional Packages:
    --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
    --with-x                use the X Window System
    --with-asir-gc          modify Boehm's GC [yes]
-   --with-gc7              use GC 7.x (if --with-asir-gc=yes) [no]
    --with-distdir          specify the spool for fetching. [no]
    --with-pari             use the PARI library. [no]
    --with-mpi              use the MPI library. [no]
-Line 1444  Some influential environment variables:
+Line 1419  Some influential environment variables:
 Line 1444  Some influential environment variables:
 Line 1419  Some influential environment variables:
    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
                nonstandard directory <lib dir>
    LIBS        libraries to pass to the linker, e.g. -l<library>
-   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
                you have headers in a nonstandard directory <include dir>
-   YACC        The `Yet Another C Compiler' implementation to use. Defaults to
+   YACC        The `Yet Another Compiler Compiler' implementation to use.
-               the first program found out of: `bison -y', `byacc', `yacc'.
+               Defaults to the first program found out of: `bison -y', `byacc',
+               `yacc'.
    YFLAGS      The list of arguments that will be passed by default to $YACC.
                This script will default YFLAGS to the empty string to avoid a
                default value of `-d' given by some make applications.
-Line 1457  Some influential environment variables:
+Line 1433  Some influential environment variables:
 Line 1457  Some influential environment variables:
 Line 1433  Some influential environment variables:
  Use these variables to override the choices made by `configure' or to help
  it to find libraries and programs with nonstandard names/locations.
+ Report bugs to the package provider.
  _ACEOF
  ac_status=$?
  fi
-Line 1520  test -n "$ac_init_help" && exit $ac_status
+Line 1497  test -n "$ac_init_help" && exit $ac_status
 Line 1520  test -n "$ac_init_help" && exit $ac_status
 Line 1497  test -n "$ac_init_help" && exit $ac_status
  if $ac_init_version; then
    cat <<\_ACEOF
  configure
- generated by GNU Autoconf 2.62
+ generated by GNU Autoconf 2.69
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+ Copyright (C) 2012 Free Software Foundation, Inc.
-, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
  _ACEOF
    exit
  fi
+ ## ------------------------ ##
+ ## Autoconf initialization. ##
+ ## ------------------------ ##
+ # ac_fn_c_try_compile LINENO
+ # --------------------------
+ # Try to compile conftest.$ac_ext, and return whether this succeeded.
+ ac_fn_c_try_compile ()
+ {
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   rm -f conftest.$ac_objext
+   if { { ac_try="$ac_compile"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+ $as_echo "$ac_try_echo"; } >&5
+   (eval "$ac_compile") 2>conftest.err
+   ac_status=$?
+   if test -s conftest.err; then
+     grep -v '^ *+' conftest.err >conftest.er1
+     cat conftest.er1 >&5
+     mv -f conftest.er1 conftest.err
+   fi
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; } && {
+          test -z "$ac_c_werror_flag" ||
+          test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then :
+   ac_retval=0
+ else
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+         ac_retval=1
+ fi
+   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $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; } > conftest.i && {
+          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; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $ac_retval
+ } # ac_fn_c_try_cpp
+ # 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 ||
+          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; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $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 eval \${$3+:} false; 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; ${as_lineno_stack:+:} unset as_lineno
+ } # ac_fn_c_check_func
+ # ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+ # -------------------------------------------
+ # Tests whether TYPE exists after having included INCLUDES, setting cache
+ # variable VAR accordingly.
+ ac_fn_c_check_type ()
+ {
+   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 eval \${$3+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   eval "$3=no"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ $4
+ int
+ main ()
+ {
+ if (sizeof ($2))
+          return 0;
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_compile "$LINENO"; then :
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ $4
+ int
+ main ()
+ {
+ if (sizeof (($2)))
+             return 0;
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_compile "$LINENO"; then :
+ else
+   eval "$3=yes"
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ eval ac_res=\$$3
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ } # ac_fn_c_check_type
+ # 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; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $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 eval \${$3+:} false; 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; ${as_lineno_stack:+:} unset as_lineno
+ } # ac_fn_c_check_header_compile
+ # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
+ # --------------------------------------------
+ # Tries to find the compile-time value of EXPR in a program that includes
+ # INCLUDES, setting VAR accordingly. Returns whether the value could be
+ # computed
+ ac_fn_c_compute_int ()
+ {
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   if test "$cross_compiling" = yes; then
+     # Depending upon the size, compute the lo and hi bounds.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ $4
+ int
+ main ()
+ {
+ static int test_array [1 - 2 * !(($2) >= 0)];
+ test_array [0] = 0;
+ return test_array [0];
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_compile "$LINENO"; then :
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ $4
+ int
+ main ()
+ {
+ static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+ test_array [0] = 0;
+ return test_array [0];
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_compile "$LINENO"; then :
+   ac_hi=$ac_mid; break
+ else
+   as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+                         if test $ac_lo -le $ac_mid; then
+                           ac_lo= ac_hi=
+                           break
+                         fi
+                         as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ $4
+ int
+ main ()
+ {
+ static int test_array [1 - 2 * !(($2) < 0)];
+ test_array [0] = 0;
+ return test_array [0];
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_compile "$LINENO"; then :
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ $4
+ int
+ main ()
+ {
+ static int test_array [1 - 2 * !(($2) >= $ac_mid)];
+ test_array [0] = 0;
+ return test_array [0];
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_compile "$LINENO"; then :
+   ac_lo=$ac_mid; break
+ else
+   as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+                         if test $ac_mid -le $ac_hi; then
+                           ac_lo= ac_hi=
+                           break
+                         fi
+                         as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   ac_lo= ac_hi=
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+   as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ $4
+ int
+ main ()
+ {
+ static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+ test_array [0] = 0;
+ return test_array [0];
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_compile "$LINENO"; then :
+   ac_hi=$ac_mid
+ else
+   as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in #((
+ ?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
+ '') ac_retval=1 ;;
+ esac
+   else
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ $4
+ static long int longval () { return $2; }
+ static unsigned long int ulongval () { return $2; }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+ main ()
+ {
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+     return 1;
+   if (($2) < 0)
+     {
+       long int i = longval ();
+       if (i != ($2))
+         return 1;
+       fprintf (f, "%ld", i);
+     }
+   else
+     {
+       unsigned long int i = ulongval ();
+       if (i != ($2))
+         return 1;
+       fprintf (f, "%lu", i);
+     }
+   /* Do not output a trailing newline, as this causes \r\n confusion
+      on some platforms.  */
+   return ferror (f) || fclose (f) != 0;
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
+   echo >>conftest.val; read $3 <conftest.val; ac_retval=0
+ else
+   ac_retval=1
+ fi
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+   conftest.$ac_objext conftest.beam conftest.$ac_ext
+ rm -f conftest.val
+   fi
+   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $ac_retval
+ } # ac_fn_c_compute_int
  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.62.  Invocation command line was
+ generated by GNU Autoconf 2.69.  Invocation command line was
    $ $0 $@
-Line 1570  for as_dir in $PATH
+Line 2048  for as_dir in $PATH
 Line 1570  for as_dir in $PATH
 Line 2048  for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   $as_echo "PATH: $as_dir"
+     $as_echo "PATH: $as_dir"
- done
+   done
  IFS=$as_save_IFS
  } >&5
-Line 1608  do
+Line 2086  do
 Line 1608  do
 Line 2086  do
        ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
-) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
 )
-       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
-Line 1626  do
+Line 2104  do
 Line 1626  do
 Line 2104  do
            -* ) 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; }
+ { ac_configure_args0=; unset ac_configure_args0;}
- $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+ { 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
-Line 1644  trap 'exit_status=$?
+Line 2122  trap 'exit_status=$?
 Line 1644  trap 'exit_status=$?
 Line 2122  trap 'exit_status=$?
    {
      echo
-     cat <<\_ASBOX
+     $as_echo "## ---------------- ##
- ## ---------------- ##
  ## Cache variables. ##
- ## ---------------- ##
+ ## ---------------- ##"
- _ASBOX
      echo
      # The following way of writing the cache mishandles newlines in values,
  (
-Line 1657  _ASBOX
+Line 2133  _ASBOX
 Line 1657  _ASBOX
 Line 2133  _ASBOX
      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;} ;;
+ $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
-Line 1682  $as_echo "$as_me: WARNING: Cache variable $ac_var cont
+Line 2158  $as_echo "$as_me: WARNING: Cache variable $ac_var cont
 Line 1682  $as_echo "$as_me: WARNING: Cache variable $ac_var cont
 Line 2158  $as_echo "$as_me: WARNING: Cache variable $ac_var cont
  )
      echo
-     cat <<\_ASBOX
+     $as_echo "## ----------------- ##
- ## ----------------- ##
  ## Output variables. ##
- ## ----------------- ##
+ ## ----------------- ##"
- _ASBOX
      echo
      for ac_var in $ac_subst_vars
      do
-Line 1699  _ASBOX
+Line 2173  _ASBOX
 Line 1699  _ASBOX
 Line 2173  _ASBOX
      echo
      if test -n "$ac_subst_files"; then
-       cat <<\_ASBOX
+       $as_echo "## ------------------- ##
- ## ------------------- ##
  ## File substitutions. ##
- ## ------------------- ##
+ ## ------------------- ##"
- _ASBOX
        echo
        for ac_var in $ac_subst_files
        do
-Line 1717  _ASBOX
+Line 2189  _ASBOX
 Line 1717  _ASBOX
 Line 2189  _ASBOX
      fi
      if test -s confdefs.h; then
-       cat <<\_ASBOX
+       $as_echo "## ----------- ##
- ## ----------- ##
  ## confdefs.h. ##
- ## ----------- ##
+ ## ----------- ##"
- _ASBOX
        echo
        cat confdefs.h
        echo
-Line 1735  _ASBOX
+Line 2205  _ASBOX
 Line 1735  _ASBOX
 Line 2205  _ASBOX
      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
  ac_site_file2=NONE
  if test -n "$CONFIG_SITE"; then
-   ac_site_file1=$CONFIG_SITE
+   # We do not want a PATH search for config.site.
+   case $CONFIG_SITE in #((
+     -*)  ac_site_file1=./$CONFIG_SITE;;
+     */*) ac_site_file1=$CONFIG_SITE;;
+     *)   ac_site_file1=./$CONFIG_SITE;;
+   esac
  elif test "x$prefix" != xNONE; then
    ac_site_file1=$prefix/share/config.site
    ac_site_file2=$prefix/etc/config.site
-Line 1785  fi
+Line 2262  fi
 Line 1785  fi
 Line 2262  fi
  for ac_site_file in "$ac_site_file1" "$ac_site_file2"
  do
    test "x$ac_site_file" = xNONE && continue
-   if test -r "$ac_site_file"; then
+   if test /dev/null != "$ac_site_file" && 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"
+     . "$ac_site_file" \
+       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "failed to load site script $ac_site_file
+ See \`config.log' for more details" "$LINENO" 5; }
    fi
  done
  if test -r "$cache_file"; then
-   # Some versions of bash will fail to source /dev/null (special
+   # Some versions of bash will fail to source /dev/null (special files
-   # files actually), so we avoid doing that.
+   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-   if test -f "$cache_file"; then
+   if test /dev/null != "$cache_file" && 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";;
-Line 1805  $as_echo "$as_me: loading cache $cache_file" >&6;}
+Line 2286  $as_echo "$as_me: loading cache $cache_file" >&6;}
 Line 1805  $as_echo "$as_me: loading cache $cache_file" >&6;}
 Line 2286  $as_echo "$as_me: loading cache $cache_file" >&6;}
      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
-Line 1820  for ac_var in $ac_precious_vars; do
+Line 2301  for ac_var in $ac_precious_vars; do
 Line 1820  for ac_var in $ac_precious_vars; do
 Line 2301  for ac_var in $ac_precious_vars; do
    eval ac_new_val=\$ac_env_${ac_var}_value
    case $ac_old_set,$ac_new_set in
      set,)
-       { $as_echo "$as_me:$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=: ;;
      ,);;
-Line 1834  $as_echo "$as_me: error: \`$ac_var' was not set in the
+Line 2315  $as_echo "$as_me: error: \`$ac_var' was not set in the
 Line 1834  $as_echo "$as_me: error: \`$ac_var' was not set in the
 Line 2315  $as_echo "$as_me: error: \`$ac_var' was not set in the
          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
-Line 1856  $as_echo "$as_me:   current value: \`$ac_new_val'" >&2
+Line 2337  $as_echo "$as_me:   current value: \`$ac_new_val'" >&2
 Line 1856  $as_echo "$as_me:   current value: \`$ac_new_val'" >&2
 Line 2337  $as_echo "$as_me:   current value: \`$ac_new_val'" >&2
      esac
      case " $ac_configure_args " in
        *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-       *) 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: changes in the environment can compromise the build" >&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:${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_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
- $as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-    { (exit 1); exit 1; }; }
  fi
+ ## -------------------- ##
+ ## Main body of script. ##
+ ## -------------------- ##
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-Line 1910  for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../..";
+Line 2378  for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../..";
 Line 1910  for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../..";
 Line 2378  for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../..";
    fi
  done
  if test -z "$ac_aux_dir"; then
-   { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+   as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
- $as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-    { (exit 1); exit 1; }; }
  fi
  # These three variables are undocumented and unsupported,
-Line 1926  ac_configure="$SHELL $ac_aux_dir/configure"  # Please
+Line 2392  ac_configure="$SHELL $ac_aux_dir/configure"  # Please
 Line 1926  ac_configure="$SHELL $ac_aux_dir/configure"  # Please
 Line 2392  ac_configure="$SHELL $ac_aux_dir/configure"  # Please
  # 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_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
- $as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-    { (exit 1); exit 1; }; }
- { $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 ${ac_cv_build+:} false; 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_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
- $as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-    { (exit 1); exit 1; }; }
  ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-   { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+   as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
- $as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
  fi
- { $as_echo "$as_me:$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_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
- $as_echo "$as_me: error: invalid value of canonical build" >&2;}
-    { (exit 1); exit 1; }; };;
  esac
  build=$ac_cv_build
  ac_save_IFS=$IFS; IFS='-'
-Line 1970  IFS=$ac_save_IFS
+Line 2428  IFS=$ac_save_IFS
 Line 1970  IFS=$ac_save_IFS
 Line 2428  IFS=$ac_save_IFS
  case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
- { $as_echo "$as_me:$LINENO: checking host system type" >&5
+ { $as_echo "$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 ${ac_cv_host+:} false; 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_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
- $as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
  fi
  fi
- { $as_echo "$as_me:$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_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
- $as_echo "$as_me: error: invalid value of canonical host" >&2;}
-    { (exit 1); exit 1; }; };;
  esac
  host=$ac_cv_host
  ac_save_IFS=$IFS; IFS='-'
-Line 2007  IFS=$ac_save_IFS
+Line 2461  IFS=$ac_save_IFS
 Line 2007  IFS=$ac_save_IFS
 Line 2461  IFS=$ac_save_IFS
  case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
- { $as_echo "$as_me:$LINENO: checking target system type" >&5
+ { $as_echo "$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 ${ac_cv_target+:} false; 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_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
- $as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
  fi
  fi
- { $as_echo "$as_me:$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_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
- $as_echo "$as_me: error: invalid value of canonical target" >&2;}
-    { (exit 1); exit 1; }; };;
  esac
  target=$ac_cv_target
  ac_save_IFS=$IFS; IFS='-'
-Line 2050  test -n "$target_alias" &&
+Line 2500  test -n "$target_alias" &&
 Line 2050  test -n "$target_alias" &&
 Line 2500  test -n "$target_alias" &&
    test "$program_prefix$program_suffix$program_transform_name" = \
      NONENONEs,x,x, &&
    program_prefix=${target_alias}-
- am__api_version='1.10'
+ am__api_version='1.12'
  # Find a good install program.  We prefer a C program (faster),
  # so one script is as good as another.  But avoid the broken or
-Line 2066  am__api_version='1.10'
+Line 2516  am__api_version='1.10'
 Line 2066  am__api_version='1.10'
 Line 2516  am__api_version='1.10'
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
  # Reject install programs that cannot install multiple files.
- { $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
  $as_echo_n "checking for a BSD-compatible install... " >&6; }
  if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
+ if ${ac_cv_path_install+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-Line 2077  for as_dir in $PATH
+Line 2527  for as_dir in $PATH
 Line 2077  for as_dir in $PATH
 Line 2527  for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   # Account for people who put trailing slashes in PATH elements.
+     # Account for people who put trailing slashes in PATH elements.
- case $as_dir/ in
+ case $as_dir/ in #((
-   ./ | .// | /cC/* | \
+   ./ | .// | /[cC]/* | \
    /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-   ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+   ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
    /usr/ucb/* ) ;;
    *)
      # OSF1 and SCO ODT 3.0 have their own names for install.
-Line 2089  case $as_dir/ in
+Line 2539  case $as_dir/ in
 Line 2089  case $as_dir/ in
 Line 2539  case $as_dir/ in
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
-         if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+         if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
            if test $ac_prog = install &&
              grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
              # AIX install.  It has an incompatible calling convention.
-Line 2118  case $as_dir/ in
+Line 2568  case $as_dir/ in
 Line 2118  case $as_dir/ in
 Line 2568  case $as_dir/ in
      ;;
  esac
- done
+   done
  IFS=$as_save_IFS
  rm -rf conftest.one conftest.two conftest.dir
-Line 2134  fi
+Line 2584  fi
 Line 2134  fi
 Line 2584  fi
      INSTALL=$ac_install_sh
    fi
  fi
- { $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
  $as_echo "$INSTALL" >&6; }
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-Line 2145  test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL
+Line 2595  test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL
 Line 2145  test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL
 Line 2595  test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- { $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
  $as_echo_n "checking whether build environment is sane... " >&6; }
- # Just in case
+ # Reject unsafe characters in $srcdir or the absolute working directory
- sleep 1
+ # name.  Accept space and tab only in the latter.
- echo timestamp > conftest.file
+ am_lf='
- # Do `set' in a subshell so we don't clobber the current shell's
+ '
+ case `pwd` in
+   *[\\\"\#\$\&\'\`$am_lf]*)
+     as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+ esac
+ case $srcdir in
+   *[\\\"\#\$\&\'\`$am_lf\ \     ]*)
+     as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
+ esac
+ # Do 'set' in a subshell so we don't clobber the current shell's
  # arguments.  Must try -L first in case configure is actually a
  # symlink; some systems play weird games with the mod time of symlinks
  # (eg FreeBSD returns the mod time of the symlink's containing
  # directory).
  if (
-    set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+    am_has_slept=no
-    if test "$*" = "X"; then
+    for am_try in 1 2; do
-       # -L didn't work.
+      echo "timestamp, slept: $am_has_slept" > conftest.file
-       set X `ls -t $srcdir/configure conftest.file`
+      set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-    fi
+      if test "$*" = "X"; then
-    rm -f conftest.file
+         # -L didn't work.
-    if test "$*" != "X $srcdir/configure conftest.file" \
+         set X `ls -t "$srcdir/configure" conftest.file`
-       && test "$*" != "X conftest.file $srcdir/configure"; then
+      fi
+      if test "$*" != "X $srcdir/configure conftest.file" \
+         && test "$*" != "X conftest.file $srcdir/configure"; then
-       # If neither matched, then we have a broken ls.  This can happen
+         # If neither matched, then we have a broken ls.  This can happen
-       # if, for instance, CONFIG_SHELL is bash and it inherits a
+         # if, for instance, CONFIG_SHELL is bash and it inherits a
-       # broken ls alias from the environment.  This has actually
+         # broken ls alias from the environment.  This has actually
-       # happened.  Such a system could not be considered "sane".
+         # happened.  Such a system could not be considered "sane".
-       { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
+         as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
- alias in your environment" >&5
+   alias in your environment" "$LINENO" 5
- $as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
+      fi
- alias in your environment" >&2;}
+      if test "$2" = conftest.file || test $am_try -eq 2; then
-    { (exit 1); exit 1; }; }
+        break
-    fi
+      fi
+      # Just in case.
+      sleep 1
+      am_has_slept=yes
+    done
     test "$2" = conftest.file
     )
  then
     # Ok.
     :
  else
-    { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+    as_fn_error $? "newly created file is older than distributed files!
- Check your system clock" >&5
+ Check your system clock" "$LINENO" 5
- $as_echo "$as_me: error: newly created file is older than distributed files!
- Check your system clock" >&2;}
-    { (exit 1); exit 1; }; }
  fi
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
+ # If we didn't sleep, we still need to ensure time stamps of config.status and
+ # generated files are strictly newer.
+ am_sleep_pid=
+ if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+   ( sleep 1 ) &
+   am_sleep_pid=$!
+ fi
+ rm -f conftest.file
  test "$program_prefix" != NONE &&
    program_transform_name="s&^&$program_prefix&;$program_transform_name"
  # Use a double $ so make ignores it.
-Line 2203  program_transform_name=`$as_echo "$program_transform_n
+Line 2675  program_transform_name=`$as_echo "$program_transform_n
 Line 2203  program_transform_name=`$as_echo "$program_transform_n
 Line 2675  program_transform_name=`$as_echo "$program_transform_n
  # expand $ac_aux_dir to an absolute path
  am_aux_dir=`cd $ac_aux_dir && pwd`
- test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+ if test x"${MISSING+set}" != xset; then
+   case $am_aux_dir in
+   *\ * | *\     *)
+     MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+   *)
+     MISSING="\${SHELL} $am_aux_dir/missing" ;;
+   esac
+ fi
  # Use eval to expand $SHELL
  if eval "$MISSING --run true"; then
    am_missing_run="$MISSING --run "
  else
    am_missing_run=
-   { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
- $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
  fi
- { $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+ if test x"${install_sh}" != xset; then
+   case $am_aux_dir in
+   *\ * | *\     *)
+     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+   *)
+     install_sh="\${SHELL} $am_aux_dir/install-sh"
+   esac
+ fi
+ # Installed binaries are usually stripped using 'strip' when the user
+ # run "make install-strip".  However 'strip' might not be the right
+ # tool to use in cross-compilation environments, therefore Automake
+ # will honor the 'STRIP' environment variable to overrule this program.
+ if test "$cross_compiling" != no; then
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+ if ${ac_cv_prog_STRIP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$STRIP"; then
+   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+   done
+ IFS=$as_save_IFS
+ fi
+ fi
+ STRIP=$ac_cv_prog_STRIP
+ if test -n "$STRIP"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+ $as_echo "$STRIP" >&6; }
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ fi
+ if test -z "$ac_cv_prog_STRIP"; then
+   ac_ct_STRIP=$STRIP
+   # Extract the first word of "strip", so it can be a program name with args.
+ set dummy strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+ if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_STRIP"; then
+   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_STRIP="strip"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+   done
+ IFS=$as_save_IFS
+ fi
+ fi
+ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+ if test -n "$ac_ct_STRIP"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+ $as_echo "$ac_ct_STRIP" >&6; }
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+   if test "x$ac_ct_STRIP" = x; then
+     STRIP=":"
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+     STRIP=$ac_ct_STRIP
+   fi
+ else
+   STRIP="$ac_cv_prog_STRIP"
+ fi
+ fi
+ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
  $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
  if test -z "$MKDIR_P"; then
-   if test "${ac_cv_path_mkdir+set}" = set; then
+   if ${ac_cv_path_mkdir+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-Line 2224  for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+Line 2812  for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
 Line 2224  for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
 Line 2812  for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_prog in mkdir gmkdir; do
+     for ac_prog in mkdir gmkdir; do
           for ac_exec_ext in '' $ac_executable_extensions; do
-            { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+            as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
             case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
               'mkdir (GNU coreutils) '* | \
               'mkdir (coreutils) '* | \
-Line 2236  do
+Line 2824  do
 Line 2236  do
 Line 2824  do
             esac
           done
         done
- done
+   done
  IFS=$as_save_IFS
  fi
+   test -d ./--version && rmdir ./--version
    if test "${ac_cv_path_mkdir+set}" = set; then
      MKDIR_P="$ac_cv_path_mkdir -p"
    else
-Line 2248  fi
+Line 2837  fi
 Line 2248  fi
 Line 2837  fi
      # value for MKDIR_P within a source directory, because that will
      # break other packages using the cache if that directory is
      # removed, or if the value is a relative name.
-     test -d ./--version && rmdir ./--version
      MKDIR_P="$ac_install_sh -d"
    fi
  fi
- { $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
  $as_echo "$MKDIR_P" >&6; }
- mkdir_p="$MKDIR_P"
- case $mkdir_p in
-   [\\/$]* | ?:[\\/]*) ;;
-   */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
- esac
  for ac_prog in gawk mawk nawk awk
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ { $as_echo "$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 ${ac_cv_prog_AWK+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$AWK"; then
-Line 2278  for as_dir in $PATH
+Line 2860  for as_dir in $PATH
 Line 2278  for as_dir in $PATH
 Line 2860  for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_AWK="$ac_prog"
-     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $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
-Line 2303  fi
+Line 2885  fi
 Line 2303  fi
 Line 2885  fi
    test -n "$AWK" && break
  done
- { $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
  $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
  set x ${MAKE-make}
  ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
- if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+ if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    cat >conftest.make <<\_ACEOF
-Line 2315  SHELL = /bin/sh
+Line 2897  SHELL = /bin/sh
 Line 2315  SHELL = /bin/sh
 Line 2897  SHELL = /bin/sh
  all:
          @echo '@@@%%%=$(MAKE)=@@@%%%'
  _ACEOF
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+ # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
  case `${MAKE-make} -f conftest.make 2>/dev/null` in
    *@@@%%%=?*=@@@%%%*)
      eval ac_cv_prog_make_${ac_make}_set=yes;;
-Line 2325  esac
+Line 2907  esac
 Line 2325  esac
 Line 2907  esac
  rm -f conftest.make
  fi
  if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
    SET_MAKE=
  else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
    SET_MAKE="MAKE=${MAKE-make}"
  fi
-Line 2349  if test "`cd $srcdir && pwd`" != "`pwd`"; then
+Line 2931  if test "`cd $srcdir && pwd`" != "`pwd`"; then
 Line 2349  if test "`cd $srcdir && pwd`" != "`pwd`"; then
 Line 2931  if test "`cd $srcdir && pwd`" != "`pwd`"; then
    am__isrc=' -I$(srcdir)'
    # test to see if srcdir already configured
    if test -f $srcdir/config.status; then
-     { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+     as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
- $as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-    { (exit 1); exit 1; }; }
    fi
  fi
-Line 2366  fi
+Line 2946  fi
 Line 2366  fi
 Line 2946  fi
  # Define the identity of the package.
   PACKAGE=asir
   VERSION=20030307
-Line 2395  AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+Line 2976  AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 Line 2395  AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 Line 2976  AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
  MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
- install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+ # For better backward compatibility.  To be removed once Automake 1.9.x
+ # dies out for good.  For more background, see:
+ # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+ # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+ mkdir_p='$(MKDIR_P)'
- # Installed binaries are usually stripped using `strip' when the user
- # run `make install-strip'.  However `strip' might not be the right
- # tool to use in cross-compilation environments, therefore Automake
- # will honor the `STRIP' environment variable to overrule this program.
- if test "$cross_compiling" != no; then
-   if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
- set dummy ${ac_tool_prefix}strip; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_STRIP+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$STRIP"; then
-   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
- IFS=$as_save_IFS
- fi
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
-   { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
- $as_echo "$STRIP" >&6; }
- else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
- fi
- fi
- if test -z "$ac_cv_prog_STRIP"; then
-   ac_ct_STRIP=$STRIP
-   # Extract the first word of "strip", so it can be a program name with args.
- set dummy strip; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_STRIP"; then
-   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { 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_STRIP="strip"
-     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
- IFS=$as_save_IFS
- fi
- fi
- ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
- if test -n "$ac_ct_STRIP"; then
-   { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
- $as_echo "$ac_ct_STRIP" >&6; }
- else
-   { $as_echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
- fi
-   if test "x$ac_ct_STRIP" = x; then
-     STRIP=":"
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
- { $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf@gnu.org." >&5
- $as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf@gnu.org." >&2;}
- ac_tool_warned=yes ;;
- esac
-     STRIP=$ac_ct_STRIP
-   fi
- else
-   STRIP="$ac_cv_prog_STRIP"
- fi
- fi
- INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
  # We need awk for the "check" target.  The system "awk" is bad on
  # some platforms.
- # Always define AMTAR for backward compatibility.
+ # Always define AMTAR for backward compatibility.  Yes, it's still used
+ # in the wild :-(  We should find a proper way to deprecate it ...
+ AMTAR='$${TAR-tar}'
- AMTAR=${AMTAR-"${am_missing_run}tar"}
+ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
- am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
- { $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
  $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
      # 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; USE_MAINTAINER_MODE=$enableval
  else
    USE_MAINTAINER_MODE=no
  fi
-   { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
  $as_echo "$USE_MAINTAINER_MODE" >&6; }
     if test $USE_MAINTAINER_MODE = yes; then
    MAINTAINER_MODE_TRUE=
-Line 2544  ac_compiler_gnu=$ac_cv_c_compiler_gnu
+Line 3026  ac_compiler_gnu=$ac_cv_c_compiler_gnu
 Line 2544  ac_compiler_gnu=$ac_cv_c_compiler_gnu
 Line 3026  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ { $as_echo "$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 ${ac_cv_prog_CC+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-Line 2557  for as_dir in $PATH
+Line 3039  for as_dir in $PATH
 Line 2557  for as_dir in $PATH
 Line 3039  for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_CC="${ac_tool_prefix}gcc"
-     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $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
-Line 2584  if test -z "$ac_cv_prog_CC"; then
+Line 3066  if test -z "$ac_cv_prog_CC"; then
 Line 2584  if test -z "$ac_cv_prog_CC"; then
 Line 3066  if test -z "$ac_cv_prog_CC"; then
    ac_ct_CC=$CC
    # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ { $as_echo "$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 ${ac_cv_prog_ac_ct_CC+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-Line 2597  for as_dir in $PATH
+Line 3079  for as_dir in $PATH
 Line 2597  for as_dir in $PATH
 Line 3079  for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_ac_ct_CC="gcc"
-     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $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
-Line 2623  fi
+Line 3105  fi
 Line 2623  fi
 Line 3105  fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
- { $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- whose name does not start with the host triplet.  If you think this
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- configuration is useful to you, please write to autoconf@gnu.org." >&5
- $as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf@gnu.org." >&2;}
  ac_tool_warned=yes ;;
  esac
      CC=$ac_ct_CC
-Line 2641  if test -z "$CC"; then
+Line 3119  if test -z "$CC"; then
 Line 2641  if test -z "$CC"; then
 Line 3119  if test -z "$CC"; then
            if test -n "$ac_tool_prefix"; then
      # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}cc; ac_word=$2
- { $as_echo "$as_me:$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 ${ac_cv_prog_CC+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-Line 2654  for as_dir in $PATH
+Line 3132  for as_dir in $PATH
 Line 2654  for as_dir in $PATH
 Line 3132  for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_CC="${ac_tool_prefix}cc"
-     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $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
-Line 2681  fi
+Line 3159  fi
 Line 2681  fi
 Line 3159  fi
  if test -z "$CC"; then
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ { $as_echo "$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 ${ac_cv_prog_CC+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-Line 2695  for as_dir in $PATH
+Line 3173  for as_dir in $PATH
 Line 2695  for as_dir in $PATH
 Line 3173  for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
       fi
      ac_cv_prog_CC="cc"
-     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $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
-Line 2725  fi
+Line 3203  fi
 Line 2725  fi
 Line 3203  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
-Line 2740  if test -z "$CC"; then
+Line 3218  if test -z "$CC"; then
 Line 2740  if test -z "$CC"; then
 Line 3218  if test -z "$CC"; then
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
- { $as_echo "$as_me:$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 ${ac_cv_prog_CC+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-Line 2753  for as_dir in $PATH
+Line 3231  for as_dir in $PATH
 Line 2753  for as_dir in $PATH
 Line 3231  for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $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
-Line 2784  if test -z "$CC"; then
+Line 3262  if test -z "$CC"; then
 Line 2784  if test -z "$CC"; then
 Line 3262  if test -z "$CC"; then
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
- { $as_echo "$as_me:$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 ${ac_cv_prog_ac_ct_CC+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-Line 2797  for as_dir in $PATH
+Line 3275  for as_dir in $PATH
 Line 2797  for as_dir in $PATH
 Line 3275  for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_ac_ct_CC="$ac_prog"
-     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     $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
-Line 2827  done
+Line 3305  done
 Line 2827  done
 Line 3305  done
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
- { $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- whose name does not start with the host triplet.  If you think this
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- configuration is useful to you, please write to autoconf@gnu.org." >&5
- $as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf@gnu.org." >&2;}
  ac_tool_warned=yes ;;
  esac
      CC=$ac_ct_CC
-Line 2842  fi
+Line 3316  fi
 Line 2842  fi
 Line 3316  fi
  fi
- test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- See \`config.log' for more details." >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- $as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+ as_fn_error $? "no acceptable C compiler found in \$PATH
- See \`config.log' for more details." >&2;}
+ See \`config.log' for more details" "$LINENO" 5; }
-    { (exit 1); exit 1; }; }
  # 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\""
+ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
+ $as_echo "$ac_try_echo"; } >&5
-   (eval "$ac_compiler --version >&5") 2>&5
+   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if test -s conftest.err; then
-   (exit $ac_status); }
+     sed '10a\
- { (ac_try="$ac_compiler -v >&5"
+ ... rest of stderr output deleted ...
- case "(($ac_try" in
+q' conftest.err >conftest.er1
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+     cat conftest.er1 >&5
-   *) ac_try_echo=$ac_try;;
+   fi
- esac
+   rm -f conftest.er1 conftest.err
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- $as_echo "$ac_try_echo") >&5
+   test $ac_status = 0; }
-   (eval "$ac_compiler -v >&5") 2>&5
+ done
-   ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- { (ac_try="$ac_compiler -V >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_compiler -V >&5") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- cat >conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  int
-Line 2906  ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe
+Line 3362  ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe
 Line 2906  ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe
 Line 3362  ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe
  # 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 whether the C compiler works" >&5
- $as_echo_n "checking for C compiler default output file name... " >&6; }
+ $as_echo_n "checking whether the C compiler works... " >&6; }
  ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
  # The possible output files:
-Line 2923  do
+Line 3379  do
 Line 2923  do
 Line 3379  do
  done
  rm -f $ac_rmfiles
- if { (ac_try="$ac_link_default"
+ if { { ac_try="$ac_link_default"
  case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
+ $as_echo "$ac_try_echo"; } >&5
    (eval "$ac_link_default") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   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,
-Line 2950  do
+Line 3406  do
 Line 2950  do
 Line 3406  do
          # certainly right.
          break;;
      *.* )
          if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
          then :; else
             ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
          fi
-Line 2969  test "$ac_cv_exeext" = no && ac_cv_exeext=
+Line 3425  test "$ac_cv_exeext" = no && ac_cv_exeext=
 Line 2969  test "$ac_cv_exeext" = no && ac_cv_exeext=
 Line 3425  test "$ac_cv_exeext" = no && ac_cv_exeext=
  else
    ac_file=''
  fi
+ if test -z "$ac_file"; then :
- { $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "$ac_file" >&6; }
+ $as_echo "no" >&6; }
- if test -z "$ac_file"; then
+ $as_echo "$as_me: failed program was:" >&5
-   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
- { { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- See \`config.log' for more details." >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- $as_echo "$as_me: error: C compiler cannot create executables
+ as_fn_error 77 "C compiler cannot create executables
- See \`config.log' for more details." >&2;}
+ See \`config.log' for more details" "$LINENO" 5; }
-    { (exit 77); exit 77; }; }
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
  fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+ $as_echo_n "checking for C compiler default output file name... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+ $as_echo "$ac_file" >&6; }
  ac_exeext=$ac_cv_exeext
- # Check that the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
- { $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
- $as_echo_n "checking whether the C compiler works... " >&6; }
- # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
-   if { ac_try='./$ac_file'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-     cross_compiling=no
-   else
-     if test "$cross_compiling" = maybe; then
-         cross_compiling=yes
-     else
-         { { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
- See \`config.log' for more details." >&5
- $as_echo "$as_me: error: cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
-     fi
-   fi
- fi
- { $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
  rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
  ac_clean_files=$ac_clean_files_save
- # Check that the compiler produces executables we can run.  If not, either
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
- # the compiler is broken, or we cross compile.
- { $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
- $as_echo_n "checking whether we are cross compiling... " >&6; }
- { $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
- $as_echo "$cross_compiling" >&6; }
- { $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
  $as_echo_n "checking for suffix of executables... " >&6; }
- if { (ac_try="$ac_link"
+ if { { ac_try="$ac_link"
  case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
+ $as_echo "$ac_try_echo"; } >&5
    (eval "$ac_link") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   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
-Line 3057  for ac_file in conftest.exe conftest conftest.*; do
+Line 3474  for ac_file in conftest.exe conftest conftest.*; do
 Line 3057  for ac_file in conftest.exe conftest conftest.*; do
 Line 3474  for ac_file in conftest.exe conftest conftest.*; do
    esac
  done
  else
-   { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- See \`config.log' for more details." >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- $as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+ as_fn_error $? "cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." >&2;}
+ See \`config.log' for more details" "$LINENO" 5; }
-    { (exit 1); exit 1; }; }
  fi
+ rm -f conftest conftest$ac_cv_exeext
- rm -f conftest$ac_cv_exeext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
- { $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
  $as_echo "$ac_cv_exeext" >&6; }
  rm -f conftest.$ac_ext
  EXEEXT=$ac_cv_exeext
  ac_exeext=$EXEEXT
- { $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <stdio.h>
+ int
+ main ()
+ {
+ FILE *f = fopen ("conftest.out", "w");
+  return ferror (f) || fclose (f) != 0;
+   ;
+   return 0;
+ }
+ _ACEOF
+ ac_clean_files="$ac_clean_files conftest.out"
+ # Check that the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+ $as_echo_n "checking whether we are cross compiling... " >&6; }
+ if test "$cross_compiling" != yes; then
+   { { ac_try="$ac_link"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+ $as_echo "$ac_try_echo"; } >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }
+   if { ac_try='./conftest$ac_cv_exeext'
+   { { case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+ $as_echo "$ac_try_echo"; } >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; }; then
+     cross_compiling=no
+   else
+     if test "$cross_compiling" = maybe; then
+         cross_compiling=yes
+     else
+         { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+ See \`config.log' for more details" "$LINENO" 5; }
+     fi
+   fi
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+ $as_echo "$cross_compiling" >&6; }
+ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ ac_clean_files=$ac_clean_files_save
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
  $as_echo_n "checking for suffix of object files... " >&6; }
- if test "${ac_cv_objext+set}" = set; then
+ if ${ac_cv_objext+:} false; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  int
-Line 3092  main ()
+Line 3562  main ()
 Line 3092  main ()
 Line 3562  main ()
  }
  _ACEOF
  rm -f conftest.o conftest.obj
- if { (ac_try="$ac_compile"
+ if { { ac_try="$ac_compile"
  case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
+ $as_echo "$ac_try_echo"; } >&5
    (eval "$ac_compile") 2>&5
    ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
+   test $ac_status = 0; }; then :
    for ac_file in conftest.o conftest.obj conftest.*; do
    test -f "$ac_file" || continue;
    case $ac_file in
-Line 3115  else
+Line 3585  else
 Line 3115  else
 Line 3585  else
    $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
- { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- See \`config.log' for more details." >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- $as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
+ as_fn_error $? "cannot compute suffix of object files: cannot compile
- See \`config.log' for more details." >&2;}
+ See \`config.log' for more details" "$LINENO" 5; }
-    { (exit 1); exit 1; }; }
  fi
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+ { $as_echo "$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 ${ac_cv_c_compiler_gnu+:} false; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  int
-Line 3151  main ()
+Line 3615  main ()
 Line 3151  main ()
 Line 3615  main ()
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext
+ if ac_fn_c_try_compile "$LINENO"; then :
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
    ac_compiler_gnu=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
+   ac_compiler_gnu=no
- sed 's/^/| /' conftest.$ac_ext >&5
-         ac_compiler_gnu=no
  fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  ac_cv_c_compiler_gnu=$ac_compiler_gnu
  fi
- { $as_echo "$as_me:$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
-Line 3190  else
+Line 3633  else
 Line 3190  else
 Line 3633  else
  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 ${ac_cv_prog_cc_g+:} false; 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
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  int
-Line 3214  main ()
+Line 3653  main ()
 Line 3214  main ()
 Line 3653  main ()
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext
+ if ac_fn_c_try_compile "$LINENO"; then :
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
    ac_cv_prog_cc_g=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
+   CFLAGS=""
- sed 's/^/| /' conftest.$ac_ext >&5
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-         CFLAGS=""
-       cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  int
-Line 3253  main ()
+Line 3668  main ()
 Line 3253  main ()
 Line 3668  main ()
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext
+ if ac_fn_c_try_compile "$LINENO"; then :
- 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
-         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
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  int
-Line 3293  main ()
+Line 3684  main ()
 Line 3293  main ()
 Line 3684  main ()
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext
+ if ac_fn_c_try_compile "$LINENO"; then :
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
    ac_cv_prog_cc_g=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
  fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     ac_c_werror_flag=$ac_save_c_werror_flag
  fi
- { $as_echo "$as_me:$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
-Line 3345  else
+Line 3711  else
 Line 3345  else
 Line 3711  else
      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 ${ac_cv_prog_cc_c89+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_cv_prog_cc_c89=no
  ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
- #include <sys/types.h>
+ struct stat;
- #include <sys/stat.h>
  /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
  struct buf { int x; };
  FILE * (*rcsopen) (struct buf *, struct stat *, int);
-Line 3413  for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std
+Line 3774  for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std
 Line 3413  for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std
 Line 3774  for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std
          -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  do
    CC="$ac_save_CC $ac_arg"
-   rm -f conftest.$ac_objext
+   if ac_fn_c_try_compile "$LINENO"; then :
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
    ac_cv_prog_cc_c89=$ac_arg
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
  fi
  rm -f core conftest.err conftest.$ac_objext
    test "x$ac_cv_prog_cc_c89" != "xno" && break
  done
-Line 3449  fi
+Line 3787  fi
 Line 3449  fi
 Line 3787  fi
  # 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'
-Line 3474  ac_config_commands="$ac_config_commands depfiles"
+Line 3814  ac_config_commands="$ac_config_commands depfiles"
 Line 3474  ac_config_commands="$ac_config_commands depfiles"
 Line 3814  ac_config_commands="$ac_config_commands depfiles"
  am_make=${MAKE-make}
  cat > confinc << 'END'
  am__doit:
-         @echo done
+         @echo this is the am__doit target
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
- { $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
  $as_echo_n "checking for style of include used by $am_make... " >&6; }
  am__include="#"
  am__quote=
  _am_result=none
  # First try GNU make style include.
  echo "include confinc" > confmf
- # We grep out `Entering directory' and `Leaving directory'
+ # Ignore all kinds of additional output from 'make'.
- # messages which can occur if `w' ends up in MAKEFLAGS.
+ case `$am_make -s -f confmf 2> /dev/null` in #(
- # In particular we don't look at `^make:' because GNU make might
+ *the\ am__doit\ target*)
- # be invoked under some other name (usually "gmake"), in which
+   am__include=include
- # case it prints its new name instead of `make'.
+   am__quote=
- if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+   _am_result=GNU
-    am__include=include
+   ;;
-    am__quote=
+ esac
-    _am_result=GNU
- fi
  # Now try BSD make style include.
  if test "$am__include" = "#"; then
     echo '.include "confinc"' > confmf
-    if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+    case `$am_make -s -f confmf 2> /dev/null` in #(
-       am__include=.include
+    *the\ am__doit\ target*)
-       am__quote="\""
+      am__include=.include
-       _am_result=BSD
+      am__quote="\""
-    fi
+      _am_result=BSD
+      ;;
+    esac
  fi
- { $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
  $as_echo "$_am_result" >&6; }
  rm -f confinc confmf
  # Check whether --enable-dependency-tracking was given.
- if test "${enable_dependency_tracking+set}" = set; then
+ if test "${enable_dependency_tracking+set}" = set; then :
    enableval=$enable_dependency_tracking;
  fi
  if test "x$enable_dependency_tracking" != xno; then
    am_depcomp="$ac_aux_dir/depcomp"
    AMDEPBACKSLASH='\'
+   am__nodep='_no'
  fi
   if test "x$enable_dependency_tracking" != xno; then
    AMDEP_TRUE=
-Line 3531  fi
+Line 3872  fi
 Line 3531  fi
 Line 3872  fi
  depcc="$CC"   am_compiler_list=
- { $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
  $as_echo_n "checking dependency style of $depcc... " >&6; }
- if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+ if ${am_cv_CC_dependencies_compiler_type+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
    # We make a subdir and do the tests there.  Otherwise we can end up
    # making bogus files that we don't know about and never remove.  For
    # instance it was reported that on HP-UX the gcc test will end up
-   # making a dummy file named `D' -- because `-MD' means `put the output
+   # making a dummy file named 'D' -- because '-MD' means "put the output
-   # in D'.
+   # in D".
+   rm -rf conftest.dir
    mkdir conftest.dir
    # Copy depcomp to subdir because otherwise we won't find it if we're
    # using a relative directory.
-Line 3559  else
+Line 3901  else
 Line 3559  else
 Line 3901  else
    if test "$am_compiler_list" = ""; then
       am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
    fi
+   am__universal=false
+   case " $depcc " in #(
+      *\ -arch\ *\ -arch\ *) am__universal=true ;;
+      esac
    for depmode in $am_compiler_list; do
      # Setup a source with many dependencies, because some compilers
      # like to wrap large dependency lists on column 80 (with \), and
-Line 3570  else
+Line 3917  else
 Line 3570  else
 Line 3917  else
      : > sub/conftest.c
      for i in 1 2 3 4 5 6; do
        echo '#include "conftst'$i'.h"' >> sub/conftest.c
-       # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+       # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-       # Solaris 8's {/usr,}/bin/sh.
+       # Solaris 10 /bin/sh.
-       touch sub/conftst$i.h
+       echo '/* dummy */' > sub/conftst$i.h
      done
      echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+     # We check with '-c' and '-o' for the sake of the "dashmstdout"
+     # mode.  It turns out that the SunPro C++ compiler does not properly
+     # handle '-M -o', and we need to detect this.  Also, some Intel
+     # versions had trouble with output in subdirs.
+     am__obj=sub/conftest.${OBJEXT-o}
+     am__minus_obj="-o $am__obj"
      case $depmode in
+     gcc)
+       # This depmode causes a compiler race in universal mode.
+       test "$am__universal" = false || continue
+       ;;
      nosideeffect)
-       # after this tag, mechanisms are not by side-effect, so they'll
+       # After this tag, mechanisms are not by side-effect, so they'll
-       # only be used when explicitly requested
+       # only be used when explicitly requested.
        if test "x$enable_dependency_tracking" = xyes; then
          continue
        else
          break
        fi
        ;;
+     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+       # This compiler won't grok '-c -o', but also, the minuso test has
+       # not run yet.  These depmodes are late enough in the game, and
+       # so weak that their functioning should not be impacted.
+       am__obj=conftest.${OBJEXT-o}
+       am__minus_obj=
+       ;;
      none) break ;;
      esac
-     # We check with `-c' and `-o' for the sake of the "dashmstdout"
-     # mode.  It turns out that the SunPro C++ compiler does not properly
-     # handle `-M -o', and we need to detect this.
      if depmode=$depmode \
-        source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+        source=sub/conftest.c object=$am__obj \
         depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+        $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
           >/dev/null 2>conftest.err &&
         grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
         grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+        grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
        # icc doesn't choke on unknown options, it will just issue warnings
        # or remarks (even with -Werror).  So we grep stderr for any message
-Line 3622  else
+Line 3983  else
 Line 3622  else
 Line 3983  else
  fi
  fi
- { $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
  $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-Line 3637  else
+Line 3998  else
 Line 3637  else
 Line 3998  else
  fi
- # Find a good install program.  We prefer a C program (faster),
- # so one script is as good as another.  But avoid the broken or
- # incompatible versions:
- # SysV /etc/install, /usr/sbin/install
- # SunOS /usr/etc/install
- # IRIX /sbin/install
- # AIX /bin/install
- # AmigaOS /C/install, which installs bootblocks on floppy discs
- # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
- # AFS /usr/afsws/bin/install, which mishandles nonexistent args
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # OS/2's system install, which has a completely different semantic
- # ./install, which can be erroneously created by make from ./install.sh.
- # Reject install programs that cannot install multiple files.
- { $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
- $as_echo_n "checking for a BSD-compatible install... " >&6; }
- if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   # Account for people who put trailing slashes in PATH elements.
- case $as_dir/ in
-   ./ | .// | /cC/* | \
-   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-   ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-   /usr/ucb/* ) ;;
-   *)
-     # OSF1 and SCO ODT 3.0 have their own names for install.
-     # Don't use installbsd from OSF since it installs stuff as root
-     # by default.
-     for ac_prog in ginstall scoinst install; do
-       for ac_exec_ext in '' $ac_executable_extensions; do
-         if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-           if test $ac_prog = install &&
-             grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-             # AIX install.  It has an incompatible calling convention.
-             :
-           elif test $ac_prog = install &&
-             grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-             # program-specific install script used by HP pwplus--don't use.
-             :
-           else
-             rm -rf conftest.one conftest.two conftest.dir
-             echo one > conftest.one
-             echo two > conftest.two
-             mkdir conftest.dir
-             if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-               test -s conftest.one && test -s conftest.two &&
-               test -s conftest.dir/conftest.one &&
-               test -s conftest.dir/conftest.two
-             then
-               ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-               break 3
-             fi
-           fi
-         fi
-       done
-     done
-     ;;
- esac
- done
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
- IFS=$as_save_IFS
- rm -rf conftest.one conftest.two conftest.dir
- fi
-   if test "${ac_cv_path_install+set}" = set; then
-     INSTALL=$ac_cv_path_install
-   else
-     # As a last resort, use the slow shell script.  Don't cache a
-     # value for INSTALL within a source directory, because that will
-     # break other packages using the cache if that directory is
-     # removed, or if the value is a relative name.
-     INSTALL=$ac_install_sh
-   fi
- fi
- { $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
- $as_echo "$INSTALL" >&6; }
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
- test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
- test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- { $as_echo "$as_me:$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 ${ac_cv_prog_RANLIB+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$RANLIB"; then
-Line 3757  for as_dir in $PATH
+Line 4026  for as_dir in $PATH
 Line 3757  for as_dir in $PATH
 Line 4026  for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+   if as_fn_executable_p "$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
-Line 3784  if test -z "$ac_cv_prog_RANLIB"; then
+Line 4053  if test -z "$ac_cv_prog_RANLIB"; then
 Line 3784  if test -z "$ac_cv_prog_RANLIB"; then
 Line 4053  if test -z "$ac_cv_prog_RANLIB"; then
    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 ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_RANLIB"; then
-Line 3797  for as_dir in $PATH
+Line 4066  for as_dir in $PATH
 Line 3797  for as_dir in $PATH
 Line 4066  for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+   if as_fn_executable_p "$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
-Line 3823  fi
+Line 4092  fi
 Line 3823  fi
 Line 4092  fi
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
- { $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- whose name does not start with the host triplet.  If you think this
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- configuration is useful to you, please write to autoconf@gnu.org." >&5
- $as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
- whose name does not start with the host triplet.  If you think this
- configuration is useful to you, please write to autoconf@gnu.org." >&2;}
  ac_tool_warned=yes ;;
  esac
      RANLIB=$ac_ct_RANLIB
-Line 3841  for ac_prog in 'bison -y' byacc
+Line 4106  for ac_prog in 'bison -y' byacc
 Line 3841  for ac_prog in 'bison -y' byacc
 Line 4106  for ac_prog in 'bison -y' byacc
  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_YACC+set}" = set; then
+ if ${ac_cv_prog_YACC+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$YACC"; then
-Line 3854  for as_dir in $PATH
+Line 4119  for as_dir in $PATH
 Line 3854  for as_dir in $PATH
 Line 4119  for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_YACC="$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
  YACC=$ac_cv_prog_YACC
  if test -n "$YACC"; then
-   { $as_echo "$as_me:$LINENO: result: $YACC" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
  $as_echo "$YACC" >&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
-Line 3887  ac_cpp='$CPP $CPPFLAGS'
+Line 4152  ac_cpp='$CPP $CPPFLAGS'
 Line 3887  ac_cpp='$CPP $CPPFLAGS'
 Line 4152  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
- { $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+ { $as_echo "$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 ${ac_cv_prog_CPP+:} false; then :
    $as_echo_n "(cached) " >&6
  else
        # Double quotes because CPP needs to be expanded
-Line 3909  do
+Line 4174  do
 Line 3909  do
 Line 4174  do
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-Line 3922  cat >>conftest.$ac_ext <<_ACEOF
+Line 4183  cat >>conftest.$ac_ext <<_ACEOF
 Line 3922  cat >>conftest.$ac_ext <<_ACEOF
 Line 4183  cat >>conftest.$ac_ext <<_ACEOF
  #endif
                       Syntax error
  _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
+ if ac_fn_c_try_cpp "$LINENO"; then :
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) 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
+ else
    # Broken: fails on valid input.
  continue
  fi
+ rm -f conftest.err conftest.i conftest.$ac_ext
- 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
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
+ if ac_fn_c_try_cpp "$LINENO"; then :
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
-          test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        }; then
    # Broken: success on invalid input.
  continue
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
    # Passes both tests.
  ac_preproc_ok=:
  break
  fi
+ rm -f conftest.err conftest.i conftest.$ac_ext
- 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
+ rm -f conftest.i conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then
+ if $ac_preproc_ok; then :
    break
  fi
-Line 4005  fi
+Line 4222  fi
 Line 4005  fi
 Line 4222  fi
  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
-Line 4016  do
+Line 4233  do
 Line 4016  do
 Line 4233  do
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-Line 4029  cat >>conftest.$ac_ext <<_ACEOF
+Line 4242  cat >>conftest.$ac_ext <<_ACEOF
 Line 4029  cat >>conftest.$ac_ext <<_ACEOF
 Line 4242  cat >>conftest.$ac_ext <<_ACEOF
  #endif
                       Syntax error
  _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
+ if ac_fn_c_try_cpp "$LINENO"; then :
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) 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
+ else
    # Broken: fails on valid input.
  continue
  fi
+ rm -f conftest.err conftest.i conftest.$ac_ext
- 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
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
+ if ac_fn_c_try_cpp "$LINENO"; then :
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
-          test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        }; then
    # Broken: success on invalid input.
  continue
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
    # Passes both tests.
  ac_preproc_ok=:
  break
  fi
+ rm -f conftest.err conftest.i conftest.$ac_ext
- 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
+ rm -f conftest.i conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then
+ if $ac_preproc_ok; then :
-   :
  else
-   { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- See \`config.log' for more details." >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- $as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+ as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
- See \`config.log' for more details." >&2;}
+ See \`config.log' for more details" "$LINENO" 5; }
-    { (exit 1); exit 1; }; }
  fi
  ac_ext=c
-Line 4117  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $
+Line 4285  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $
 Line 4117  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $
 Line 4285  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
- { $as_echo "$as_me:$LINENO: checking for X" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
  $as_echo_n "checking for X... " >&6; }
  # Check whether --with-x was given.
- if test "${with_x+set}" = set; then
+ if test "${with_x+set}" = set; then :
    withval=$with_x;
  fi
-Line 4132  if test "x$with_x" = xno; then
+Line 4300  if test "x$with_x" = xno; then
 Line 4132  if test "x$with_x" = xno; then
 Line 4300  if test "x$with_x" = xno; then
    have_x=disabled
  else
    case $x_includes,$x_libraries in #(
-     *\'*) { { $as_echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5
+     *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
- $as_echo "$as_me: error: Cannot use X directory names containing '" >&2;}
+     *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
-    { (exit 1); exit 1; }; };; #(
-     *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
    $as_echo_n "(cached) " >&6
  else
    # One or both of the vars are not set, and there is no cached value.
-Line 4152  libdir:
+Line 4318  libdir:
 Line 4152  libdir:
 Line 4318  libdir:
          @echo libdir='${LIBDIR}'
  _ACEOF
    if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
-     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+     # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
      for ac_var in incroot usrlibdir libdir; do
        eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
      done
-Line 4171  _ACEOF
+Line 4337  _ACEOF
 Line 4171  _ACEOF
 Line 4337  _ACEOF
          *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
      esac
      case $ac_im_usrlibdir in
-         /usr/lib | /lib) ;;
+         /usr/lib | /usr/lib64 | /lib | /lib64) ;;
          *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
      esac
    fi
-Line 4183  fi
+Line 4349  fi
 Line 4183  fi
 Line 4349  fi
  # Check X11 before X11Rn because it is often a symlink to the current release.
  ac_x_header_dirs='
  /usr/X11/include
+ /usr/X11R7/include
  /usr/X11R6/include
  /usr/X11R5/include
  /usr/X11R4/include
  /usr/include/X11
+ /usr/include/X11R7
  /usr/include/X11R6
  /usr/include/X11R5
  /usr/include/X11R4
  /usr/local/X11/include
+ /usr/local/X11R7/include
  /usr/local/X11R6/include
  /usr/local/X11R5/include
  /usr/local/X11R4/include
  /usr/local/include/X11
+ /usr/local/include/X11R7
  /usr/local/include/X11R6
  /usr/local/include/X11R5
  /usr/local/include/X11R4
-Line 4219  ac_x_header_dirs='
+Line 4389  ac_x_header_dirs='
 Line 4219  ac_x_header_dirs='
 Line 4389  ac_x_header_dirs='
  if test "$ac_x_includes" = no; then
    # Guess where to find include files, by looking for Xlib.h.
    # First, try using that file with no special directory specified.
-   cat >conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <X11/Xlib.h>
  _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
+ if ac_fn_c_try_cpp "$LINENO"; then :
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
-          test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        }; then
    # We can compile using X headers with no special include directory.
  ac_x_includes=
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
    for ac_dir in $ac_x_header_dirs; do
    if test -r "$ac_dir/X11/Xlib.h"; then
      ac_x_includes=$ac_dir
-Line 4257  sed 's/^/| /' conftest.$ac_ext >&5
+Line 4404  sed 's/^/| /' conftest.$ac_ext >&5
 Line 4257  sed 's/^/| /' conftest.$ac_ext >&5
 Line 4404  sed 's/^/| /' conftest.$ac_ext >&5
    fi
  done
  fi
+ rm -f conftest.err conftest.i conftest.$ac_ext
- rm -f conftest.err conftest.$ac_ext
  fi # $ac_x_includes = no
  if test "$ac_x_libraries" = no; then
-Line 4267  if test "$ac_x_libraries" = no; then
+Line 4413  if test "$ac_x_libraries" = no; then
 Line 4267  if test "$ac_x_libraries" = no; then
 Line 4413  if test "$ac_x_libraries" = no; then
    # Don't add to $LIBS permanently.
    ac_save_LIBS=$LIBS
    LIBS="-lX11 $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <X11/Xlib.h>
  int
-Line 4282  XrmInitialize ()
+Line 4424  XrmInitialize ()
 Line 4282  XrmInitialize ()
 Line 4424  XrmInitialize ()
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+ if ac_fn_c_try_link "$LINENO"; then :
- if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest$ac_exeext && {
-          test "$cross_compiling" = yes ||
-          $as_test_x conftest$ac_exeext
-        }; then
    LIBS=$ac_save_LIBS
  # We can link X programs with no special library path.
  ac_x_libraries=
  else
-   $as_echo "$as_me: failed program was:" >&5
+   LIBS=$ac_save_LIBS
- sed 's/^/| /' conftest.$ac_ext >&5
-         LIBS=$ac_save_LIBS
  for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
  do
    # Don't even attempt the hair of trying to link an X program!
-Line 4322  do
+Line 4441  do
 Line 4322  do
 Line 4441  do
    done
  done
  fi
+ rm -f core conftest.err conftest.$ac_objext \
- rm -rf conftest.dSYM
+     conftest$ac_exeext conftest.$ac_ext
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
  fi # $ac_x_libraries = no
  case $ac_x_includes,$ac_x_libraries in #(
-Line 4346  fi
+Line 4463  fi
 Line 4346  fi
 Line 4463  fi
  fi # $with_x != no
  if test "$have_x" != yes; then
-   { $as_echo "$as_me:$LINENO: result: $have_x" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5
  $as_echo "$have_x" >&6; }
    no_x=yes
  else
-Line 4357  else
+Line 4474  else
 Line 4357  else
 Line 4474  else
    ac_cv_have_x="have_x=yes\
          ac_x_includes='$x_includes'\
          ac_x_libraries='$x_libraries'"
-   { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5
  $as_echo "libraries $x_libraries, headers $x_includes" >&6; }
  fi
  if test "$no_x" = yes; then
    # Not all programs may use this symbol, but it does not hurt to define it.
- cat >>confdefs.h <<\_ACEOF
+ $as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
- #define X_DISPLAY_MISSING 1
- _ACEOF
    X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
  else
-Line 4379  else
+Line 4494  else
 Line 4379  else
 Line 4494  else
      X_LIBS="$X_LIBS -L$x_libraries"
      # For Solaris; some versions of Sun CC require a space after -R and
      # others require no space.  Words are not sufficient . . . .
-     { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5
  $as_echo_n "checking whether -R must be followed by a space... " >&6; }
      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
      ac_xsave_c_werror_flag=$ac_c_werror_flag
      ac_c_werror_flag=yes
-     cat >conftest.$ac_ext <<_ACEOF
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  int
-Line 4399  main ()
+Line 4510  main ()
 Line 4399  main ()
 Line 4510  main ()
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+ if ac_fn_c_try_link "$LINENO"; then :
- if { (ac_try="$ac_link"
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&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_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest$ac_exeext && {
-          test "$cross_compiling" = yes ||
-          $as_test_x conftest$ac_exeext
-        }; then
-   { $as_echo "$as_me:$LINENO: result: no" >&5
  $as_echo "no" >&6; }
         X_LIBS="$X_LIBS -R$x_libraries"
  else
-   $as_echo "$as_me: failed program was:" >&5
+   LIBS="$ac_xsave_LIBS -R $x_libraries"
- sed 's/^/| /' conftest.$ac_ext >&5
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-         LIBS="$ac_xsave_LIBS -R $x_libraries"
-        cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  int
-Line 4443  main ()
+Line 4527  main ()
 Line 4443  main ()
 Line 4527  main ()
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+ if ac_fn_c_try_link "$LINENO"; then :
- if { (ac_try="$ac_link"
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&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_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest$ac_exeext && {
-          test "$cross_compiling" = yes ||
-          $as_test_x conftest$ac_exeext
-        }; then
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
  $as_echo "yes" >&6; }
            X_LIBS="$X_LIBS -R $x_libraries"
  else
-   $as_echo "$as_me: failed program was:" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-         { $as_echo "$as_me:$LINENO: result: neither works" >&5
  $as_echo "neither works" >&6; }
  fi
+ rm -f core conftest.err conftest.$ac_objext \
- rm -rf conftest.dSYM
+     conftest$ac_exeext conftest.$ac_ext
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
  fi
+ rm -f core conftest.err conftest.$ac_objext \
- rm -rf conftest.dSYM
+     conftest$ac_exeext conftest.$ac_ext
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
      ac_c_werror_flag=$ac_xsave_c_werror_flag
      LIBS=$ac_xsave_LIBS
    fi
-Line 4498  rm -f core conftest.err conftest.$ac_objext conftest_i
+Line 4555  rm -f core conftest.err conftest.$ac_objext conftest_i
 Line 4498  rm -f core conftest.err conftest.$ac_objext conftest_i
 Line 4555  rm -f core conftest.err conftest.$ac_objext conftest_i
      # libraries were built with DECnet support.  And Karl Berry says
      # the Alpha needs dnet_stub (dnet does not exist).
      ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
-     cat >conftest.$ac_ext <<_ACEOF
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  /* Override any GCC internal prototype to avoid an error.
-Line 4520  return XOpenDisplay ();
+Line 4573  return XOpenDisplay ();
 Line 4520  return XOpenDisplay ();
 Line 4573  return XOpenDisplay ();
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+ if ac_fn_c_try_link "$LINENO"; then :
- 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
-         { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
  $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
- if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+ if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldnet  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  /* Override any GCC internal prototype to avoid an error.
-Line 4575  return dnet_ntoa ();
+Line 4601  return dnet_ntoa ();
 Line 4575  return dnet_ntoa ();
 Line 4601  return dnet_ntoa ();
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+ if ac_fn_c_try_link "$LINENO"; then :
- if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest$ac_exeext && {
-          test "$cross_compiling" = yes ||
-          $as_test_x conftest$ac_exeext
-        }; then
    ac_cv_lib_dnet_dnet_ntoa=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
+   ac_cv_lib_dnet_dnet_ntoa=no
- sed 's/^/| /' conftest.$ac_ext >&5
-         ac_cv_lib_dnet_dnet_ntoa=no
  fi
+ rm -f core conftest.err conftest.$ac_objext \
- rm -rf conftest.dSYM
+     conftest$ac_exeext conftest.$ac_ext
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
  $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
- if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+ if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
  fi
      if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-       { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
  $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
- if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+ if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldnet_stub  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  /* Override any GCC internal prototype to avoid an error.
-Line 4645  return dnet_ntoa ();
+Line 4642  return dnet_ntoa ();
 Line 4645  return dnet_ntoa ();
 Line 4642  return dnet_ntoa ();
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+ if ac_fn_c_try_link "$LINENO"; then :
- if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest$ac_exeext && {
-          test "$cross_compiling" = yes ||
-          $as_test_x conftest$ac_exeext
-        }; then
    ac_cv_lib_dnet_stub_dnet_ntoa=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
+   ac_cv_lib_dnet_stub_dnet_ntoa=no
- sed 's/^/| /' conftest.$ac_ext >&5
-         ac_cv_lib_dnet_stub_dnet_ntoa=no
  fi
+ rm -f core conftest.err conftest.$ac_objext \
- rm -rf conftest.dSYM
+     conftest$ac_exeext conftest.$ac_ext
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
  $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
- if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
+ if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
  fi
      fi
  fi
+ rm -f core conftest.err conftest.$ac_objext \
- rm -rf conftest.dSYM
+     conftest$ac_exeext conftest.$ac_ext
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
      LIBS="$ac_xsave_LIBS"
      # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-Line 4701  rm -f core conftest.err conftest.$ac_objext conftest_i
+Line 4671  rm -f core conftest.err conftest.$ac_objext conftest_i
 Line 4701  rm -f core conftest.err conftest.$ac_objext conftest_i
 Line 4671  rm -f core conftest.err conftest.$ac_objext conftest_i
      # on Irix 5.2, according to T.E. Dickey.
      # The functions gethostbyname, getservbyname, and inet_addr are
      # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-     { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
+     ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
- $as_echo_n "checking for gethostbyname... " >&6; }
+ if test "x$ac_cv_func_gethostbyname" = xyes; then :
- if test "${ac_cv_func_gethostbyname+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- /* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
- #define gethostbyname innocuous_gethostbyname
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char gethostbyname (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
- #undef gethostbyname
- /* Override any GCC internal prototype to avoid an error.
-    Use char because int might match the return type of a GCC
-    builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
- char gethostbyname ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
- #if defined __stub_gethostbyname || defined __stub___gethostbyname
- choke me
- #endif
- int
- main ()
- {
- return gethostbyname ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest$ac_exeext && {
-          test "$cross_compiling" = yes ||
-          $as_test_x conftest$ac_exeext
-        }; then
-   ac_cv_func_gethostbyname=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-         ac_cv_func_gethostbyname=no
  fi
- rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
- $as_echo "$ac_cv_func_gethostbyname" >&6; }
      if test $ac_cv_func_gethostbyname = no; then
-       { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
  $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
- if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+ if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lnsl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  /* Override any GCC internal prototype to avoid an error.
-Line 4817  return gethostbyname ();
+Line 4702  return gethostbyname ();
 Line 4817  return gethostbyname ();
 Line 4702  return gethostbyname ();
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+ if ac_fn_c_try_link "$LINENO"; then :
- if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest$ac_exeext && {
-          test "$cross_compiling" = yes ||
-          $as_test_x conftest$ac_exeext
-        }; then
    ac_cv_lib_nsl_gethostbyname=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
+   ac_cv_lib_nsl_gethostbyname=no
- sed 's/^/| /' conftest.$ac_ext >&5
-         ac_cv_lib_nsl_gethostbyname=no
  fi
+ rm -f core conftest.err conftest.$ac_objext \
- rm -rf conftest.dSYM
+     conftest$ac_exeext conftest.$ac_ext
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
  $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
- if test $ac_cv_lib_nsl_gethostbyname = yes; then
+ if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
  fi
        if test $ac_cv_lib_nsl_gethostbyname = no; then
-         { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
  $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
- if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+ if ${ac_cv_lib_bsd_gethostbyname+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lbsd  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  /* Override any GCC internal prototype to avoid an error.
-Line 4887  return gethostbyname ();
+Line 4743  return gethostbyname ();
 Line 4887  return gethostbyname ();
 Line 4743  return gethostbyname ();
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+ if ac_fn_c_try_link "$LINENO"; then :
- if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest$ac_exeext && {
-          test "$cross_compiling" = yes ||
-          $as_test_x conftest$ac_exeext
-        }; then
    ac_cv_lib_bsd_gethostbyname=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
+   ac_cv_lib_bsd_gethostbyname=no
- sed 's/^/| /' conftest.$ac_ext >&5
-         ac_cv_lib_bsd_gethostbyname=no
  fi
+ rm -f core conftest.err conftest.$ac_objext \
- rm -rf conftest.dSYM
+     conftest$ac_exeext conftest.$ac_ext
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
  $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
- if test $ac_cv_lib_bsd_gethostbyname = yes; then
+ if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
  fi
-Line 4937  fi
+Line 4768  fi
 Line 4937  fi
 Line 4768  fi
      # variants that don't use the name server (or something).  -lsocket
      # must be given before -lnsl if both are needed.  We assume that
      # if connect needs -lnsl, so does gethostbyname.
-     { $as_echo "$as_me:$LINENO: checking for connect" >&5
+     ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
- $as_echo_n "checking for connect... " >&6; }
+ if test "x$ac_cv_func_connect" = xyes; then :
- if test "${ac_cv_func_connect+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- /* Define connect to an innocuous variant, in case <limits.h> declares connect.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
- #define connect innocuous_connect
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char connect (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
- #undef connect
- /* Override any GCC internal prototype to avoid an error.
-    Use char because int might match the return type of a GCC
-    builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
- char connect ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
- #if defined __stub_connect || defined __stub___connect
- choke me
- #endif
- int
- main ()
- {
- return connect ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest$ac_exeext && {
-          test "$cross_compiling" = yes ||
-          $as_test_x conftest$ac_exeext
-        }; then
-   ac_cv_func_connect=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-         ac_cv_func_connect=no
  fi
- rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
- $as_echo "$ac_cv_func_connect" >&6; }
      if test $ac_cv_func_connect = no; then
-       { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
  $as_echo_n "checking for connect in -lsocket... " >&6; }
- if test "${ac_cv_lib_socket_connect+set}" = set; then
+ if ${ac_cv_lib_socket_connect+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  /* Override any GCC internal prototype to avoid an error.
-Line 5053  return connect ();
+Line 4799  return connect ();
 Line 5053  return connect ();
 Line 4799  return connect ();
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+ if ac_fn_c_try_link "$LINENO"; then :
- if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest$ac_exeext && {
-          test "$cross_compiling" = yes ||
-          $as_test_x conftest$ac_exeext
-        }; then
    ac_cv_lib_socket_connect=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
+   ac_cv_lib_socket_connect=no
- sed 's/^/| /' conftest.$ac_ext >&5
-         ac_cv_lib_socket_connect=no
  fi
+ rm -f core conftest.err conftest.$ac_objext \
- rm -rf conftest.dSYM
+     conftest$ac_exeext conftest.$ac_ext
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
  $as_echo "$ac_cv_lib_socket_connect" >&6; }
- if test $ac_cv_lib_socket_connect = yes; then
+ if test "x$ac_cv_lib_socket_connect" = xyes; then :
    X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
  fi
      fi
      # Guillermo Gomez says -lposix is necessary on A/UX.
-     { $as_echo "$as_me:$LINENO: checking for remove" >&5
+     ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
- $as_echo_n "checking for remove... " >&6; }
+ if test "x$ac_cv_func_remove" = xyes; then :
- if test "${ac_cv_func_remove+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- /* Define remove to an innocuous variant, in case <limits.h> declares remove.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
- #define remove innocuous_remove
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char remove (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
- #undef remove
- /* Override any GCC internal prototype to avoid an error.
-    Use char because int might match the return type of a GCC
-    builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
- char remove ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
- #if defined __stub_remove || defined __stub___remove
- choke me
- #endif
- int
- main ()
- {
- return remove ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest$ac_exeext && {
-          test "$cross_compiling" = yes ||
-          $as_test_x conftest$ac_exeext
-        }; then
-   ac_cv_func_remove=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-         ac_cv_func_remove=no
  fi
- rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
- $as_echo "$ac_cv_func_remove" >&6; }
      if test $ac_cv_func_remove = no; then
-       { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
  $as_echo_n "checking for remove in -lposix... " >&6; }
- if test "${ac_cv_lib_posix_remove+set}" = set; then
+ if ${ac_cv_lib_posix_remove+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lposix  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  /* Override any GCC internal prototype to avoid an error.
-Line 5212  return remove ();
+Line 4848  return remove ();
 Line 5212  return remove ();
 Line 4848  return remove ();
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+ if ac_fn_c_try_link "$LINENO"; then :
- if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest$ac_exeext && {
-          test "$cross_compiling" = yes ||
-          $as_test_x conftest$ac_exeext
-        }; then
    ac_cv_lib_posix_remove=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
+   ac_cv_lib_posix_remove=no
- sed 's/^/| /' conftest.$ac_ext >&5
-         ac_cv_lib_posix_remove=no
  fi
+ rm -f core conftest.err conftest.$ac_objext \
- rm -rf conftest.dSYM
+     conftest$ac_exeext conftest.$ac_ext
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
  $as_echo "$ac_cv_lib_posix_remove" >&6; }
- if test $ac_cv_lib_posix_remove = yes; then
+ if test "x$ac_cv_lib_posix_remove" = xyes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
  fi
      fi
      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-     { $as_echo "$as_me:$LINENO: checking for shmat" >&5
+     ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
- $as_echo_n "checking for shmat... " >&6; }
+ if test "x$ac_cv_func_shmat" = xyes; then :
- if test "${ac_cv_func_shmat+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- /* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
- #define shmat innocuous_shmat
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char shmat (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
- #undef shmat
- /* Override any GCC internal prototype to avoid an error.
-    Use char because int might match the return type of a GCC
-    builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
- char shmat ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
- #if defined __stub_shmat || defined __stub___shmat
- choke me
- #endif
- int
- main ()
- {
- return shmat ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest$ac_exeext && {
-          test "$cross_compiling" = yes ||
-          $as_test_x conftest$ac_exeext
-        }; then
-   ac_cv_func_shmat=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-         ac_cv_func_shmat=no
  fi
- rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
- $as_echo "$ac_cv_func_shmat" >&6; }
      if test $ac_cv_func_shmat = no; then
-       { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
  $as_echo_n "checking for shmat in -lipc... " >&6; }
- if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+ if ${ac_cv_lib_ipc_shmat+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lipc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  /* Override any GCC internal prototype to avoid an error.
-Line 5371  return shmat ();
+Line 4897  return shmat ();
 Line 5371  return shmat ();
 Line 4897  return shmat ();
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+ if ac_fn_c_try_link "$LINENO"; then :
- if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest$ac_exeext && {
-          test "$cross_compiling" = yes ||
-          $as_test_x conftest$ac_exeext
-        }; then
    ac_cv_lib_ipc_shmat=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
+   ac_cv_lib_ipc_shmat=no
- sed 's/^/| /' conftest.$ac_ext >&5
-         ac_cv_lib_ipc_shmat=no
  fi
+ rm -f core conftest.err conftest.$ac_objext \
- rm -rf conftest.dSYM
+     conftest$ac_exeext conftest.$ac_ext
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
  $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
- if test $ac_cv_lib_ipc_shmat = yes; then
+ if test "x$ac_cv_lib_ipc_shmat" = xyes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  fi
-Line 5423  fi
+Line 4924  fi
 Line 5423  fi
 Line 4924  fi
    # These have to be linked with before -lX11, unlike the other
    # libraries we check for below, so use a different variable.
    # John Interrante, Karl Berry
-   { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
  $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
- if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+ if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lICE $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  /* Override any GCC internal prototype to avoid an error.
-Line 5452  return IceConnectionNumber ();
+Line 4949  return IceConnectionNumber ();
 Line 5452  return IceConnectionNumber ();
 Line 4949  return IceConnectionNumber ();
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+ if ac_fn_c_try_link "$LINENO"; then :
- if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest$ac_exeext && {
-          test "$cross_compiling" = yes ||
-          $as_test_x conftest$ac_exeext
-        }; then
    ac_cv_lib_ICE_IceConnectionNumber=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
+   ac_cv_lib_ICE_IceConnectionNumber=no
- sed 's/^/| /' conftest.$ac_ext >&5
-         ac_cv_lib_ICE_IceConnectionNumber=no
  fi
+ rm -f core conftest.err conftest.$ac_objext \
- rm -rf conftest.dSYM
+     conftest$ac_exeext conftest.$ac_ext
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
  $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
- if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+ if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then :
    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
  fi
-Line 5498  fi
+Line 4970  fi
 Line 5498  fi
 Line 4970  fi
  # Check whether --enable-shared was given.
- if test "${enable_shared+set}" = set; then
+ if test "${enable_shared+set}" = set; then :
    enableval=$enable_shared; enable_shared=yes
  else
    enable_shared=no
-Line 5519  elif test `basename ./"${CC}"` = "icc" ; then
+Line 4991  elif test `basename ./"${CC}"` = "icc" ; then
 Line 5519  elif test `basename ./"${CC}"` = "icc" ; then
 Line 4991  elif test `basename ./"${CC}"` = "icc" ; then
      CFLAGS="-g -O"
  fi
- GC=gc6.8
+ GC=gc-7.2
  # Check whether --with-asir-gc was given.
- if test "${with_asir_gc+set}" = set; then
+ if test "${with_asir_gc+set}" = set; then :
    withval=$with_asir_gc; with_asir_gc=${withval}
  else
    with_asir_gc=yes
-Line 5534  if test ${with_asir_gc:=yes} != no; then
+Line 5006  if test ${with_asir_gc:=yes} != no; then
 Line 5534  if test ${with_asir_gc:=yes} != no; then
 Line 5006  if test ${with_asir_gc:=yes} != no; then
  else
     GCLIB='-L${prefix}/lib -lgc'
     GCINC='-I${prefix}/include'
-    cat >>confdefs.h <<\_ACEOF
+    $as_echo "#define NO_ASIR_GC 1" >>confdefs.h
- #define NO_ASIR_GC 1
- _ACEOF
  fi
  GC_CONFIGURE_ARGS="--disable-threads --enable-large-config"
-Line 5544  if test -n "${host_alias}" ; then
+Line 5014  if test -n "${host_alias}" ; then
 Line 5544  if test -n "${host_alias}" ; then
 Line 5014  if test -n "${host_alias}" ; then
      GC_CONFIGURE_ARGS="--host=${host_alias} ${GC_CONFIGURE_ARGS}"
  fi
- # Check whether --with-gc7 was given.
+ $as_echo "#define GC7 1" >>confdefs.h
- if test "${with_gc7+set}" = set; then
-   withval=$with_gc7; with_gc7=${withval}
- else
-   with_gc7=no
- fi
- if test ${with_gc7:=no} != no; then
-    case "${with_gc7}" in
-*) GC_VERSION=${with_gc7} ;;
-    *)    GC_VERSION=7.1 ;;
-    esac
-    GC=gc-${GC_VERSION}
-    cat >>confdefs.h <<\_ACEOF
- #define GC7 1
- _ACEOF
- fi
-  if test "$with_gc7" != no; then
-   USE_GC7_TRUE=
-   USE_GC7_FALSE='#'
- else
-   USE_GC7_TRUE='#'
-   USE_GC7_FALSE=
- fi
  # Check whether --with-distdir was given.
- if test "${with_distdir+set}" = set; then
+ if test "${with_distdir+set}" = set; then :
    withval=$with_distdir; with_distdir=${withval}
  else
    with_distdir=no
-Line 5595  fi
+Line 5039  fi
 Line 5595  fi
 Line 5039  fi
  libasir_postfix=""
  # Check whether --with-pari was given.
- if test "${with_pari+set}" = set; then
+ if test "${with_pari+set}" = set; then :
    withval=$with_pari; with_pari=${withval}
  else
    with_pari=no
-Line 5603  fi
+Line 5047  fi
 Line 5603  fi
 Line 5047  fi
  if test ${with_pari:=no} != no ; then
-     if test "${with_pari}" = new -o "${with_pari}" = 2.3 ; then
-         cat >>confdefs.h <<\_ACEOF
- #define PARI23 1
- _ACEOF
-     fi
      libasir_postfix=${libasir_postfix}_pari
      PARIINC='-I${prefix}/include/pari'
      if test "${enable_shared}" != yes ; then
-Line 5616  _ACEOF
+Line 5054  _ACEOF
 Line 5616  _ACEOF
 Line 5054  _ACEOF
      else
          PARILIB='-L${libdir} -lpari'
      fi
-     cat >>confdefs.h <<\_ACEOF
+     $as_echo "#define PARI 1" >>confdefs.h
- #define PARI 1
- _ACEOF
  fi
- { $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 ${ac_cv_path_GREP+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    if test -z "$GREP"; then
-Line 5637  for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+Line 5073  for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 Line 5637  for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 Line 5073  for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_prog in grep ggrep; do
+     for ac_prog in grep ggrep; do
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-       { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+       as_fn_executable_p "$ac_path_GREP" || continue
  # Check for GNU ac_path_GREP and select it if it is found.
    # Check for GNU $ac_path_GREP
  case `"$ac_path_GREP" --version 2>&1` in
-Line 5657  case `"$ac_path_GREP" --version 2>&1` in
+Line 5093  case `"$ac_path_GREP" --version 2>&1` in
 Line 5657  case `"$ac_path_GREP" --version 2>&1` in
 Line 5093  case `"$ac_path_GREP" --version 2>&1` in
      $as_echo 'GREP' >> "conftest.nl"
      "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-     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"
-Line 5672  esac
+Line 5108  esac
 Line 5672  esac
 Line 5108  esac
        $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_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- $as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-    { (exit 1); exit 1; }; }
    fi
  else
    ac_cv_path_GREP=$GREP
  fi
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+ { $as_echo "$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 ${ac_cv_path_EGREP+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-Line 5705  for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+Line 5139  for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 Line 5705  for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 Line 5139  for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-   for ac_prog in egrep; do
+     for ac_prog in egrep; do
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-       { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+       as_fn_executable_p "$ac_path_EGREP" || continue
  # Check for GNU ac_path_EGREP and select it if it is found.
    # Check for GNU $ac_path_EGREP
  case `"$ac_path_EGREP" --version 2>&1` in
-Line 5725  case `"$ac_path_EGREP" --version 2>&1` in
+Line 5159  case `"$ac_path_EGREP" --version 2>&1` in
 Line 5725  case `"$ac_path_EGREP" --version 2>&1` in
 Line 5159  case `"$ac_path_EGREP" --version 2>&1` in
      $as_echo 'EGREP' >> "conftest.nl"
      "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-     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"
-Line 5740  esac
+Line 5174  esac
 Line 5740  esac
 Line 5174  esac
        $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_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- $as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-    { (exit 1); exit 1; }; }
    fi
  else
    ac_cv_path_EGREP=$EGREP
-Line 5753  fi
+Line 5185  fi
 Line 5753  fi
 Line 5185  fi
     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 ${ac_cv_header_stdc+:} false; then :
    $as_echo_n "(cached) " >&6
  else
-   cat >conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <stdarg.h>
-Line 5782  main ()
+Line 5210  main ()
 Line 5782  main ()
 Line 5210  main ()
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext
+ if ac_fn_c_try_compile "$LINENO"; then :
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
    ac_cv_header_stdc=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
+   ac_cv_header_stdc=no
- sed 's/^/| /' conftest.$ac_ext >&5
-         ac_cv_header_stdc=no
  fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <string.h>
  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-   $EGREP "memchr" >/dev/null 2>&1; then
+   $EGREP "memchr" >/dev/null 2>&1; then :
-   :
  else
    ac_cv_header_stdc=no
  fi
-Line 5833  fi
+Line 5236  fi
 Line 5833  fi
 Line 5236  fi
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <stdlib.h>
  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-   $EGREP "free" >/dev/null 2>&1; then
+   $EGREP "free" >/dev/null 2>&1; then :
-   :
  else
    ac_cv_header_stdc=no
  fi
-Line 5854  fi
+Line 5253  fi
 Line 5854  fi
 Line 5253  fi
  if test $ac_cv_header_stdc = yes; then
    # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-   if test "$cross_compiling" = yes; then
+   if test "$cross_compiling" = yes; then :
    :
  else
-   cat >conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
  #include <stdlib.h>
-Line 5888  main ()
+Line 5283  main ()
 Line 5888  main ()
 Line 5283  main ()
    return 0;
  }
  _ACEOF
- rm -f conftest$ac_exeext
+ if ac_fn_c_try_run "$LINENO"; then :
- 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
- ( exit $ac_status )
+ else
- ac_cv_header_stdc=no
+   ac_cv_header_stdc=no
  fi
- rm -rf conftest.dSYM
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+   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
+ $as_echo "#define STDC_HEADERS 1" >>confdefs.h
- #define STDC_HEADERS 1
- _ACEOF
  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
+ do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
- $as_echo_n "checking for $ac_header... " >&6; }
+ "
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ if eval test \"x\$"$as_ac_Header"\" = x"yes"; 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; }
- if test `eval 'as_val=${'$as_ac_Header'}
-                  $as_echo "$as_val"'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-Line 6008  fi
+Line 5319  fi
 Line 6008  fi
 Line 5319  fi
  done
- { $as_echo "$as_me:$LINENO: checking for unsigned long long" >&5
+ ac_fn_c_check_type "$LINENO" "unsigned long long" "ac_cv_type_unsigned_long_long" "$ac_includes_default"
- $as_echo_n "checking for unsigned long long... " >&6; }
+ if test "x$ac_cv_type_unsigned_long_long" = xyes; then :
- if test "${ac_cv_type_unsigned_long_long+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   ac_cv_type_unsigned_long_long=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
- int
- main ()
- {
- if (sizeof (unsigned long long))
-        return 0;
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
- int
- main ()
- {
- if (sizeof ((unsigned long long)))
-           return 0;
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   :
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-         ac_cv_type_unsigned_long_long=yes
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long" >&5
- $as_echo "$ac_cv_type_unsigned_long_long" >&6; }
- if test $ac_cv_type_unsigned_long_long = yes; then
  cat >>confdefs.h <<_ACEOF
  #define HAVE_UNSIGNED_LONG_LONG 1
  _ACEOF
-Line 6115  fi
+Line 5333  fi
 Line 6115  fi
 Line 5333  fi
  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
  # This bug is HP SR number 8606223364.
- { $as_echo "$as_me:$LINENO: checking size of long" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
  $as_echo_n "checking size of long... " >&6; }
- if test "${ac_cv_sizeof_long+set}" = set; then
+ if ${ac_cv_sizeof_long+:} false; then :
    $as_echo_n "(cached) " >&6
  else
-   if test "$cross_compiling" = yes; then
+   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
- int
- main ()
- {
- static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
- test_array [0] = 0
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
- int
- main ()
- {
- static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
- test_array [0] = 0
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
  else
-   $as_echo "$as_me: failed program was:" >&5
+   if test "$ac_cv_type_long" = yes; then
- sed 's/^/| /' conftest.$ac_ext >&5
+      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-         ac_lo=`expr $ac_mid + 1`
+ as_fn_error 77 "cannot compute sizeof (long)
-                         if test $ac_lo -le $ac_mid; then
+ See \`config.log' for more details" "$LINENO" 5; }
-                           ac_lo= ac_hi=
-                           break
-                         fi
-                         ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-         cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
- int
- main ()
- {
- static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
- test_array [0] = 0
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
- int
- main ()
- {
- static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
- test_array [0] = 0
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-         ac_hi=`expr '(' $ac_mid ')' - 1`
-                         if test $ac_mid -le $ac_hi; then
-                           ac_lo= ac_hi=
-                           break
-                         fi
-                         ac_mid=`expr 2 '*' $ac_mid`
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-         ac_lo= ac_hi=
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
-   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
- int
- main ()
- {
- static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
- test_array [0] = 0
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-         ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_long=$ac_lo;;
- '') if test "$ac_cv_type_long" = yes; then
-      { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&5
- $as_echo "$as_me: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&2;}
-    { (exit 77); exit 77; }; }
     else
       ac_cv_sizeof_long=0
-    fi ;;
- esac
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
- static long int longval () { return (long int) (sizeof (long)); }
- static unsigned long int ulongval () { return (long int) (sizeof (long)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
- main ()
- {
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
-   if (((long int) (sizeof (long))) < 0)
-     {
-       long int i = longval ();
-       if (i != ((long int) (sizeof (long))))
-         return 1;
-       fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
-       if (i != ((long int) (sizeof (long))))
-         return 1;
-       fprintf (f, "%lu", i);
-     }
-   /* Do not output a trailing newline, as this causes \r\n confusion
-      on some platforms.  */
-   return ferror (f) || fclose (f) != 0;
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
- if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_long=`cat conftest.val`
- else
-   $as_echo "$as_me: program exited with status $ac_status" >&5
- $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- ( exit $ac_status )
- if test "$ac_cv_type_long" = yes; then
-      { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&5
- $as_echo "$as_me: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&2;}
-    { (exit 77); exit 77; }; }
-    else
-      ac_cv_sizeof_long=0
     fi
  fi
- rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
- rm -f conftest.val
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
  $as_echo "$ac_cv_sizeof_long" >&6; }
-Line 6467  _ACEOF
+Line 5363  _ACEOF
 Line 6467  _ACEOF
 Line 5363  _ACEOF
  if test "${ac_cv_sizeof_long}" = 8; then
-     cat >>confdefs.h <<\_ACEOF
+     $as_echo "#define LONG_IS_64BIT 1" >>confdefs.h
- #define LONG_IS_64BIT 1
- _ACEOF
  else
-     cat >>confdefs.h <<\_ACEOF
+     $as_echo "#define LONG_IS_32BIT 1" >>confdefs.h
- #define LONG_IS_32BIT 1
- _ACEOF
  fi
  if test "${no_x}" != yes ; then
-Line 6482  if test "${no_x}" != yes ; then
+Line 5374  if test "${no_x}" != yes ; then
 Line 6482  if test "${no_x}" != yes ; then
 Line 5374  if test "${no_x}" != yes ; then
              XPMLIB="-lXpm"
      fi
      # Check whether --enable-plot was given.
- if test "${enable_plot+set}" = set; then
+ if test "${enable_plot+set}" = set; then :
    enableval=$enable_plot; enable_plot=yes
  else
    enable_plot=no
-Line 6493  fi
+Line 5385  fi
 Line 6493  fi
 Line 5385  fi
  if test ${enable_plot:=no} != no ; then
      libasir_postfix=${libasir_postfix}_X
-     cat >>confdefs.h <<\_ACEOF
+     $as_echo "#define DO_PLOT 1" >>confdefs.h
- #define DO_PLOT 1
- _ACEOF
  fi
   if test "$enable_plot" = yes; then
-Line 6508  fi
+Line 5398  fi
 Line 6508  fi
 Line 5398  fi
  # Check whether --enable-interval was given.
- if test "${enable_interval+set}" = set; then
+ if test "${enable_interval+set}" = set; then :
    enableval=$enable_interval; enable_interval=${enableval}
  else
    enable_interval=no
-Line 6517  fi
+Line 5407  fi
 Line 6517  fi
 Line 5407  fi
  if test ${enable_interval:=no} != no ; then
      libasir_postfix=${libasir_postfix}_itv
-     cat >>confdefs.h <<\_ACEOF
+     $as_echo "#define INTERVAL 1" >>confdefs.h
- #define INTERVAL 1
- _ACEOF
      if test "${enable_interval}" = debug ; then
-        cat >>confdefs.h <<\_ACEOF
+        $as_echo "#define ITVDEBUG 1" >>confdefs.h
- #define ITVDEBUG 1
- _ACEOF
      fi
  fi
  if test "${enable_fep:=no}" != no ; then
-     cat >>confdefs.h <<\_ACEOF
+     $as_echo "#define FEP 1" >>confdefs.h
- #define FEP 1
- _ACEOF
      FEPLIB="-lreadline -ltermcap"
  fi
  # Check whether --enable-fft-float was given.
- if test "${enable_fft_float+set}" = set; then
+ if test "${enable_fft_float+set}" = set; then :
    enableval=$enable_fft_float; enable_fft_float=yes
  else
    enable_fft_float=no
-Line 6548  fi
+Line 5432  fi
 Line 6548  fi
 Line 5432  fi
  if test "${enable_fft_float:=no}" != no ; then
-     cat >>confdefs.h <<\_ACEOF
+     $as_echo "#define USE_FLOAT 1" >>confdefs.h
- #define USE_FLOAT 1
- _ACEOF
  fi
  # Check whether --with-mpi was given.
- if test "${with_mpi+set}" = set; then
+ if test "${with_mpi+set}" = set; then :
    withval=$with_mpi; with_mpi=${withval}
  else
    with_mpi=no
-Line 6564  fi
+Line 5446  fi
 Line 6564  fi
 Line 5446  fi
  if test "${with_mpi:=no}" != no ; then
-     cat >>confdefs.h <<\_ACEOF
+     $as_echo "#define MPI 1" >>confdefs.h
- #define MPI 1
- _ACEOF
  fi
  if test "${with_lapack:=no}" != no ; then
      LAPACKLIB="-llapack -lblas -lg2c"
-     cat >>confdefs.h <<\_ACEOF
+     $as_echo "#define LAPACK 1" >>confdefs.h
- #define LAPACK 1
- _ACEOF
  fi
-Line 6595  i[3-6]86-*-freebsd[3-9].*)
+Line 5473  i[3-6]86-*-freebsd[3-9].*)
 Line 6595  i[3-6]86-*-freebsd[3-9].*)
 Line 5473  i[3-6]86-*-freebsd[3-9].*)
      ;;
  i[3-6]86-*-linux*|x86-*-linux*)
      asm_obj="${i386_elf_obj}"
-     cat >>confdefs.h <<\_ACEOF
+     $as_echo "#define _BSD_SOURCE 1" >>confdefs.h
- #define _BSD_SOURCE 1
- _ACEOF
      ;;
  *-*-cygwin*)
-Line 6605  _ACEOF
+Line 5481  _ACEOF
 Line 6605  _ACEOF
 Line 5481  _ACEOF
      ;;
  i[3-6]86-*-interix*)
      asm_obj="${i386_aout_obj}"
-     cat >>confdefs.h <<\_ACEOF
+     $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
- #define _ALL_SOURCE 1
- _ACEOF
      ;;
  sparc-sun-solaris2.*)
-Line 6621  sparc-sun-solaris2.*)
+Line 5495  sparc-sun-solaris2.*)
 Line 6621  sparc-sun-solaris2.*)
 Line 5495  sparc-sun-solaris2.*)
                  ;;
      *)          asm_obj="${generic_obj}"  ;;
      esac
-     cat >>confdefs.h <<\_ACEOF
+     $as_echo "#define SYSV 1" >>confdefs.h
- #define SYSV 1
- _ACEOF
      ;;
  *-apple-darwin*)
      asm_obj="${generic_obj}"
-     cat >>confdefs.h <<\_ACEOF
+     $as_echo "#define __DARWIN__ 1" >>confdefs.h
- #define __DARWIN__ 1
- _ACEOF
+     if test -d /usr/X11/include -a x"${X_CFLAGS}" = x ; then
+         X_CFLAGS=-I/usr/X11/include
+     fi
      ;;
  arm*-*-linux*)
      asm_obj="${generic_obj}"
-Line 6646  esac
+Line 5519  esac
 Line 6646  esac
 Line 5519  esac
- { $as_echo "$as_me:$LINENO: checking for socket" >&5
+ ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
- $as_echo_n "checking for socket... " >&6; }
+ if test "x$ac_cv_func_socket" = xyes; then :
- if test "${ac_cv_func_socket+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 socket to an innocuous variant, in case <limits.h> declares socket.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
- #define socket innocuous_socket
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char socket (); 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 socket
- /* 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 socket ();
- /* 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_socket || defined __stub___socket
- choke me
- #endif
- int
- main ()
- {
- return socket ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest$ac_exeext && {
-          test "$cross_compiling" = yes ||
-          $as_test_x conftest$ac_exeext
-        }; then
-   ac_cv_func_socket=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-         ac_cv_func_socket=no
- fi
- rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5
- $as_echo "$ac_cv_func_socket" >&6; }
- if test $ac_cv_func_socket = yes; then
-   :
- else
- { $as_echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
  $as_echo_n "checking for socket in -lsocket... " >&6; }
- if test "${ac_cv_lib_socket_socket+set}" = set; then
+ if ${ac_cv_lib_socket_socket+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lsocket  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  /* Override any GCC internal prototype to avoid an error.
-Line 6764  return socket ();
+Line 5548  return socket ();
 Line 6764  return socket ();
 Line 5548  return socket ();
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+ if ac_fn_c_try_link "$LINENO"; then :
- if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest$ac_exeext && {
-          test "$cross_compiling" = yes ||
-          $as_test_x conftest$ac_exeext
-        }; then
    ac_cv_lib_socket_socket=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
+   ac_cv_lib_socket_socket=no
- sed 's/^/| /' conftest.$ac_ext >&5
-         ac_cv_lib_socket_socket=no
  fi
+ rm -f core conftest.err conftest.$ac_objext \
- rm -rf conftest.dSYM
+     conftest$ac_exeext conftest.$ac_ext
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
  $as_echo "$ac_cv_lib_socket_socket" >&6; }
- if test $ac_cv_lib_socket_socket = yes; then
+ if test "x$ac_cv_lib_socket_socket" = xyes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBSOCKET 1
  _ACEOF
-Line 6811  fi
+Line 5570  fi
 Line 6811  fi
 Line 5570  fi
  fi
- { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
- $as_echo_n "checking for gethostbyname... " >&6; }
+ if test "x$ac_cv_func_gethostbyname" = xyes; then :
- if test "${ac_cv_func_gethostbyname+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- /* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
- #define gethostbyname innocuous_gethostbyname
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char gethostbyname (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
- #ifdef __STDC__
- # include <limits.h>
- #else
- # include <assert.h>
- #endif
- #undef gethostbyname
- /* Override any GCC internal prototype to avoid an error.
-    Use char because int might match the return type of a GCC
-    builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
- char gethostbyname ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
- #if defined __stub_gethostbyname || defined __stub___gethostbyname
- choke me
- #endif
- int
- main ()
- {
- return gethostbyname ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest$ac_exeext && {
-          test "$cross_compiling" = yes ||
-          $as_test_x conftest$ac_exeext
-        }; then
-   ac_cv_func_gethostbyname=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-         ac_cv_func_gethostbyname=no
- fi
- rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
- $as_echo "$ac_cv_func_gethostbyname" >&6; }
- if test $ac_cv_func_gethostbyname = yes; then
-   :
- else
- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
  $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
- if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+ if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lnsl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  /* Override any GCC internal prototype to avoid an error.
-Line 6929  return gethostbyname ();
+Line 5599  return gethostbyname ();
 Line 6929  return gethostbyname ();
 Line 5599  return gethostbyname ();
    return 0;
  }
  _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+ if ac_fn_c_try_link "$LINENO"; then :
- if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
- $as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
-          test -z "$ac_c_werror_flag" ||
-          test ! -s conftest.err
-        } && test -s conftest$ac_exeext && {
-          test "$cross_compiling" = yes ||
-          $as_test_x conftest$ac_exeext
-        }; then
    ac_cv_lib_nsl_gethostbyname=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
+   ac_cv_lib_nsl_gethostbyname=no
- sed 's/^/| /' conftest.$ac_ext >&5
-         ac_cv_lib_nsl_gethostbyname=no
  fi
+ rm -f core conftest.err conftest.$ac_objext \
- rm -rf conftest.dSYM
+     conftest$ac_exeext conftest.$ac_ext
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
  $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
- if test $ac_cv_lib_nsl_gethostbyname = yes; then
+ if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBNSL 1
  _ACEOF
-Line 7006  _ACEOF
+Line 5651  _ACEOF
 Line 7006  _ACEOF
 Line 5651  _ACEOF
      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;} ;;
+ $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
-Line 7020  $as_echo "$as_me: WARNING: Cache variable $ac_var cont
+Line 5665  $as_echo "$as_me: WARNING: Cache variable $ac_var cont
 Line 7020  $as_echo "$as_me: WARNING: Cache variable $ac_var cont
 Line 5665  $as_echo "$as_me: WARNING: Cache variable $ac_var cont
    (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
+       # `set' does not quote correctly, so add quotes: double-quote
-       # substitution turns \\\\ into \\, and sed turns \\ into \).
+       # substitution turns \\\\ into \\, and sed turns \\ into \.
        sed -n \
          "s/'/'\\\\''/g;
            s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-Line 7043  $as_echo "$as_me: WARNING: Cache variable $ac_var cont
+Line 5688  $as_echo "$as_me: WARNING: Cache variable $ac_var cont
 Line 7043  $as_echo "$as_me: WARNING: Cache variable $ac_var cont
 Line 5688  $as_echo "$as_me: WARNING: Cache variable $ac_var cont
       :end' >>confcache
  if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
    if test -w "$cache_file"; then
-     test "x$cache_file" != "x/dev/null" &&
+     if test "x$cache_file" != "x/dev/null"; then
-       { $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
+       if test ! -f "$cache_file" || test -h "$cache_file"; then
+         cat confcache >"$cache_file"
+       else
+         case $cache_file in #(
+         */* | ?:*)
+           mv -f confcache "$cache_file"$$ &&
+           mv -f "$cache_file"$$ "$cache_file" ;; #(
+         *)
+           mv -f confcache "$cache_file" ;;
+         esac
+       fi
+     fi
    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
-Line 7098  DEFS=`sed -n "$ac_script" confdefs.h`
+Line 5754  DEFS=`sed -n "$ac_script" confdefs.h`
 Line 7098  DEFS=`sed -n "$ac_script" confdefs.h`
 Line 5754  DEFS=`sed -n "$ac_script" confdefs.h`
  ac_libobjs=
  ac_ltlibobjs=
+ U=
  for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
    # 1. Remove the extension, and $U if already installed.
    ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
    ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
    # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
    #    will be set to the directory where LIBOBJS objects are built.
-   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-   ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+   as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
  done
  LIBOBJS=$ac_libobjs
  LTLIBOBJS=$ac_ltlibobjs
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+ $as_echo_n "checking that generated files are newer than configure... " >&6; }
+    if test -n "$am_sleep_pid"; then
+      # Hide warnings about reused PIDs.
+      wait $am_sleep_pid 2>/dev/null
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+ $as_echo "done" >&6; }
+  if test -n "$EXEEXT"; then
+   am__EXEEXT_TRUE=
+   am__EXEEXT_FALSE='#'
+ else
+   am__EXEEXT_TRUE='#'
+   am__EXEEXT_FALSE=
+ fi
  if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-   { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+   as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
- $as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
  fi
  if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-   { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+   as_fn_error $? "conditional \"AMDEP\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
- $as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
  fi
  if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-   { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
- $as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
  fi
- if test -z "${USE_GC7_TRUE}" && test -z "${USE_GC7_FALSE}"; then
-   { { $as_echo "$as_me:$LINENO: error: conditional \"USE_GC7\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
- $as_echo "$as_me: error: conditional \"USE_GC7\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
  if test -z "${USE_PLOT_TRUE}" && test -z "${USE_PLOT_FALSE}"; then
-   { { $as_echo "$as_me:$LINENO: error: conditional \"USE_PLOT\" was never defined.
+   as_fn_error $? "conditional \"USE_PLOT\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
- $as_echo "$as_me: error: conditional \"USE_PLOT\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
  fi
- : ${CONFIG_STATUS=./config.status}
+ : "${CONFIG_STATUS=./config.status}"
  ac_write_fail=0
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
- { $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+ { $as_echo "$as_me:${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.
-Line 7164  cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+Line 5819  cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 Line 7164  cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 Line 5819  cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  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
-Line 7182  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/
+Line 5838  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/
 Line 7182  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/
 Line 5838  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
-   case `(set -o) 2>/dev/null` in
+   case `(set -o) 2>/dev/null` in #(
-   *posix*) set -o posix ;;
+   *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
-Line 7206  export as_nl
+Line 5854  export as_nl
 Line 7206  export as_nl
 Line 5854  export as_nl
  as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
- 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
-Line 7217  else
+Line 5871  else
 Line 7217  else
 Line 5871  else
      as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
      as_echo_n_body='eval
        arg=$1;
-       case $arg in
+       case $arg in #(
        *"$as_nl"*)
          expr "X$arg" : "X\\(.*\\)$as_nl";
          arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-Line 7240  if test "${PATH_SEPARATOR+set}" != set; then
+Line 5894  if test "${PATH_SEPARATOR+set}" != set; then
 Line 7240  if test "${PATH_SEPARATOR+set}" != set; then
 Line 5894  if test "${PATH_SEPARATOR+set}" != set; then
    }
  fi
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-   as_unset=unset
- else
-   as_unset=false
- fi
  # IFS
  # We need space, tab and new line, in precisely that order.  Quoting is
  # there to prevent editors from complaining about space-tab.
-Line 7256  fi
+Line 5903  fi
 Line 7256  fi
 Line 5903  fi
  IFS=" ""        $as_nl"
  # Find who we are.  Look in the path if we contain no directory separator.
- case $0 in
+ as_myself=
+ 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
+     test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
- done
+   done
  IFS=$as_save_IFS
       ;;
-Line 7276  if test "x$as_myself" = x; then
+Line 5924  if test "x$as_myself" = x; then
 Line 7276  if test "x$as_myself" = x; then
 Line 5924  if test "x$as_myself" = x; then
  fi
  if test ! -f "$as_myself"; then
    $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-   { (exit 1); exit 1; }
+   exit 1
  fi
- # Work around bugs in pre-3.0 UWIN ksh.
+ # Unset variables that we do not need and which cause bugs (e.g. in
- for as_var in ENV MAIL MAILPATH
+ # pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ # 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='> '
-Line 7293  export LC_ALL
+Line 5945  export LC_ALL
 Line 7293  export LC_ALL
 Line 5945  export LC_ALL
  LANGUAGE=C
  export LANGUAGE
- # Required to use basename.
+ # CDPATH.
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ # as_fn_error STATUS 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=$1; test $as_status -eq 0 && as_status=1
+   if test "$4"; then
+     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+   fi
+   $as_echo "$as_me: error: $2" >&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
-Line 7307  else
+Line 6041  else
 Line 7307  else
 Line 6041  else
    as_basename=false
  fi
+ if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+   as_dirname=dirname
+ else
+   as_dirname=false
+ fi
- # Name of the executable.
  as_me=`$as_basename -- "$0" ||
  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
           X"$0" : 'X\(//\)$' \| \
-Line 7328  $as_echo X/"$0" |
+Line 6066  $as_echo X/"$0" |
 Line 7328  $as_echo X/"$0" |
 Line 6066  $as_echo X/"$0" |
            }
            s/.*/./; q'`
- # CDPATH.
+ # Avoid depending upon Character Ranges.
- $as_unset CDPATH
+ 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
-Line 7412  if (echo >conf$$.file) 2>/dev/null; then
+Line 6099  if (echo >conf$$.file) 2>/dev/null; then
 Line 7412  if (echo >conf$$.file) 2>/dev/null; then
 Line 6099  if (echo >conf$$.file) 2>/dev/null; then
      # ... but there are two gotchas:
      # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
      # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-     # In both cases, we have to default to `cp -p'.
+     # In both cases, we have to default to `cp -pR'.
      ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-       as_ln_s='cp -p'
+       as_ln_s='cp -pR'
    elif ln conf$$.file conf$$ 2>/dev/null; then
      as_ln_s=ln
    else
-     as_ln_s='cp -p'
+     as_ln_s='cp -pR'
    fi
  else
-   as_ln_s='cp -p'
+   as_ln_s='cp -pR'
  fi
  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
  rmdir conf$$.dir 2>/dev/null
+ # as_fn_mkdir_p
+ # -------------
+ # Create "$as_dir" as a directory, including parents if necessary.
+ as_fn_mkdir_p ()
+ {
+   case $as_dir in #(
+   -*) as_dir=./$as_dir;;
+   esac
+   test -d "$as_dir" || eval $as_mkdir_p || {
+     as_dirs=
+     while :; do
+       case $as_dir in #(
+       *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+       *) as_qdir=$as_dir;;
+       esac
+       as_dirs="'$as_qdir' $as_dirs"
+       as_dir=`$as_dirname -- "$as_dir" ||
+ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+          X"$as_dir" : 'X\(//\)[^/]' \| \
+          X"$as_dir" : 'X\(//\)$' \| \
+          X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+ $as_echo X"$as_dir" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+             s//\1/
+             q
+           }
+           /^X\(\/\/\)[^/].*/{
+             s//\1/
+             q
+           }
+           /^X\(\/\/\)$/{
+             s//\1/
+             q
+           }
+           /^X\(\/\).*/{
+             s//\1/
+             q
+           }
+           s/.*/./; q'`
+       test -d "$as_dir" && break
+     done
+     test -z "$as_dirs" || eval "mkdir $as_dirs"
+   } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+ } # as_fn_mkdir_p
  if mkdir -p . 2>/dev/null; then
-   as_mkdir_p=:
+   as_mkdir_p='mkdir -p "$as_dir"'
  else
    test -d ./-p && rmdir ./-p
    as_mkdir_p=false
  fi
- if test -x / >/dev/null 2>&1; then
-   as_test_x='test -x'
- else
-   if ls -dL / >/dev/null 2>&1; then
-     as_ls_L_option=L
-   else
-     as_ls_L_option=
-   fi
-   as_test_x='
-     eval sh -c '\''
-       if test -d "$1"; then
-         test -d "$1/.";
-       else
-         case $1 in
-         -*)set "./$1";;
-         esac;
-         case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-         ???[sx]*):;;*)false;;esac;fi
-     '\'' sh
-   '
- fi
- as_executable_p=$as_test_x
+ # as_fn_executable_p FILE
+ # -----------------------
+ # Test if FILE is an executable regular file.
+ as_fn_executable_p ()
+ {
+   test -f "$1" && test -x "$1"
+ } # as_fn_executable_p
+ as_test_x='test -x'
+ as_executable_p=as_fn_executable_p
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-Line 7464  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+Line 6187  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 Line 7464  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 Line 6187  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  exec 6>&1
+ ## ----------------------------------- ##
+ ## Main body of $CONFIG_STATUS script. ##
+ ## ----------------------------------- ##
+ _ASEOF
+ test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
- # 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.62.  Invocation command line was
+ generated by GNU Autoconf 2.69.  Invocation command line was
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-Line 7483  on `(hostname || uname -n) 2>/dev/null | sed 1q`
+Line 6212  on `(hostname || uname -n) 2>/dev/null | sed 1q`
 Line 7483  on `(hostname || uname -n) 2>/dev/null | sed 1q`
 Line 6212  on `(hostname || uname -n) 2>/dev/null | sed 1q`
  _ACEOF
+ case $ac_config_files in *"
+ "*) set x $ac_config_files; shift; ac_config_files=$*;;
+ esac
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  # Files that config.status was made for.
  config_files="$ac_config_files"
-Line 7492  _ACEOF
+Line 6227  _ACEOF
 Line 7492  _ACEOF
 Line 6227  _ACEOF
  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  ac_cs_usage="\
- \`$as_me' instantiates files from templates according to the
+ \`$as_me' instantiates files and other configuration actions
- current configuration.
+ from templates according to the current configuration.  Unless the files
+ and actions are specified as TAGs, all are instantiated by default.
- Usage: $0 [OPTIONS] [FILE]...
+ Usage: $0 [OPTION]... [TAG]...
    -h, --help       print this help, then exit
    -V, --version    print version number and configuration settings, then exit
-   -q, --quiet      do not print progress messages
+       --config     print configuration, then exit
+   -q, --quiet, --silent
+                    do not print progress messages
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
-   --file=FILE[:TEMPLATE]
+       --file=FILE[:TEMPLATE]
                     instantiate the configuration file FILE
  Configuration files:
-Line 7511  $config_files
+Line 6249  $config_files
 Line 7511  $config_files
 Line 6249  $config_files
  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_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
  config.status
- configured by $0, generated by GNU Autoconf 2.62,
+ configured by $0, generated by GNU Autoconf 2.69,
-   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+   with options \\"\$ac_cs_config\\"
- Copyright (C) 2008 Free Software Foundation, Inc.
+ Copyright (C) 2012 Free Software Foundation, Inc.
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
-Line 7538  ac_need_defaults=:
+Line 6277  ac_need_defaults=:
 Line 7538  ac_need_defaults=:
 Line 6277  ac_need_defaults=:
  while test $# != 0
  do
    case $1 in
-   --*=*)
+   --*=?*)
      ac_option=`expr "X$1" : 'X\([^=]*\)='`
      ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
      ac_shift=:
      ;;
+   --*=)
+     ac_option=`expr "X$1" : 'X\([^=]*\)='`
+     ac_optarg=
+     ac_shift=:
+     ;;
    *)
      ac_option=$1
      ac_optarg=$2
-Line 7556  do
+Line 6300  do
 Line 7556  do
 Line 6300  do
      ac_cs_recheck=: ;;
    --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
      $as_echo "$ac_cs_version"; exit ;;
+   --config | --confi | --conf | --con | --co | --c )
+     $as_echo "$ac_cs_config"; exit ;;
    --debug | --debu | --deb | --de | --d | -d )
      debug=: ;;
    --file | --fil | --fi | --f )
      $ac_shift
      case $ac_optarg in
      *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+     '') as_fn_error $? "missing file argument" ;;
      esac
-     CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+     as_fn_append CONFIG_FILES " '$ac_optarg'"
      ac_need_defaults=false;;
    --he | --h |  --help | --hel | -h )
      $as_echo "$ac_cs_usage"; exit ;;
-Line 7572  do
+Line 6319  do
 Line 7572  do
 Line 6319  do
      ac_cs_silent=: ;;
    # This is an error.
-   -*) { $as_echo "$as_me: error: unrecognized option: $1
+   -*) as_fn_error $? "unrecognized option: \`$1'
- Try \`$0 --help' for more information." >&2
+ Try \`$0 --help' for more information." ;;
-    { (exit 1); exit 1; }; } ;;
-   *) ac_config_targets="$ac_config_targets $1"
+   *) as_fn_append ac_config_targets " $1"
       ac_need_defaults=false ;;
    esac
-Line 7593  fi
+Line 6339  fi
 Line 7593  fi
 Line 6339  fi
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  if \$ac_cs_recheck; then
-   set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
    shift
    \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
    CONFIG_SHELL='$SHELL'
-Line 7639  do
+Line 6385  do
 Line 7639  do
 Line 6385  do
      "parse/Makefile") CONFIG_FILES="$CONFIG_FILES parse/Makefile" ;;
      "plot/Makefile") CONFIG_FILES="$CONFIG_FILES plot/Makefile" ;;
-   *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
- $as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
    esac
  done
-Line 7663  fi
+Line 6407  fi
 Line 7663  fi
 Line 6407  fi
  # after its creation but before its name has been assigned to `$tmp'.
  $debug ||
  {
-   tmp=
+   tmp= ac_tmp=
    trap 'exit_status=$?
-   { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+   : "${ac_tmp:=$tmp}"
+   { test ! -d "$ac_tmp" || rm -fr "$ac_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.
  {
    tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-   test -n "$tmp" && test -d "$tmp"
+   test -d "$tmp"
  }  ||
  {
    tmp=./conf$$-$RANDOM
    (umask 077 && mkdir "$tmp")
- } ||
+ } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
- {
+ ac_tmp=$tmp
-    $as_echo "$as_me: cannot create a temporary directory in ." >&2
-    { (exit 1); exit 1; }
- }
  # Set up the scripts for CONFIG_FILES section.
  # No need to generate them if there are no CONFIG_FILES.
-Line 7690  $debug ||
+Line 6432  $debug ||
 Line 7690  $debug ||
 Line 6432  $debug ||
  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'
-Line 7698  else
+Line 6446  else
 Line 7698  else
 Line 6446  else
    ac_cs_awk_cr=$ac_cr
  fi
- echo 'BEGIN {' >"$tmp/subs1.awk" &&
+ echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
  _ACEOF
-Line 7707  _ACEOF
+Line 6455  _ACEOF
 Line 7707  _ACEOF
 Line 6455  _ACEOF
    echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
    echo "_ACEOF"
  } >conf$$subs.sh ||
-   { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+   as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
- $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
-    { (exit 1); exit 1; }; }
- ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    . ./conf$$subs.sh ||
-     { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
- $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-    { (exit 1); exit 1; }; }
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
+   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_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
- $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-    { (exit 1); exit 1; }; }
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
-Line 7731  done
+Line 6474  done
 Line 7731  done
 Line 6474  done
  rm -f conf$$subs.sh
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+ cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
  _ACEOF
  sed -n '
  h
-Line 7745  s/'"$ac_delim"'$//
+Line 6488  s/'"$ac_delim"'$//
 Line 7745  s/'"$ac_delim"'$//
 Line 6488  s/'"$ac_delim"'$//
  t delim
  :nl
  h
- s/\(.\{148\}\).*/\1/
+ s/\(.\{148\}\)..*/\1/
  t more1
  s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
  p
-Line 7759  s/.\{148\}//
+Line 6502  s/.\{148\}//
 Line 7759  s/.\{148\}//
 Line 6502  s/.\{148\}//
  t nl
  :delim
  h
- s/\(.\{148\}\).*/\1/
+ s/\(.\{148\}\)..*/\1/
  t more2
  s/["\\]/\\&/g; s/^/"/; s/$/"/
  p
-Line 7779  t delim
+Line 6522  t delim
 Line 7779  t delim
 Line 6522  t delim
  rm -f conf$$subs.awk
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  _ACAWK
- cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+ cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
    for (key in S) S_is_set[key] = 1
    FS = ""
-Line 7811  if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+Line 6554  if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
 Line 7811  if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
 Line 6554  if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
    sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
  else
    cat
- fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+ fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
-   || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
- $as_echo "$as_me: error: could not setup config files machinery" >&2;}
-    { (exit 1); exit 1; }; }
  _ACEOF
- # VPATH may cause trouble with some makes, so we remove $(srcdir),
+ # VPATH may cause trouble with some makes, so we remove sole $(srcdir),
- # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+ # ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
  # trailing colons and then remove the whole line if VPATH becomes empty
  # (actually we leave an empty line to preserve line numbers).
  if test "x$srcdir" = x.; then
-   ac_vpsub='/^[  ]*VPATH[        ]*=/{
+   ac_vpsub='/^[  ]*VPATH[        ]*=[    ]*/{
- s/:*\$(srcdir):*/:/
+ h
- s/:*\${srcdir}:*/:/
+ s///
- s/:*@srcdir@:*/:/
+ s/^/:/
- s/^\([^=]*=[     ]*\):*/\1/
+ s/[      ]*$/:/
+ s/:\$(srcdir):/:/g
+ s/:\${srcdir}:/:/g
+ s/:@srcdir@:/:/g
+ s/^:*//
  s/:*$//
+ x
+ s/\(=[   ]*\).*/\1/
+ G
+ s/\n//
  s/^[^=]*=[       ]*$//
  }'
  fi
-Line 7845  do
+Line 6594  do
 Line 7845  do
 Line 6594  do
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
-   :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+   :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
- $as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-    { (exit 1); exit 1; }; };;
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    esac
-Line 7866  $as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+Line 6613  $as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
 Line 7866  $as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
 Line 6613  $as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
      for ac_f
      do
        case $ac_f in
-       -) ac_f="$tmp/stdin";;
+       -) ac_f="$ac_tmp/stdin";;
        *) # Look for the file first in the build tree, then in the source tree
           # (if the path is not absolute).  The absolute path cannot be DOS-style,
           # because $ac_f cannot contain `:'.
-Line 7875  $as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+Line 6622  $as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
 Line 7875  $as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
 Line 6622  $as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
             [\\/$]*) 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_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
- $as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-    { (exit 1); exit 1; }; };;
        esac
        case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-       ac_file_inputs="$ac_file_inputs '$ac_f'"
+       as_fn_append ac_file_inputs " '$ac_f'"
      done
      # Let's still pretend it is `configure' which instantiates (i.e., don't
-Line 7891  $as_echo "$as_me: error: cannot find input file: $ac_f
+Line 6636  $as_echo "$as_me: error: cannot find input file: $ac_f
 Line 7891  $as_echo "$as_me: error: cannot find input file: $ac_f
 Line 6636  $as_echo "$as_me: error: cannot find input file: $ac_f
          `' 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.
-Line 7903  $as_echo "$as_me: creating $ac_file" >&6;}
+Line 6648  $as_echo "$as_me: creating $ac_file" >&6;}
 Line 7903  $as_echo "$as_me: creating $ac_file" >&6;}
 Line 6648  $as_echo "$as_me: creating $ac_file" >&6;}
      esac
      case $ac_tag in
-     *:-:* | *:-) cat >"$tmp/stdin" \
+     *:-:* | *:-) cat >"$ac_tmp/stdin" \
-       || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+       || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
- $as_echo "$as_me: error: could not create $ac_file" >&2;}
-    { (exit 1); exit 1; }; } ;;
      esac
      ;;
    esac
-Line 7934  $as_echo X"$ac_file" |
+Line 6677  $as_echo X"$ac_file" |
 Line 7934  $as_echo X"$ac_file" |
 Line 6677  $as_echo X"$ac_file" |
              q
            }
            s/.*/./; q'`
-   { as_dir="$ac_dir"
+   as_dir="$ac_dir"; as_fn_mkdir_p
-   case $as_dir in #(
-   -*) as_dir=./$as_dir;;
-   esac
-   test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-     as_dirs=
-     while :; do
-       case $as_dir in #(
-       *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-       *) as_qdir=$as_dir;;
-       esac
-       as_dirs="'$as_qdir' $as_dirs"
-       as_dir=`$as_dirname -- "$as_dir" ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-          X"$as_dir" : 'X\(//\)[^/]' \| \
-          X"$as_dir" : 'X\(//\)$' \| \
-          X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
- $as_echo X"$as_dir" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-             s//\1/
-             q
-           }
-           /^X\(\/\/\)[^/].*/{
-             s//\1/
-             q
-           }
-           /^X\(\/\/\)$/{
-             s//\1/
-             q
-           }
-           /^X\(\/\).*/{
-             s//\1/
-             q
-           }
-           s/.*/./; q'`
-       test -d "$as_dir" && break
-     done
-     test -z "$as_dirs" || eval "mkdir $as_dirs"
-   } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
- $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-    { (exit 1); exit 1; }; }; }
    ac_builddir=.
  case "$ac_dir" in
-Line 8031  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+Line 6734  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 Line 8031  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 Line 6734  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  # If the template does not know about datarootdir, expand it.
  # FIXME: This hack should be removed a few years after 2.60.
  ac_datarootdir_hack=; ac_datarootdir_seen=
  ac_sed_dataroot='
  /datarootdir/ {
    p
-Line 8041  ac_sed_dataroot='
+Line 6743  ac_sed_dataroot='
 Line 8041  ac_sed_dataroot='
 Line 6743  ac_sed_dataroot='
  /@docdir@/p
  /@infodir@/p
  /@localedir@/p
- /@mandir@/p
+ /@mandir@/p'
- '
  case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
  *datarootdir*) ac_datarootdir_seen=yes;;
  *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-   { $as_echo "$as_me:$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
-Line 8056  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+Line 6757  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 Line 8056  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 Line 6757  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
    s&@infodir@&$infodir&g
    s&@localedir@&$localedir&g
    s&@mandir@&$mandir&g
-     s&\\\${datarootdir}&$datarootdir&g' ;;
+   s&\\\${datarootdir}&$datarootdir&g' ;;
  esac
  _ACEOF
-Line 8084  s&@INSTALL@&$ac_INSTALL&;t t
+Line 6785  s&@INSTALL@&$ac_INSTALL&;t t
 Line 8084  s&@INSTALL@&$ac_INSTALL&;t t
 Line 6785  s&@INSTALL@&$ac_INSTALL&;t t
  s&@MKDIR_P@&$ac_MKDIR_P&;t t
  $ac_datarootdir_hack
  "
- eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+ eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
-   || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+   >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- $as_echo "$as_me: error: could not create $ac_file" >&2;}
-    { (exit 1); exit 1; }; }
  test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-   { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+   { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' \
-   { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+       "$ac_tmp/out"`; test -z "$ac_out"; } &&
- which seems to be undefined.  Please make sure it is defined." >&5
+   { $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;}
+ which seems to be undefined.  Please make sure it is defined" >&2;}
-   rm -f "$tmp/stdin"
+   rm -f "$ac_tmp/stdin"
    case $ac_file in
-   -) cat "$tmp/out" && rm -f "$tmp/out";;
+   -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+   *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
    esac \
-   || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- $as_echo "$as_me: error: could not create $ac_file" >&2;}
-    { (exit 1); exit 1; }; }
   ;;
-   :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
    case $ac_file$ac_mode in
-     "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-   # Strip MF so we end up with the name of the file.
+   # Autoconf 2.62 quotes --file arguments for eval, but not when files
-   mf=`echo "$mf" | sed -e 's/:.*$//'`
+   # are listed without --file.  Let's play safe and only enable the eval
-   # Check whether this is an Automake generated Makefile or not.
+   # if we detect the quoting.
-   # We used to match only the files named `Makefile.in', but
+   case $CONFIG_FILES in
-   # some people rename them; so instead we look at the file content.
+   *\'*) eval set x "$CONFIG_FILES" ;;
-   # Grep'ing the first line is not enough: some people post-process
+   *)   set x $CONFIG_FILES ;;
-   # each Makefile.in and add a new line on top of each file to say so.
+   esac
-   # Grep'ing the whole file is not good either: AIX grep has a line
+   shift
-   # limit of 2048, but all sed's we know have understand at least 4000.
+   for mf
-   if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+   do
-     dirpart=`$as_dirname -- "$mf" ||
+     # Strip MF so we end up with the name of the file.
+     mf=`echo "$mf" | sed -e 's/:.*$//'`
+     # Check whether this is an Automake generated Makefile or not.
+     # We used to match only the files named 'Makefile.in', but
+     # some people rename them; so instead we look at the file content.
+     # Grep'ing the first line is not enough: some people post-process
+     # each Makefile.in and add a new line on top of each file to say so.
+     # Grep'ing the whole file is not good either: AIX grep has a line
+     # limit of 2048, but all sed's we know have understand at least 4000.
+     if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+       dirpart=`$as_dirname -- "$mf" ||
  $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
           X"$mf" : 'X\(//\)[^/]' \| \
           X"$mf" : 'X\(//\)$' \| \
-Line 8149  $as_echo X"$mf" |
+Line 6857  $as_echo X"$mf" |
 Line 8149  $as_echo X"$mf" |
 Line 6857  $as_echo X"$mf" |
              q
            }
            s/.*/./; q'`
-   else
+     else
-     continue
+       continue
-   fi
+     fi
-   # Extract the definition of DEPDIR, am__include, and am__quote
+     # Extract the definition of DEPDIR, am__include, and am__quote
-   # from the Makefile without running `make'.
+     # from the Makefile without running 'make'.
-   DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-   test -z "$DEPDIR" && continue
+     test -z "$DEPDIR" && continue
-   am__include=`sed -n 's/^am__include = //p' < "$mf"`
+     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-   test -z "am__include" && continue
+     test -z "am__include" && continue
-   am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-   # When using ansi2knr, U may be empty or an underscore; expand it
+     # Find all dependency output files, they are included files with
-   U=`sed -n 's/^U = //p' < "$mf"`
+     # $(DEPDIR) in their names.  We invoke sed twice because it is the
-   # Find all dependency output files, they are included files with
+     # simplest approach to changing $(DEPDIR) to its actual value in the
-   # $(DEPDIR) in their names.  We invoke sed twice because it is the
+     # expansion.
-   # simplest approach to changing $(DEPDIR) to its actual value in the
+     for file in `sed -n "
-   # expansion.
+       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-   for file in `sed -n "
+          sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-     s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+       # Make sure the directory exists.
-        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+       test -f "$dirpart/$file" && continue
-     # Make sure the directory exists.
+       fdir=`$as_dirname -- "$file" ||
-     test -f "$dirpart/$file" && continue
-     fdir=`$as_dirname -- "$file" ||
  $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
           X"$file" : 'X\(//\)[^/]' \| \
           X"$file" : 'X\(//\)$' \| \
-Line 8193  $as_echo X"$file" |
+Line 6899  $as_echo X"$file" |
 Line 8193  $as_echo X"$file" |
 Line 6899  $as_echo X"$file" |
              q
            }
            s/.*/./; q'`
-     { as_dir=$dirpart/$fdir
+       as_dir=$dirpart/$fdir; as_fn_mkdir_p
-   case $as_dir in #(
+       # echo "creating $dirpart/$file"
-   -*) as_dir=./$as_dir;;
+       echo '# dummy' > "$dirpart/$file"
-   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; }; }; }
-     # echo "creating $dirpart/$file"
-     echo '# dummy' > "$dirpart/$file"
    done
- done
+ }
   ;;
    esac
  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_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
- $as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
-    { (exit 1); exit 1; }; }
  # configure is writing to config.log, and then calls config.status.
-Line 8273  if test "$no_create" != yes; then
+Line 6937  if test "$no_create" != yes; then
 Line 8273  if test "$no_create" != yes; then
 Line 6937  if test "$no_create" != yes; then
    exec 5>>config.log
    # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    # would make configure fail if this is the last instruction.
-   $ac_cs_success || { (exit 1); exit 1; }
+   $ac_cs_success || as_fn_exit 1
  fi
  if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-   { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
- $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
+ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
  fi

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>