 @@ -1,208 +1,9260 @@
-$NetBSD: patch-ac,v 1.7 2007/03/08 19:24:24 rillig Exp $
+$NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
---- configure.orig	2000-04-15 08:13:01.000000000 -0700
+--- configure.orig	2006-08-16 20:02:25.000000000 +0200
 +++ configure
-@@ -884,6 +884,16 @@ else
+@@ -1,25 +1,82 @@
-   echo "$ac_t""no" 1>&6
+ #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
 -# Generated by GNU Autoconf 2.59.
 +# Generated by GNU Autoconf 2.63.
+ #
 -# Copyright (C) 2003 Free Software Foundation, Inc.
 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 +# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
  ## --------------------- ##
  ## M4sh Initialization.  ##
  ## --------------------- ##
 -# Be Bourne compatible
 +# Be more Bourne compatible
 +DUALCASE=1; export DUALCASE # for MKS sh
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
    emulate sh
    NULLCMD=:
 -  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
 +  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
    # is contrary to our usage.  Disable this feature.
    alias -g '${1+"$@"}'='"$@"'
 -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
 -  set -o posix
 +  setopt NO_GLOB_SUBST
 +else
 +  case `(set -o) 2>/dev/null` in
 +  *posix*) set -o posix ;;
 +esac
++
 +fi
++
++
++
++
 +# 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
 +# Printing a long string crashes Solaris 7 /usr/bin/printf.
 +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
 +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
 +  as_echo='printf %s\n'
 +  as_echo_n='printf %s'
 +else
 +  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
 +    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
 +    as_echo_n='/usr/ucb/echo -n'
 +  else
 +    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
 +    as_echo_n_body='eval
 +      arg=$1;
 +      case $arg in
 +      *"$as_nl"*)
 +	expr "X$arg" : "X\\(.*\\)$as_nl";
 +	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
 +      esac;
 +      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
 +    '
 +    export as_echo_n_body
 +    as_echo_n='sh -c $as_echo_n_body as_echo'
 +  fi
 +  export as_echo_body
 +  as_echo='sh -c $as_echo_body as_echo'
 +fi
++
 +# The user is always right.
 +if test "${PATH_SEPARATOR+set}" != set; then
 +  PATH_SEPARATOR=:
 +  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
 +    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
 +      PATH_SEPARATOR=';'
 +  }
  fi
 -DUALCASE=1; export DUALCASE # for MKS sh
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
@@ -29,33 +86,60 @@ else
  fi
 +# IFS
 +# We need space, tab and new line, in precisely that order.  Quoting is
 +# there to prevent editors from complaining about space-tab.
 +# (If _AS_PATH_WALK were called with IFS unset, it would disable word
 +# splitting by setting IFS to empty value.)
 +IFS=" ""	$as_nl"
++
 +# Find who we are.  Look in the path if we contain no directory separator.
 +case $0 in
 +  *[\\/]* ) as_myself=$0 ;;
 +  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
 +done
 +IFS=$as_save_IFS
++
 +     ;;
 +esac
 +# We did not find ourselves, most probably we were run as `sh COMMAND'
 +# in which case we are not to be found in the path.
 +if test "x$as_myself" = x; then
 +  as_myself=$0
 +fi
 +if test ! -f "$as_myself"; then
 +  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
 +  { (exit 1); exit 1; }
 +fi
++
  # Work around bugs in pre-3.0 UWIN ksh.
 -$as_unset ENV MAIL MAILPATH
 +for as_var in ENV MAIL MAILPATH
 +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
 +done
  PS1='$ '
  PS2='> '
  PS4='+ '
  # NLS nuisances.
 -for as_var in \
 -  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
 -  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
 -  LC_TELEPHONE LC_TIME
 -do
 -  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
 -    eval $as_var=C; export $as_var
 -  else
 -    $as_unset $as_var
 -  fi
 -done
 +LC_ALL=C
 +export LC_ALL
 +LANGUAGE=C
 +export LANGUAGE
  # Required to use basename.
 -if expr a : '\(a\)' >/dev/null 2>&1; then
 +if expr a : '\(a\)' >/dev/null 2>&1 &&
 +   test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
  else
    as_expr=false
  fi
 -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
 +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
    as_basename=basename
  else
    as_basename=false
@@ -63,157 +147,391 @@ fi
  # Name of the executable.
 -as_me=`$as_basename "$0" ||
 +as_me=`$as_basename -- "$0" ||
  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  	 X"$0" : 'X\(//\)$' \| \
 -	 X"$0" : 'X\(/\)$' \| \
 -	 .     : '\(.\)' 2>/dev/null ||
 -echo X/"$0" |
 -    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
 -  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
 -  	  /^X\/\(\/\).*/{ s//\1/; q; }
 -  	  s/.*/./; q'`
 +	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 +$as_echo X/"$0" |
 +    sed '/^.*\/\([^/][^/]*\)\/*$/{
 +	    s//\1/
 +	    q
 +	  }
 +	  /^X\/\(\/\/\)$/{
 +	    s//\1/
 +	    q
 +	  }
 +	  /^X\/\(\/\).*/{
 +	    s//\1/
 +	    q
 +	  }
 +	  s/.*/./; q'`
 +# CDPATH.
 +$as_unset CDPATH
 -# PATH needs CR, and LINENO needs CR and PATH.
 -# 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
 -# The user is always right.
 -if test "${PATH_SEPARATOR+set}" != set; then
 -  echo "#! /bin/sh" >conf$$.sh
 -  echo  "exit 0"   >>conf$$.sh
 -  chmod +x conf$$.sh
 -  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
 -    PATH_SEPARATOR=';'
 -  else
 -    PATH_SEPARATOR=:
 -  fi
 -  rm -f conf$$.sh
 +if test "x$CONFIG_SHELL" = x; then
 +  if (eval ":") 2>/dev/null; then
 +  as_have_required=yes
 +else
 +  as_have_required=no
  fi
 +  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
 +}
 -  as_lineno_1=$LINENO
 -  as_lineno_2=$LINENO
 -  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
 -  test "x$as_lineno_1" != "x$as_lineno_2" &&
 -  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
 -  # Find who we are.  Look in the path if we contain no path at all
 -  # relative or not.
 -  case $0 in
 -    *[\\/]* ) as_myself=$0 ;;
 -    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 -for as_dir in $PATH
 -do
 -  IFS=$as_save_IFS
 -  test -z "$as_dir" && as_dir=.
 -  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
 -done
 +exitcode=0
 +if as_func_success; then
 +  :
 +else
 +  exitcode=1
 +  echo as_func_success failed.
 +fi
 -       ;;
 -  esac
 -  # We did not find ourselves, most probably we were run as `sh COMMAND'
 -  # in which case we are not to be found in the path.
 -  if test "x$as_myself" = x; then
 -    as_myself=$0
 -  fi
 -  if test ! -f "$as_myself"; then
 -    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
 -   { (exit 1); exit 1; }; }
 -  fi
 -  case $CONFIG_SHELL in
 -  '')
 +if as_func_failure; then
 +  exitcode=1
 +  echo as_func_failure succeeded.
 +fi
++
 +if as_func_ret_success; then
 +  :
 +else
 +  exitcode=1
 +  echo as_func_ret_success failed.
 +fi
++
 +if as_func_ret_failure; then
 +  exitcode=1
 +  echo as_func_ret_failure succeeded.
 +fi
++
 +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
 +  :
 +else
 +  exitcode=1
 +  echo positional parameters were not saved.
 +fi
++
 +test \$exitcode = 0) || { (exit 1); exit 1; }
++
 +(
 +  as_lineno_1=\$LINENO
 +  as_lineno_2=\$LINENO
 +  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
 +  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
 +") 2> /dev/null; then
 +  :
 +else
 +  as_candidate_shells=
      as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
 -  for as_base in sh bash ksh sh5; do
 -	 case $as_dir in
 +  case $as_dir in
  	 /*)
 -	   if ("$as_dir/$as_base" -c '
 +	   for as_base in sh bash ksh sh5; do
 +	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
 +	   done;;
 +       esac
 +done
 +IFS=$as_save_IFS
++
++
 +      for as_shell in $as_candidate_shells $SHELL; do
 +	 # Try only shells that exist, to save several forks.
 +	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
 +		{ ("$as_shell") 2> /dev/null <<\_ASEOF
 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
 +  emulate sh
 +  NULLCMD=:
 +  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
 +  # is contrary to our usage.  Disable this feature.
 +  alias -g '${1+"$@"}'='"$@"'
 +  setopt NO_GLOB_SUBST
 +else
 +  case `(set -o) 2>/dev/null` in
 +  *posix*) set -o posix ;;
 +esac
++
 +fi
++
++
 +:
 +_ASEOF
 +}; then
 +  CONFIG_SHELL=$as_shell
 +	       as_have_required=yes
 +	       if { "$as_shell" 2> /dev/null <<\_ASEOF
 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
 +  emulate sh
 +  NULLCMD=:
 +  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
 +  # is contrary to our usage.  Disable this feature.
 +  alias -g '${1+"$@"}'='"$@"'
 +  setopt NO_GLOB_SUBST
 +else
 +  case `(set -o) 2>/dev/null` in
 +  *posix*) set -o posix ;;
 +esac
++
 +fi
++
++
 +:
 +(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
++
 +if as_func_ret_success; then
 +  :
 +else
 +  exitcode=1
 +  echo as_func_ret_success failed.
 +fi
++
 +if as_func_ret_failure; then
 +  exitcode=1
 +  echo as_func_ret_failure succeeded.
 +fi
++
 +if ( set x; as_func_ret_success y && test x = "$1" ); then
 +  :
 +else
 +  exitcode=1
 +  echo positional parameters were not saved.
 +fi
++
 +test $exitcode = 0) || { (exit 1); exit 1; }
++
 +(
    as_lineno_1=$LINENO
    as_lineno_2=$LINENO
 -  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
    test "x$as_lineno_1" != "x$as_lineno_2" &&
 -  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
 -	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
 -	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
 -	     CONFIG_SHELL=$as_dir/$as_base
 -	     export CONFIG_SHELL
 -	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
 -	   fi;;
 -	 esac
 -       done
 -done
 -;;
 -  esac
 +  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
++
 +_ASEOF
 +}; then
 +  break
 +fi
++
 +fi
++
 +      done
++
 +      if test "x$CONFIG_SHELL" != x; then
 +  for as_var in BASH_ENV ENV
 +	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
 +	done
 +	export CONFIG_SHELL
 +	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 +fi
++
++
 +    if test $as_have_required = no; then
 +  echo This script requires a shell more modern than all the
 +      echo shells that I found on your system.  Please install a
 +      echo modern shell, or manually run the script under such a
 +      echo shell if you do have one.
 +      { (exit 1); exit 1; }
 +fi
++
++
 +fi
++
 +fi
++
++
++
 +(eval "as_func_return () {
 +  (exit \$1)
 +}
 +as_func_success () {
 +  as_func_return 0
 +}
 +as_func_failure () {
 +  as_func_return 1
 +}
 +as_func_ret_success () {
 +  return 0
 +}
 +as_func_ret_failure () {
 +  return 1
 +}
++
 +exitcode=0
 +if as_func_success; then
 +  :
 +else
 +  exitcode=1
 +  echo as_func_success failed.
 +fi
++
 +if as_func_failure; then
 +  exitcode=1
 +  echo as_func_failure succeeded.
 +fi
++
 +if as_func_ret_success; then
 +  :
 +else
 +  exitcode=1
 +  echo as_func_ret_success failed.
 +fi
++
 +if as_func_ret_failure; then
 +  exitcode=1
 +  echo as_func_ret_failure succeeded.
 +fi
++
 +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
 +  :
 +else
 +  exitcode=1
 +  echo positional parameters were not saved.
 +fi
++
 +test \$exitcode = 0") || {
 +  echo No shell found that supports shell functions.
 +  echo Please tell bug-autoconf@gnu.org about your system,
 +  echo including any error possibly output before this message.
 +  echo This can help us improve future autoconf versions.
 +  echo Configuration will now proceed without shell functions.
 +}
++
++
++
 +  as_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 before each line; the second 'sed' does the real
 -  # work.  The second script uses 'N' to pair each line-number line
 -  # with the numbered line, and appends trailing '-' during
 -  # substitution so that $LINENO is not a special case at line end.
 +  # 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
 -  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
 -  sed '=' <$as_myself |
 +  # 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
 -      s,$,-,
 -      : loop
 -      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
 +      :loop
 +      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
        t loop
 -      s,-$,,
 -      s,^['$as_cr_digits']*\n,,
 +      s/-\n.*//
      ' >$as_me.lineno &&
 -  chmod +x $as_me.lineno ||
 -    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
 +  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 sensible to this).
 -  . ./$as_me.lineno
 +  # original and so on.  Autoconf is especially sensitive to this).
 +  . "./$as_me.lineno"
    # Exit status is that of the last command.
    exit
+ }
 -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
 -  *c*,-n*) ECHO_N= ECHO_C='
 -' ECHO_T='	' ;;
 -  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
 -  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
 -esac
 +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
 +  as_dirname=dirname
 +else
 +  as_dirname=false
 +fi
 -if expr a : '\(a\)' >/dev/null 2>&1; then
 +ECHO_C= ECHO_N= ECHO_T=
 +case `echo -n x` in
 +-n*)
 +  case `echo 'x\c'` in
 +  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
 +  *)   ECHO_C='\c';;
 +  esac;;
 +*)
 +  ECHO_N='-n';;
 +esac
 +if expr a : '\(a\)' >/dev/null 2>&1 &&
 +   test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
  else
    as_expr=false
  fi
  rm -f conf$$ conf$$.exe conf$$.file
 -echo >conf$$.file
 -if ln -s conf$$.file conf$$ 2>/dev/null; then
 -  # We could just check for DJGPP; but this test a) works b) is more generic
 -  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
 -  if test -f conf$$.exe; then
 -    # Don't use ln at all; we don't have any links
 -    as_ln_s='cp -p'
 -  else
 +if test -d conf$$.dir; then
 +  rm -f conf$$.dir/conf$$.file
 +else
 +  rm -f conf$$.dir
 +  mkdir conf$$.dir 2>/dev/null
 +fi
 +if (echo >conf$$.file) 2>/dev/null; then
 +  if ln -s conf$$.file conf$$ 2>/dev/null; then
      as_ln_s='ln -s'
 +    # ... but there are two gotchas:
 +    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
 +    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
 +    # In both cases, we have to default to `cp -p'.
 +    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
 +      as_ln_s='cp -p'
 +  elif ln conf$$.file conf$$ 2>/dev/null; then
 +    as_ln_s=ln
 +  else
 +    as_ln_s='cp -p'
    fi
 -elif ln conf$$.file conf$$ 2>/dev/null; then
 -  as_ln_s=ln
  else
    as_ln_s='cp -p'
  fi
 -rm -f conf$$ conf$$.exe conf$$.file
 +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 +rmdir conf$$.dir 2>/dev/null
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
@@ -222,7 +540,28 @@ else
    as_mkdir_p=false
  fi
 -as_executable_p="test -f"
 +if test -x / >/dev/null 2>&1; then
 +  as_test_x='test -x'
 +else
 +  if ls -dL / >/dev/null 2>&1; then
 +    as_ls_L_option=L
 +  else
 +    as_ls_L_option=
 +  fi
 +  as_test_x='
 +    eval sh -c '\''
 +      if test -d "$1"; then
 +	test -d "$1/.";
 +      else
 +	case $1 in
 +	-*)set "./$1";;
 +	esac;
 +	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 +	???[sx]*):;;*)false;;esac;fi
 +    '\'' sh
 +  '
 +fi
 +as_executable_p=$as_test_x
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -231,39 +570,27 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 -# IFS
 -# We need space, tab and new line, in precisely that order.
 -as_nl='
 -'
 -IFS=" 	$as_nl"
+-
 -# CDPATH.
 -$as_unset CDPATH
 +exec 7<&0 </dev/null 6>&1
  # Name of the host.
  # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
  # so uname gets run too.
  ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 -exec 6>&1
+-
+ #
  # Initializations.
+ #
  ac_default_prefix=/usr/local
 +ac_clean_files=
  ac_config_libobj_dir=.
 +LIBOBJS=
  cross_compiling=no
  subdirs=
  MFLAGS=
  MAKEFLAGS=
  SHELL=${CONFIG_SHELL-/bin/sh}
 -# Maximum number of lines to put in a shell here document.
 -# This variable seems obsolete.  It should probably be removed, and
 -# only ac_max_sed_lines should be used.
 -: ${ac_max_here_lines=38}
+-
  # Identity of this package.
  PACKAGE_NAME=
  PACKAGE_TARNAME=
@@ -275,46 +602,130 @@ ac_unique_file="interface/interface.c"
  # Factoring default headers for most tests.
  ac_includes_default="\
  #include <stdio.h>
 -#if HAVE_SYS_TYPES_H
 +#ifdef HAVE_SYS_TYPES_H
  # include <sys/types.h>
  #endif
 -#if HAVE_SYS_STAT_H
 +#ifdef HAVE_SYS_STAT_H
  # include <sys/stat.h>
  #endif
 -#if STDC_HEADERS
 +#ifdef STDC_HEADERS
  # include <stdlib.h>
  # include <stddef.h>
  #else
 -# if HAVE_STDLIB_H
 +# ifdef HAVE_STDLIB_H
  #  include <stdlib.h>
  # endif
  #endif
 -#if HAVE_STRING_H
 -# if !STDC_HEADERS && HAVE_MEMORY_H
 +#ifdef HAVE_STRING_H
 +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
  #  include <memory.h>
  # endif
  # include <string.h>
  #endif
 -#if HAVE_STRINGS_H
 +#ifdef HAVE_STRINGS_H
  # include <strings.h>
  #endif
 -#if HAVE_INTTYPES_H
 +#ifdef HAVE_INTTYPES_H
  # include <inttypes.h>
 -#else
 -# if HAVE_STDINT_H
 -#  include <stdint.h>
 -# endif
  #endif
 -#if HAVE_UNISTD_H
 +#ifdef HAVE_STDINT_H
 +# include <stdint.h>
 +#endif
 +#ifdef HAVE_UNISTD_H
  # include <unistd.h>
  #endif"
 -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB AR INSTALL CPP EGREP SET_MAKE SBPCD_H UCDROM_H TYPESIZES OPT DEBUG LIBOBJS LTLIBOBJS'
 +ac_subst_vars='LTLIBOBJS
 +LIBOBJS
 +EXTRA_LIBS
 +EXTRA_OBJS
 +LIBUTIL
 +DEBUG
 +OPT
 +TYPESIZES
 +RAWPART
 +GETOPT_LONG
 +UCDROM_H
 +SBPCD_H
 +SET_MAKE
 +EGREP
 +GREP
 +CPP
 +INSTALL
 +AR
 +RANLIB
 +OBJEXT
 +EXEEXT
 +ac_ct_CC
 +CPPFLAGS
 +LDFLAGS
 +CFLAGS
 +CC
 +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_BUGREPORT
 +PACKAGE_STRING
 +PACKAGE_VERSION
 +PACKAGE_TARNAME
 +PACKAGE_NAME
 +PATH_SEPARATOR
 +SHELL'
  ac_subst_files=''
 +ac_user_opts='
 +enable_option_checking
 +'
 +      ac_precious_vars='build_alias
 +host_alias
 +target_alias
 +CC
 +CFLAGS
 +LDFLAGS
 +LIBS
 +CPPFLAGS
 +CPP'
++
  # Initialize some variables set by options.
  ac_init_help=
  ac_init_version=false
 +ac_unrecognized_opts=
 +ac_unrecognized_sep=
  # The variables have the same names as the options, with
  # dashes changed to underlines.
  cache_file=/dev/null
@@ -337,34 +748,48 @@ x_libraries=NONE
  # and all the variables that are supposed to be based on exec_prefix
  # by default will actually change.
  # Use braces instead of parens because sh, perl, etc. also accept them.
 +# (The list follows the same order as the GNU Coding Standards.)
  bindir='${exec_prefix}/bin'
  sbindir='${exec_prefix}/sbin'
  libexecdir='${exec_prefix}/libexec'
 -datadir='${prefix}/share'
 +datarootdir='${prefix}/share'
 +datadir='${datarootdir}'
  sysconfdir='${prefix}/etc'
  sharedstatedir='${prefix}/com'
  localstatedir='${prefix}/var'
 -libdir='${exec_prefix}/lib'
  includedir='${prefix}/include'
  oldincludedir='/usr/include'
 -infodir='${prefix}/info'
 -mandir='${prefix}/man'
 +docdir='${datarootdir}/doc/${PACKAGE}'
 +infodir='${datarootdir}/info'
 +htmldir='${docdir}'
 +dvidir='${docdir}'
 +pdfdir='${docdir}'
 +psdir='${docdir}'
 +libdir='${exec_prefix}/lib'
 +localedir='${datarootdir}/locale'
 +mandir='${datarootdir}/man'
  ac_prev=
 +ac_dashdash=
  for ac_option
  do
    # If the previous option needs an argument, assign it.
    if test -n "$ac_prev"; then
 -    eval "$ac_prev=\$ac_option"
 +    eval $ac_prev=\$ac_option
      ac_prev=
      continue
    fi
 -  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
 +  case $ac_option in
 +  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
 +  *)	ac_optarg=yes ;;
 +  esac
    # Accept the important Cygnus configure options, so we can diagnose typos.
 -  case $ac_option in
 +  case $ac_dashdash$ac_option in
 +  --)
 +    ac_dashdash=yes ;;
    -bindir | --bindir | --bindi | --bind | --bin | --bi)
      ac_prev=bindir ;;
@@ -386,33 +811,61 @@ do
    --config-cache | -C)
      cache_file=config.cache ;;
 -  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
 +  -datadir | --datadir | --datadi | --datad)
      ac_prev=datadir ;;
 -  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
 -  | --da=*)
 +  -datadir=* | --datadir=* | --datadi=* | --datad=*)
      datadir=$ac_optarg ;;
 +  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
 +  | --dataroo | --dataro | --datar)
 +    ac_prev=datarootdir ;;
 +  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
 +  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
 +    datarootdir=$ac_optarg ;;
++
    -disable-* | --disable-*)
 -    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
 +    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
 -    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
 -      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
 +    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
 +      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
     { (exit 1); exit 1; }; }
 -    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
 -    eval "enable_$ac_feature=no" ;;
 +    ac_useropt_orig=$ac_useropt
 +    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
 +    case $ac_user_opts in
 +      *"
 +"enable_$ac_useropt"
 +"*) ;;
 +      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
 +	 ac_unrecognized_sep=', ';;
 +    esac
 +    eval enable_$ac_useropt=no ;;
++
 +  -docdir | --docdir | --docdi | --doc | --do)
 +    ac_prev=docdir ;;
 +  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
 +    docdir=$ac_optarg ;;
++
 +  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
 +    ac_prev=dvidir ;;
 +  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
 +    dvidir=$ac_optarg ;;
    -enable-* | --enable-*)
 -    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
 +    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
 -    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
 -      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
 +    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
 +      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
     { (exit 1); exit 1; }; }
 -    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
 -    case $ac_option in
 -      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
 -      *) ac_optarg=yes ;;
 +    ac_useropt_orig=$ac_useropt
 +    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
 +    case $ac_user_opts in
 +      *"
 +"enable_$ac_useropt"
 +"*) ;;
 +      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
 +	 ac_unrecognized_sep=', ';;
      esac
 -    eval "enable_$ac_feature='$ac_optarg'" ;;
 +    eval enable_$ac_useropt=\$ac_optarg ;;
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -439,6 +892,12 @@ do
    -host=* | --host=* | --hos=* | --ho=*)
      host_alias=$ac_optarg ;;
 +  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
 +    ac_prev=htmldir ;;
 +  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
 +  | --ht=*)
 +    htmldir=$ac_optarg ;;
++
    -includedir | --includedir | --includedi | --included | --include \
    | --includ | --inclu | --incl | --inc)
      ac_prev=includedir ;;
@@ -463,13 +922,16 @@ do
    | --libexe=* | --libex=* | --libe=*)
      libexecdir=$ac_optarg ;;
 +  -localedir | --localedir | --localedi | --localed | --locale)
 +    ac_prev=localedir ;;
 +  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
 +    localedir=$ac_optarg ;;
++
    -localstatedir | --localstatedir | --localstatedi | --localstated \
 -  | --localstate | --localstat | --localsta | --localst \
 -  | --locals | --local | --loca | --loc | --lo)
 +  | --localstate | --localstat | --localsta | --localst | --locals)
      ac_prev=localstatedir ;;
    -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
 -  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
 -  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
 +  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
      localstatedir=$ac_optarg ;;
    -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
@@ -534,6 +996,16 @@ do
    | --progr-tra=* | --program-tr=* | --program-t=*)
      program_transform_name=$ac_optarg ;;
 +  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
 +    ac_prev=pdfdir ;;
 +  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
 +    pdfdir=$ac_optarg ;;
++
 +  -psdir | --psdir | --psdi | --psd | --ps)
 +    ac_prev=psdir ;;
 +  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
 +    psdir=$ac_optarg ;;
++
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil)
      silent=yes ;;
@@ -584,26 +1056,38 @@ do
      ac_init_version=: ;;
    -with-* | --with-*)
 -    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
 +    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
 -    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
 -      { echo "$as_me: error: invalid package name: $ac_package" >&2
 +    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
 +      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
     { (exit 1); exit 1; }; }
 -    ac_package=`echo $ac_package| sed 's/-/_/g'`
 -    case $ac_option in
 -      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
 -      *) ac_optarg=yes ;;
 +    ac_useropt_orig=$ac_useropt
 +    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
 +    case $ac_user_opts in
 +      *"
 +"with_$ac_useropt"
 +"*) ;;
 +      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
 +	 ac_unrecognized_sep=', ';;
      esac
 -    eval "with_$ac_package='$ac_optarg'" ;;
 +    eval with_$ac_useropt=\$ac_optarg ;;
    -without-* | --without-*)
 -    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
 +    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
      # Reject names that are not valid shell variable names.
 -    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
 -      { echo "$as_me: error: invalid package name: $ac_package" >&2
 +    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
 +      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
     { (exit 1); exit 1; }; }
 -    ac_package=`echo $ac_package | sed 's/-/_/g'`
 -    eval "with_$ac_package=no" ;;
 +    ac_useropt_orig=$ac_useropt
 +    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
 +    case $ac_user_opts in
 +      *"
 +"with_$ac_useropt"
 +"*) ;;
 +      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
 +	 ac_unrecognized_sep=', ';;
 +    esac
 +    eval with_$ac_useropt=no ;;
    --x)
      # Obsolete; use --with-x.
@@ -623,7 +1107,7 @@ do
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
 -  -*) { echo "$as_me: error: unrecognized option: $ac_option
 +  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
  Try \`$0 --help' for more information." >&2
     { (exit 1); exit 1; }; }
      ;;
@@ -632,17 +1116,16 @@ Try \`$0 --help' for more information."
      ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
      # Reject names that are not valid shell variable names.
      expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
 -      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
 +      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
     { (exit 1); exit 1; }; }
 -    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
 -    eval "$ac_envvar='$ac_optarg'"
 +    eval $ac_envvar=\$ac_optarg
      export $ac_envvar ;;
    *)
      # FIXME: should be removed in autoconf 3.0.
 -    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
 +    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
      expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
 -      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
 +      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
      : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
      ;;
@@ -651,31 +1134,39 @@ done
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
 -  { echo "$as_me: error: missing argument to $ac_option" >&2
 +  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
     { (exit 1); exit 1; }; }
  fi
 -# Be sure to have absolute paths.
 -for ac_var in exec_prefix prefix
 -do
 -  eval ac_val=$`echo $ac_var`
 -  case $ac_val in
 -    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
 -    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
 -   { (exit 1); exit 1; }; };;
 +if test -n "$ac_unrecognized_opts"; then
 +  case $enable_option_checking in
 +    no) ;;
 +    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
 +   { (exit 1); exit 1; }; } ;;
 +    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    esac
 -done
 +fi
 -# Be sure to have absolute paths.
 -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
 -	      localstatedir libdir includedir oldincludedir infodir mandir
 +# Check all directory arguments for consistency.
 +for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 +		datadir sysconfdir sharedstatedir localstatedir includedir \
 +		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 +		libdir localedir mandir
  do
 -  eval ac_val=$`echo $ac_var`
 +  eval ac_val=\$$ac_var
 +  # Remove trailing slashes.
    case $ac_val in
 -    [\\/$]* | ?:[\\/]* ) ;;
 -    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
 -   { (exit 1); exit 1; }; };;
 +    */ )
 +      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
 +      eval $ac_var=\$ac_val;;
 +  esac
 +  # Be sure to have absolute directory names.
 +  case $ac_val in
 +    [\\/$]* | ?:[\\/]* )  continue;;
 +    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    esac
 +  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
 +   { (exit 1); exit 1; }; }
  done
  # There might be people who depend on the old broken behavior: `$host'
@@ -689,7 +1180,7 @@ target=$target_alias
  if test "x$host_alias" != x; then
    if test "x$build_alias" = x; then
      cross_compiling=maybe
 -    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
 +    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
      If a cross compiler is detected then cross compile mode will be used." >&2
    elif test "x$build_alias" != "x$host_alias"; then
      cross_compiling=yes
@@ -702,74 +1193,76 @@ test -n "$host_alias" && ac_tool_prefix=
  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
 +   { (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
 +   { (exit 1); exit 1; }; }
++
++
  # Find the source files, if location was not specified.
  if test -z "$srcdir"; then
    ac_srcdir_defaulted=yes
 -  # Try the directory containing this script, then its parent.
 -  ac_confdir=`(dirname "$0") 2>/dev/null ||
 -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 -	 X"$0" : 'X\(//\)[^/]' \| \
 -	 X"$0" : 'X\(//\)$' \| \
 -	 X"$0" : 'X\(/\)' \| \
 -	 .     : '\(.\)' 2>/dev/null ||
 -echo X"$0" |
 -    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
 -  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
 -  	  /^X\(\/\/\)$/{ s//\1/; q; }
 -  	  /^X\(\/\).*/{ s//\1/; q; }
 -  	  s/.*/./; q'`
 +  # Try the directory containing this script, then the parent directory.
 +  ac_confdir=`$as_dirname -- "$as_myself" ||
 +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 +	 X"$as_myself" : 'X\(//\)[^/]' \| \
 +	 X"$as_myself" : 'X\(//\)$' \| \
 +	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
 +$as_echo X"$as_myself" |
 +    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 +	    s//\1/
 +	    q
 +	  }
 +	  /^X\(\/\/\)[^/].*/{
 +	    s//\1/
 +	    q
 +	  }
 +	  /^X\(\/\/\)$/{
 +	    s//\1/
 +	    q
 +	  }
 +	  /^X\(\/\).*/{
 +	    s//\1/
 +	    q
 +	  }
 +	  s/.*/./; q'`
    srcdir=$ac_confdir
 -  if test ! -r $srcdir/$ac_unique_file; then
 +  if test ! -r "$srcdir/$ac_unique_file"; then
      srcdir=..
    fi
  else
    ac_srcdir_defaulted=no
  fi
 -if test ! -r $srcdir/$ac_unique_file; then
 -  if test "$ac_srcdir_defaulted" = yes; then
 -    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
 -   { (exit 1); exit 1; }; }
 -  else
 -    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
 +if test ! -r "$srcdir/$ac_unique_file"; then
 +  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
 +  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
     { (exit 1); exit 1; }; }
 -  fi
  fi
 -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
 -  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
 +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 +ac_abs_confdir=`(
 +	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
     { (exit 1); exit 1; }; }
 -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
 -ac_env_build_alias_set=${build_alias+set}
 -ac_env_build_alias_value=$build_alias
 -ac_cv_env_build_alias_set=${build_alias+set}
 -ac_cv_env_build_alias_value=$build_alias
 -ac_env_host_alias_set=${host_alias+set}
 -ac_env_host_alias_value=$host_alias
 -ac_cv_env_host_alias_set=${host_alias+set}
 -ac_cv_env_host_alias_value=$host_alias
 -ac_env_target_alias_set=${target_alias+set}
 -ac_env_target_alias_value=$target_alias
 -ac_cv_env_target_alias_set=${target_alias+set}
 -ac_cv_env_target_alias_value=$target_alias
 -ac_env_CC_set=${CC+set}
 -ac_env_CC_value=$CC
 -ac_cv_env_CC_set=${CC+set}
 -ac_cv_env_CC_value=$CC
 -ac_env_CFLAGS_set=${CFLAGS+set}
 -ac_env_CFLAGS_value=$CFLAGS
 -ac_cv_env_CFLAGS_set=${CFLAGS+set}
 -ac_cv_env_CFLAGS_value=$CFLAGS
 -ac_env_LDFLAGS_set=${LDFLAGS+set}
 -ac_env_LDFLAGS_value=$LDFLAGS
 -ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
 -ac_cv_env_LDFLAGS_value=$LDFLAGS
 -ac_env_CPPFLAGS_set=${CPPFLAGS+set}
 -ac_env_CPPFLAGS_value=$CPPFLAGS
 -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
 -ac_cv_env_CPPFLAGS_value=$CPPFLAGS
 -ac_env_CPP_set=${CPP+set}
 -ac_env_CPP_value=$CPP
 -ac_cv_env_CPP_set=${CPP+set}
 -ac_cv_env_CPP_value=$CPP
 +	pwd)`
 +# When building in place, set srcdir=.
 +if test "$ac_abs_confdir" = "$ac_pwd"; then
 +  srcdir=.
 +fi
 +# Remove unnecessary trailing slashes from srcdir.
 +# Double slashes in file names in object file debugging info
 +# mess up M-x gdb in Emacs.
 +case $srcdir in
 +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
 +esac
 +for ac_var in $ac_precious_vars; do
 +  eval ac_env_${ac_var}_set=\${${ac_var}+set}
 +  eval ac_env_${ac_var}_value=\$${ac_var}
 +  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
 +  eval ac_cv_env_${ac_var}_value=\$${ac_var}
 +done
+ #
  # Report the --help message.
@@ -798,14 +1291,11 @@ Configuration:
    -n, --no-create         do not create output files
        --srcdir=DIR        find the sources in DIR [configure dir or \`..']
 -_ACEOF
+-
 -  cat <<_ACEOF
  Installation directories:
    --prefix=PREFIX         install architecture-independent files in PREFIX
 -			  [$ac_default_prefix]
 +                          [$ac_default_prefix]
    --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
 -			  [PREFIX]
 +                          [PREFIX]
  By default, \`make install' will install all the files in
  \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -815,18 +1305,25 @@ for instance \`--prefix=\$HOME'.
  For better control, use the options below.
  Fine tuning of the installation directories:
 -  --bindir=DIR           user executables [EPREFIX/bin]
 -  --sbindir=DIR          system admin executables [EPREFIX/sbin]
 -  --libexecdir=DIR       program executables [EPREFIX/libexec]
 -  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
 -  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
 -  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
 -  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
 -  --libdir=DIR           object code libraries [EPREFIX/lib]
 -  --includedir=DIR       C header files [PREFIX/include]
 -  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
 -  --infodir=DIR          info documentation [PREFIX/info]
 -  --mandir=DIR           man documentation [PREFIX/man]
 +  --bindir=DIR            user executables [EPREFIX/bin]
 +  --sbindir=DIR           system admin executables [EPREFIX/sbin]
 +  --libexecdir=DIR        program executables [EPREFIX/libexec]
 +  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
 +  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
 +  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
 +  --libdir=DIR            object code libraries [EPREFIX/lib]
 +  --includedir=DIR        C header files [PREFIX/include]
 +  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
 +  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
 +  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
 +  --infodir=DIR           info documentation [DATAROOTDIR/info]
 +  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
 +  --mandir=DIR            man documentation [DATAROOTDIR/man]
 +  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
 +  --htmldir=DIR           html documentation [DOCDIR]
 +  --dvidir=DIR            dvi documentation [DOCDIR]
 +  --pdfdir=DIR            pdf documentation [DOCDIR]
 +  --psdir=DIR             ps documentation [DOCDIR]
  _ACEOF
    cat <<\_ACEOF
@@ -846,126 +1343,97 @@ Some influential environment variables:
    CFLAGS      C compiler flags
    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
                nonstandard directory <lib dir>
 -  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
 -              headers in a nonstandard directory <include dir>
 +  LIBS        libraries to pass to the linker, e.g. -l<library>
 +  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
 +              you have headers in a nonstandard directory <include dir>
    CPP         C preprocessor
  Use these variables to override the choices made by `configure' or to help
  it to find libraries and programs with nonstandard names/locations.
  _ACEOF
 +ac_status=$?
  fi
  if test "$ac_init_help" = "recursive"; then
    # If there are subdirs, report their specific --help.
 -  ac_popdir=`pwd`
    for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
 -    test -d $ac_dir || continue
 +    test -d "$ac_dir" ||
 +      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
 +      continue
      ac_builddir=.
 -if test "$ac_dir" != .; then
 -  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
 -  # A "../" for each directory in $ac_dir_suffix.
 -  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
 -else
 -  ac_dir_suffix= ac_top_builddir=
 -fi
 +case "$ac_dir" in
 +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 +*)
 +  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
 +  # A ".." for each directory in $ac_dir_suffix.
 +  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
 +  case $ac_top_builddir_sub in
 +  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
 +  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
 +  esac ;;
 +esac
 +ac_abs_top_builddir=$ac_pwd
 +ac_abs_builddir=$ac_pwd$ac_dir_suffix
 +# for backward compatibility:
 +ac_top_builddir=$ac_top_build_prefix
  case $srcdir in
 -  .)  # No --srcdir option.  We are building in place.
 +  .)  # We are building in place.
      ac_srcdir=.
 -    if test -z "$ac_top_builddir"; then
 -       ac_top_srcdir=.
 -    else
 -       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
 -    fi ;;
 -  [\\/]* | ?:[\\/]* )  # Absolute path.
 +    ac_top_srcdir=$ac_top_builddir_sub
 +    ac_abs_top_srcdir=$ac_pwd ;;
 +  [\\/]* | ?:[\\/]* )  # Absolute name.
      ac_srcdir=$srcdir$ac_dir_suffix;
 -    ac_top_srcdir=$srcdir ;;
 -  *) # Relative path.
 -    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
 -    ac_top_srcdir=$ac_top_builddir$srcdir ;;
 -esac
+-
 -# Do not use `cd foo && pwd` to compute absolute paths, because
 -# the directories may not exist.
 -case `pwd` in
 -.) ac_abs_builddir="$ac_dir";;
 -*)
 -  case "$ac_dir" in
 -  .) ac_abs_builddir=`pwd`;;
 -  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
 -  *) ac_abs_builddir=`pwd`/"$ac_dir";;
 -  esac;;
 -esac
 -case $ac_abs_builddir in
 -.) ac_abs_top_builddir=${ac_top_builddir}.;;
 -*)
 -  case ${ac_top_builddir}. in
 -  .) ac_abs_top_builddir=$ac_abs_builddir;;
 -  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
 -  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
 -  esac;;
 -esac
 -case $ac_abs_builddir in
 -.) ac_abs_srcdir=$ac_srcdir;;
 -*)
 -  case $ac_srcdir in
 -  .) ac_abs_srcdir=$ac_abs_builddir;;
 -  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
 -  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
 -  esac;;
 -esac
 -case $ac_abs_builddir in
 -.) ac_abs_top_srcdir=$ac_top_srcdir;;
 -*)
 -  case $ac_top_srcdir in
 -  .) ac_abs_top_srcdir=$ac_abs_builddir;;
 -  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
 -  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
 -  esac;;
 +    ac_top_srcdir=$srcdir
 +    ac_abs_top_srcdir=$srcdir ;;
 +  *) # Relative name.
 +    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
 +    ac_top_srcdir=$ac_top_build_prefix$srcdir
 +    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
  esac
 +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 -    cd $ac_dir
 -    # Check for guested configure; otherwise get Cygnus style configure.
 -    if test -f $ac_srcdir/configure.gnu; then
 -      echo
 -      $SHELL $ac_srcdir/configure.gnu  --help=recursive
 -    elif test -f $ac_srcdir/configure; then
 -      echo
 -      $SHELL $ac_srcdir/configure  --help=recursive
 -    elif test -f $ac_srcdir/configure.ac ||
 -	   test -f $ac_srcdir/configure.in; then
 -      echo
 -      $ac_configure --help
 +    cd "$ac_dir" || { ac_status=$?; continue; }
 +    # Check for guested configure.
 +    if test -f "$ac_srcdir/configure.gnu"; then
 +      echo &&
 +      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
 +    elif test -f "$ac_srcdir/configure"; then
 +      echo &&
 +      $SHELL "$ac_srcdir/configure" --help=recursive
      else
 -      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
 -    fi
 -    cd $ac_popdir
 +      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
 +    fi || ac_status=$?
 +    cd "$ac_pwd" || { ac_status=$?; break; }
    done
  fi
 -test -n "$ac_init_help" && exit 0
 +test -n "$ac_init_help" && exit $ac_status
  if $ac_init_version; then
    cat <<\_ACEOF
 +configure
 +generated by GNU Autoconf 2.63
 -Copyright (C) 2003 Free Software Foundation, Inc.
 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
  _ACEOF
 -  exit 0
 +  exit
  fi
 -exec 5>config.log
 -cat >&5 <<_ACEOF
 +cat >config.log <<_ACEOF
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  It was created by $as_me, which was
 -generated by GNU Autoconf 2.59.  Invocation command line was
 +generated by GNU Autoconf 2.63.  Invocation command line was
    $ $0 $@
  _ACEOF
 +exec 5>>config.log
+ {
  cat <<_ASUNAME
  ## --------- ##
@@ -984,7 +1452,7 @@ uname -v = `(uname -v) 2>/dev/null || ec
  /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
  /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
  /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
 -hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
 +/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
  /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
  /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
  /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
@@ -996,8 +1464,9 @@ for as_dir in $PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
 -  echo "PATH: $as_dir"
 +  $as_echo "PATH: $as_dir"
  done
 +IFS=$as_save_IFS
  } >&5
@@ -1019,7 +1488,6 @@ _ACEOF
  ac_configure_args=
  ac_configure_args0=
  ac_configure_args1=
 -ac_sep=
  ac_must_keep_next=false
  for ac_pass in 1 2
  do
@@ -1030,8 +1498,8 @@ do
      -q | -quiet | --quiet | --quie | --qui | --qu | --q \
      | -silent | --silent | --silen | --sile | --sil)
        continue ;;
 -    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
 -      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
 +    *\'*)
 +      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
 ) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1052,9 +1520,7 @@ do
  	  -* ) ac_must_keep_next=true ;;
  	esac
        fi
 -      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
 -      # Get rid of the leading space.
 -      ac_sep=" "
 +      ac_configure_args="$ac_configure_args '$ac_arg'"
        ;;
      esac
    done
@@ -1065,8 +1531,8 @@ $as_unset ac_configure_args1 || test "${
  # When interrupted or exit'd, cleanup temporary files, and complete
  # config.log.  We remove comments because anyway the quotes in there
  # would cause problems or look ugly.
 -# WARNING: Be sure not to use single quotes in there, as some shells,
 -# such as our DU 5.0 friend, will then `close' the trap.
 +# WARNING: Use '\'' to represent an apostrophe within the trap.
 +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
  trap 'exit_status=$?
    # Save into config.log some information that might help in debugging.
+   {
@@ -1079,20 +1545,35 @@ trap 'exit_status=$?
  _ASBOX
      echo
      # The following way of writing the cache mishandles newlines in values,
 -{
 +(
 +  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
 +    eval ac_val=\$$ac_var
 +    case $ac_val in #(
 +    *${as_nl}*)
 +      case $ac_var in #(
 +      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 +      esac
 +      case $ac_var in #(
 +      _ | IFS | as_nl) ;; #(
 +      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
 +      *) $as_unset $ac_var ;;
 +      esac ;;
 +    esac
 +  done
    (set) 2>&1 |
 -    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
 -    *ac_space=\ *)
 +    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
 +    *${as_nl}ac_space=\ *)
        sed -n \
 -	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
 -	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
 -      ;;
 +	"s/'\''/'\''\\\\'\'''\''/g;
 +	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
 +      ;; #(
      *)
 -      sed -n \
 -	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
 +      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
        ;;
 -    esac;
 -}
 +    esac |
 +    sort
 +)
      echo
      cat <<\_ASBOX
@@ -1103,22 +1584,28 @@ _ASBOX
      echo
      for ac_var in $ac_subst_vars
      do
 -      eval ac_val=$`echo $ac_var`
 -      echo "$ac_var='"'"'$ac_val'"'"'"
 +      eval ac_val=\$$ac_var
 +      case $ac_val in
 +      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 +      esac
 +      $as_echo "$ac_var='\''$ac_val'\''"
      done | sort
      echo
      if test -n "$ac_subst_files"; then
        cat <<\_ASBOX
 -## ------------- ##
 -## Output files. ##
 -## ------------- ##
 +## ------------------- ##
 +## File substitutions. ##
 +## ------------------- ##
  _ASBOX
        echo
        for ac_var in $ac_subst_files
        do
 -	eval ac_val=$`echo $ac_var`
 -	echo "$ac_var='"'"'$ac_val'"'"'"
 +	eval ac_val=\$$ac_var
 +	case $ac_val in
 +	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 +	esac
 +	$as_echo "$ac_var='\''$ac_val'\''"
        done | sort
        echo
      fi
@@ -1130,26 +1617,24 @@ _ASBOX
  ## ----------- ##
  _ASBOX
        echo
 -      sed "/^$/d" confdefs.h | sort
 +      cat confdefs.h
        echo
      fi
      test "$ac_signal" != 0 &&
 -      echo "$as_me: caught signal $ac_signal"
 -    echo "$as_me: exit $exit_status"
 +      $as_echo "$as_me: caught signal $ac_signal"
 +    $as_echo "$as_me: exit $exit_status"
    } >&5
 -  rm -f core *.core &&
 -  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
 +  rm -f core *.core core.conftest.* &&
 +    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
      exit $exit_status
 -     ' 0
 +' 0
  for ac_signal in 1 2 13 15; do
    trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
  done
  ac_signal=0
  # confdefs.h avoids OS command line length limits that DEFS can exceed.
 -rm -rf conftest* confdefs.h
 -# AIX cpp loses on an empty file, so make sure it contains at least a newline.
 -echo >confdefs.h
 +rm -f -r conftest* confdefs.h
  # Predefined preprocessor variables.
@@ -1179,18 +1664,24 @@ _ACEOF
  # Let the site file select an alternate cache file if it wants to.
 -# Prefer explicitly selected file to automatically selected ones.
 -if test -z "$CONFIG_SITE"; then
 -  if test "x$prefix" != xNONE; then
 -    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
 -  else
 -    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
 -  fi
 +# Prefer an explicitly selected file to automatically selected ones.
 +ac_site_file1=NONE
 +ac_site_file2=NONE
 +if test -n "$CONFIG_SITE"; then
 +  ac_site_file1=$CONFIG_SITE
 +elif test "x$prefix" != xNONE; then
 +  ac_site_file1=$prefix/share/config.site
 +  ac_site_file2=$prefix/etc/config.site
 +else
 +  ac_site_file1=$ac_default_prefix/share/config.site
 +  ac_site_file2=$ac_default_prefix/etc/config.site
  fi
 -for ac_site_file in $CONFIG_SITE; do
 +for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 +do
 +  test "x$ac_site_file" = xNONE && continue
    if test -r "$ac_site_file"; then
 -    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
 -echo "$as_me: loading site script $ac_site_file" >&6;}
 +    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
 +$as_echo "$as_me: loading site script $ac_site_file" >&6;}
      sed 's/^/| /' "$ac_site_file" >&5
      . "$ac_site_file"
    fi
@@ -1200,54 +1691,61 @@ if test -r "$cache_file"; then
    # Some versions of bash will fail to source /dev/null (special
    # files actually), so we avoid doing that.
    if test -f "$cache_file"; then
 -    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
 -echo "$as_me: loading cache $cache_file" >&6;}
 +    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
 +$as_echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
 -      [\\/]* | ?:[\\/]* ) . $cache_file;;
 -      *)                      . ./$cache_file;;
 +      [\\/]* | ?:[\\/]* ) . "$cache_file";;
 +      *)                      . "./$cache_file";;
      esac
    fi
  else
 -  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
 -echo "$as_me: creating cache $cache_file" >&6;}
 +  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
 +$as_echo "$as_me: creating cache $cache_file" >&6;}
    >$cache_file
  fi
  # Check that the precious variables saved in the cache have kept the same
  # value.
  ac_cache_corrupted=false
 -for ac_var in `(set) 2>&1 |
 -	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
 +for ac_var in $ac_precious_vars; do
    eval ac_old_set=\$ac_cv_env_${ac_var}_set
    eval ac_new_set=\$ac_env_${ac_var}_set
 -  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
 -  eval ac_new_val="\$ac_env_${ac_var}_value"
 +  eval ac_old_val=\$ac_cv_env_${ac_var}_value
 +  eval ac_new_val=\$ac_env_${ac_var}_value
    case $ac_old_set,$ac_new_set in
      set,)
 -      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
 +      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
        ac_cache_corrupted=: ;;
      ,set)
 -      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
 +      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
        ac_cache_corrupted=: ;;
      ,);;
      *)
        if test "x$ac_old_val" != "x$ac_new_val"; then
 -	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 -	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
 -echo "$as_me:   former value:  $ac_old_val" >&2;}
 -	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
 -echo "$as_me:   current value: $ac_new_val" >&2;}
 -	ac_cache_corrupted=:
 +	# differences in whitespace do not lead to failure.
 +	ac_old_val_w=`echo x $ac_old_val`
 +	ac_new_val_w=`echo x $ac_new_val`
 +	if test "$ac_old_val_w" != "$ac_new_val_w"; then
 +	  { $as_echo "$as_me:$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: 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:   former value:  \`$ac_old_val'" >&2;}
 +	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
 +$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
        fi;;
    esac
    # Pass precious variables to config.status.
    if test "$ac_new_set" = set; then
      case $ac_new_val in
 -    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
 -      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
 +    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
      *) ac_arg=$ac_var=$ac_new_val ;;
      esac
      case " $ac_configure_args " in
@@ -1257,19 +1755,15 @@ echo "$as_me:   current value: $ac_new_v
    fi
  done
  if $ac_cache_corrupted; then
 -  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
 -echo "$as_me: error: changes in the environment can compromise the build" >&2;}
 -  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
 +  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
 +  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
 +$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
     { (exit 1); exit 1; }; }
  fi
 -ac_ext=c
 -ac_cpp='$CPP $CPPFLAGS'
 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
@@ -1286,6 +1780,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 +ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -1293,82 +1792,117 @@ cp $srcdir/configure.guess $srcdir/confi
  cp $srcdir/configure.sub $srcdir/config.sub
  ac_aux_dir=
 -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
 -  if test -f $ac_dir/install-sh; then
 +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
 +  if test -f "$ac_dir/install-sh"; then
      ac_aux_dir=$ac_dir
      ac_install_sh="$ac_aux_dir/install-sh -c"
      break
 -  elif test -f $ac_dir/install.sh; then
 +  elif test -f "$ac_dir/install.sh"; then
      ac_aux_dir=$ac_dir
      ac_install_sh="$ac_aux_dir/install.sh -c"
      break
 -  elif test -f $ac_dir/shtool; then
 +  elif test -f "$ac_dir/shtool"; then
      ac_aux_dir=$ac_dir
      ac_install_sh="$ac_aux_dir/shtool install -c"
      break
    fi
  done
  if test -z "$ac_aux_dir"; then
 -  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
 -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
 +  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
 +$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
     { (exit 1); exit 1; }; }
  fi
 -ac_config_guess="$SHELL $ac_aux_dir/config.guess"
 -ac_config_sub="$SHELL $ac_aux_dir/config.sub"
 -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
++
 +# These three variables are undocumented and unsupported,
 +# and are intended to be withdrawn in a future Autoconf release.
 +# They can cause serious problems if a builder's source tree is in a directory
 +# whose full name contains unusual characters.
 +ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
 +ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
 +ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
++
  # Make sure we can run config.sub.
 -$ac_config_sub sun4 >/dev/null 2>&1 ||
 -  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
 -echo "$as_me: error: cannot run $ac_config_sub" >&2;}
 +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
 +  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
 +$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
     { (exit 1); exit 1; }; }
 -echo "$as_me:$LINENO: checking build system type" >&5
 -echo $ECHO_N "checking build system type... $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking build system type" >&5
 +$as_echo_n "checking build system type... " >&6; }
  if test "${ac_cv_build+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
  else
 -  ac_cv_build_alias=$build_alias
 -test -z "$ac_cv_build_alias" &&
 -  ac_cv_build_alias=`$ac_config_guess`
 -test -z "$ac_cv_build_alias" &&
 -  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
 +  ac_build_alias=$build_alias
 +test "x$ac_build_alias" = x &&
 +  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 +test "x$ac_build_alias" = x &&
 +  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
 +$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
     { (exit 1); exit 1; }; }
 -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
 -  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
 +  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
 +$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
     { (exit 1); exit 1; }; }
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_build" >&5
 -echo "${ECHO_T}$ac_cv_build" >&6
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
 +$as_echo "$ac_cv_build" >&6; }
 +case $ac_cv_build in
 +*-*-*) ;;
 +*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
 +$as_echo "$as_me: error: invalid value of canonical build" >&2;}
 +   { (exit 1); exit 1; }; };;
 +esac
  build=$ac_cv_build
 -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 +ac_save_IFS=$IFS; IFS='-'
 +set x $ac_cv_build
 +shift
 +build_cpu=$1
 +build_vendor=$2
 +shift; shift
 +# Remember, the first character of IFS is used to create $*,
 +# except with old shells:
 +build_os=$*
 +IFS=$ac_save_IFS
 +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 -echo "$as_me:$LINENO: checking host system type" >&5
 -echo $ECHO_N "checking host system type... $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking host system type" >&5
 +$as_echo_n "checking host system type... " >&6; }
  if test "${ac_cv_host+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test "x$host_alias" = x; then
 +  ac_cv_host=$ac_cv_build
  else
 -  ac_cv_host_alias=$host_alias
 -test -z "$ac_cv_host_alias" &&
 -  ac_cv_host_alias=$ac_cv_build_alias
 -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
 -  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
 +  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
 +    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
 +$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
     { (exit 1); exit 1; }; }
 +fi
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_host" >&5
 -echo "${ECHO_T}$ac_cv_host" >&6
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
 +$as_echo "$ac_cv_host" >&6; }
 +case $ac_cv_host in
 +*-*-*) ;;
 +*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
 +$as_echo "$as_me: error: invalid value of canonical host" >&2;}
 +   { (exit 1); exit 1; }; };;
 +esac
  host=$ac_cv_host
 -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 +ac_save_IFS=$IFS; IFS='-'
 +set x $ac_cv_host
 +shift
 +host_cpu=$1
 +host_vendor=$2
 +shift; shift
 +# Remember, the first character of IFS is used to create $*,
 +# except with old shells:
 +host_os=$*
 +IFS=$ac_save_IFS
 +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
@@ -1381,10 +1915,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_CC+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1395,34 +1929,36 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}gcc"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
  done
 +IFS=$as_save_IFS
  fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
 -  echo "$as_me:$LINENO: result: $CC" >&5
 -echo "${ECHO_T}$CC" >&6
 +  { $as_echo "$as_me:$LINENO: result: $CC" >&5
 +$as_echo "$CC" >&6; }
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
 +  { $as_echo "$as_me:$LINENO: result: no" >&5
 +$as_echo "no" >&6; }
  fi
++
  fi
  if test -z "$ac_cv_prog_CC"; then
    ac_ct_CC=$CC
    # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -1433,38 +1969,49 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="gcc"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
  done
 +IFS=$as_save_IFS
  fi
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
 -  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 -echo "${ECHO_T}$ac_ct_CC" >&6
 +  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 +$as_echo "$ac_ct_CC" >&6; }
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
 +  { $as_echo "$as_me:$LINENO: result: no" >&5
 +$as_echo "no" >&6; }
  fi
 -  CC=$ac_ct_CC
 +  if test "x$ac_ct_CC" = x; then
 +    CC=""
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
 +    CC=$ac_ct_CC
 +  fi
  else
    CC="$ac_cv_prog_CC"
  fi
  if test -z "$CC"; then
 -  if test -n "$ac_tool_prefix"; then
 -  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 +          if test -n "$ac_tool_prefix"; then
 +    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}cc; ac_word=$2
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_CC+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1475,76 +2022,36 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}cc"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
  done
 +IFS=$as_save_IFS
  fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
 -  echo "$as_me:$LINENO: result: $CC" >&5
 -echo "${ECHO_T}$CC" >&6
 -else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
 -fi
+-
 -fi
 -if test -z "$ac_cv_prog_CC"; then
 -  ac_ct_CC=$CC
 -  # Extract the first word of "cc", so it can be a program name with args.
 -set dummy cc; ac_word=$2
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -  if test -n "$ac_ct_CC"; then
 -  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 -else
 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 -for as_dir in $PATH
 -do
 -  IFS=$as_save_IFS
 -  test -z "$as_dir" && as_dir=.
 -  for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 -    ac_cv_prog_ac_ct_CC="cc"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
 -done
+-
 -fi
 -fi
 -ac_ct_CC=$ac_cv_prog_ac_ct_CC
 -if test -n "$ac_ct_CC"; then
 -  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 -echo "${ECHO_T}$ac_ct_CC" >&6
 +  { $as_echo "$as_me:$LINENO: result: $CC" >&5
 +$as_echo "$CC" >&6; }
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
 +  { $as_echo "$as_me:$LINENO: result: no" >&5
 +$as_echo "no" >&6; }
  fi
 -  CC=$ac_ct_CC
 -else
 -  CC="$ac_cv_prog_CC"
 -fi
 +  fi
  fi
  if test -z "$CC"; then
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_CC+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1556,17 +2063,18 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
       fi
      ac_cv_prog_CC="cc"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
  done
 +IFS=$as_save_IFS
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
@@ -1584,24 +2092,25 @@ fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
 -  echo "$as_me:$LINENO: result: $CC" >&5
 -echo "${ECHO_T}$CC" >&6
 +  { $as_echo "$as_me:$LINENO: result: $CC" >&5
 +$as_echo "$CC" >&6; }
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
 +  { $as_echo "$as_me:$LINENO: result: no" >&5
 +$as_echo "no" >&6; }
  fi
++
  fi
  if test -z "$CC"; then
    if test -n "$ac_tool_prefix"; then
 -  for ac_prog in cl
 +  for ac_prog in cl.exe
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_CC+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1612,38 +2121,40 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
  done
 +IFS=$as_save_IFS
  fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
 -  echo "$as_me:$LINENO: result: $CC" >&5
 -echo "${ECHO_T}$CC" >&6
 +  { $as_echo "$as_me:$LINENO: result: $CC" >&5
 +$as_echo "$CC" >&6; }
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
 +  { $as_echo "$as_me:$LINENO: result: no" >&5
 +$as_echo "no" >&6; }
  fi
++
      test -n "$CC" && break
    done
  fi
  if test -z "$CC"; then
    ac_ct_CC=$CC
 -  for ac_prog in cl
 +  for ac_prog in cl.exe
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -1654,58 +2165,90 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="$ac_prog"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
  done
 +IFS=$as_save_IFS
  fi
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
 -  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 -echo "${ECHO_T}$ac_ct_CC" >&6
 +  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 +$as_echo "$ac_ct_CC" >&6; }
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
 +  { $as_echo "$as_me:$LINENO: result: no" >&5
 +$as_echo "no" >&6; }
  fi
++
    test -n "$ac_ct_CC" && break
  done
 -  CC=$ac_ct_CC
 +  if test "x$ac_ct_CC" = x; then
 +    CC=""
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
 +    CC=$ac_ct_CC
 +  fi
  fi
  fi
 -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
  See \`config.log' for more details." >&5
 -echo "$as_me: error: no acceptable C compiler found in \$PATH
 +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
 +   { (exit 1); exit 1; }; }; }
  # Provide some information about the compiler.
 -echo "$as_me:$LINENO:" \
 -     "checking for C compiler version" >&5
 -ac_compiler=`set X $ac_compile; echo $2`
 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
 -  (eval $ac_compiler --version </dev/null >&5) 2>&5
 +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
 +set X $ac_compile
 +ac_compiler=$2
 +{ (ac_try="$ac_compiler --version >&5"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_compiler --version >&5") 2>&5
    ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
 -  (eval $ac_compiler -v </dev/null >&5) 2>&5
 +{ (ac_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=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
 -  (eval $ac_compiler -V </dev/null >&5) 2>&5
 +{ (ac_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=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
  cat >conftest.$ac_ext <<_ACEOF
@@ -1724,111 +2267,150 @@ main ()
+ }
  _ACEOF
  ac_clean_files_save=$ac_clean_files
 -ac_clean_files="$ac_clean_files a.out a.exe b.out"
 +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
 -echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
 -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
 -  (eval $ac_link_default) 2>&5
 +{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
 +$as_echo_n "checking for C compiler default output file name... " >&6; }
 +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
++
 +# The possible output files:
 +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
++
 +ac_rmfiles=
 +for ac_file in $ac_files
 +do
 +  case $ac_file in
 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
 +    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
 +  esac
 +done
 +rm -f $ac_rmfiles
++
 +if { (ac_try="$ac_link_default"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_link_default") 2>&5
    ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -  # Find the output, starting from the most likely.  This scheme is
 -# not robust to junk in `.', hence go to wildcards (a.*) only as a last
 -# resort.
+-
 -# Be careful to initialize this variable, since it used to be cached.
 -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
 -ac_cv_exeext=
 -# b.out is created by i960 compilers.
 -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
 +  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 +# in a Makefile.  We should not override ac_cv_exeext if it was cached,
 +# so that the user can short-circuit this test for compilers unknown to
 +# Autoconf.
 +for ac_file in $ac_files ''
  do
    test -f "$ac_file" || continue
    case $ac_file in
 -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
 -	;;
 -    conftest.$ac_ext )
 -	# This is the source file.
 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
  	;;
      [ab].out )
  	# We found the default executable, but exeext='' is most
  	# certainly right.
  	break;;
      *.* )
 -	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 -	# FIXME: I believe we export ac_cv_exeext for Libtool,
 -	# but it would be cool to find out if it's true.  Does anybody
 -	# maintain Libtool? --akim.
 -	export ac_cv_exeext
 +        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 +	then :; else
 +	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 +	fi
 +	# We set ac_cv_exeext here because the later test for it is not
 +	# safe: cross compilers may not add the suffix if given an `-o'
 +	# argument, so we may need to know it at that point already.
 +	# Even if this section looks crufty: it has the advantage of
 +	# actually working.
  	break;;
      * )
  	break;;
    esac
  done
 +test "$ac_cv_exeext" = no && ac_cv_exeext=
++
  else
 -  echo "$as_me: failed program was:" >&5
 +  ac_file=''
 +fi
++
 +{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
 +$as_echo "$ac_file" >&6; }
 +if test -z "$ac_file"; then
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
 +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
  See \`config.log' for more details." >&5
 -echo "$as_me: error: C compiler cannot create executables
 +$as_echo "$as_me: error: C compiler cannot create executables
  See \`config.log' for more details." >&2;}
 -   { (exit 77); exit 77; }; }
 +   { (exit 77); exit 77; }; }; }
  fi
  ac_exeext=$ac_cv_exeext
 -echo "$as_me:$LINENO: result: $ac_file" >&5
 -echo "${ECHO_T}$ac_file" >&6
 -# Check the compiler produces executables we can run.  If not, either
 +# Check that the compiler produces executables we can run.  If not, either
  # the compiler is broken, or we cross compile.
 -echo "$as_me:$LINENO: checking whether the C compiler works" >&5
 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 +{ $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'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_try") 2>&5
    ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  $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
 -	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
 +	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
  If you meant to cross compile, use \`--host'.
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run C compiled programs.
 +$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; }; }
 +   { (exit 1); exit 1; }; }; }
      fi
    fi
  fi
 -echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
 +{ $as_echo "$as_me:$LINENO: result: yes" >&5
 +$as_echo "yes" >&6; }
 -rm -f a.out a.exe conftest$ac_cv_exeext b.out
 +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
  ac_clean_files=$ac_clean_files_save
 -# Check the compiler produces executables we can run.  If not, either
 +# Check that the compiler produces executables we can run.  If not, either
  # the compiler is broken, or we cross compile.
 -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
 -echo "$as_me:$LINENO: result: $cross_compiling" >&5
 -echo "${ECHO_T}$cross_compiling" >&6
+-
 -echo "$as_me:$LINENO: checking for suffix of executables" >&5
 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 +{ $as_echo "$as_me:$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"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) 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=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    # If both `conftest.exe' and `conftest' are `present' (well, observable)
  # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -1837,32 +2419,33 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
  for ac_file in conftest.exe conftest conftest.*; do
    test -f "$ac_file" || continue
    case $ac_file in
 -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
      *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 -	  export ac_cv_exeext
  	  break;;
      * ) break;;
    esac
  done
  else
 -  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 +  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 +$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
 +   { (exit 1); exit 1; }; }; }
  fi
  rm -f conftest$ac_cv_exeext
 -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
 -echo "${ECHO_T}$ac_cv_exeext" >&6
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
 +$as_echo "$ac_cv_exeext" >&6; }
  rm -f conftest.$ac_ext
  EXEEXT=$ac_cv_exeext
  ac_exeext=$EXEEXT
 -echo "$as_me:$LINENO: checking for suffix of object files" >&5
 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
 +$as_echo_n "checking for suffix of object files... " >&6; }
  if test "${ac_cv_objext+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@ -1880,39 +2463,48 @@ main ()
+ }
  _ACEOF
  rm -f conftest.o conftest.obj
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +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>&5
    ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
 +  for ac_file in conftest.o conftest.obj conftest.*; do
 +  test -f "$ac_file" || continue;
    case $ac_file in
 -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
         break;;
    esac
  done
  else
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute suffix of object files: cannot compile
 +$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
 +   { (exit 1); exit 1; }; }; }
  fi
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
 -echo "${ECHO_T}$ac_cv_objext" >&6
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
 +$as_echo "$ac_cv_objext" >&6; }
  OBJEXT=$ac_cv_objext
  ac_objext=$OBJEXT
 -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@ -1933,50 +2525,54 @@ main ()
+ }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  $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
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
 -ac_compiler_gnu=no
 +	ac_compiler_gnu=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  ac_cv_c_compiler_gnu=$ac_compiler_gnu
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 -GCC=`test $ac_compiler_gnu = yes && echo yes`
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
 +$as_echo "$ac_cv_c_compiler_gnu" >&6; }
 +if test $ac_compiler_gnu = yes; then
 +  GCC=yes
 +else
 +  GCC=
 +fi
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
 -CFLAGS="-g"
 -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
 +$as_echo_n "checking whether $CC accepts -g... " >&6; }
  if test "${ac_cv_prog_cc_g+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 +  ac_save_c_werror_flag=$ac_c_werror_flag
 +   ac_c_werror_flag=yes
 +   ac_cv_prog_cc_g=no
 +   CFLAGS="-g"
 +   cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
@@ -1992,38 +2588,121 @@ main ()
+ }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 +  $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
++
 +	CFLAGS=""
 +      cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
++
 +int
 +main ()
 +{
++
 +  ;
 +  return 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=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 +  grep -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
 +	 CFLAGS="-g"
 +	 cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
++
 +int
 +main ()
 +{
++
 +  ;
 +  return 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=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  grep -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
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
 -ac_cv_prog_cc_g=no
++
 +fi
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +   ac_c_werror_flag=$ac_save_c_werror_flag
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
 +$as_echo "$ac_cv_prog_cc_g" >&6; }
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
@@ -2039,12 +2718,12 @@ else
      CFLAGS=
    fi
  fi
 -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 -if test "${ac_cv_prog_cc_stdc+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 +if test "${ac_cv_prog_cc_c89+set}" = set; then
 +  $as_echo_n "(cached) " >&6
  else
 -  ac_cv_prog_cc_stdc=no
 +  ac_cv_prog_cc_c89=no
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@ -2078,12 +2757,17 @@ static char *f (char * (*g) (char **, in
  /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
     function prototypes and stuff, but not '\xHH' hex character constants.
     These don't provoke an error unfortunately, instead are silently treated
 -   as 'x'.  The following induces an error, until -std1 is added to get
 +   as 'x'.  The following induces an error, until -std is added to get
     proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
     array size at least.  It's necessary to write '\x00'==0 to get something
 -   that's true only with -std1.  */
 +   that's true only with -std.  */
  int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
 +   inside strings and character constants.  */
 +#define FOO(x) 'x'
 +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
++
  int test (int i, double x);
  struct s1 {int (*f) (int a);};
  struct s2 {int (*f) (double a);};
@@ -2098,219 +2782,72 @@ return f (e, argv, 0) != argv[0]  ||  f
    return 0;
+ }
  _ACEOF
 -# Don't try gcc -ansi; that turns off useful extensions and
 -# breaks some systems' header files.
 -# AIX			-qlanglvl=ansi
 -# Ultrix and OSF/1	-std1
 -# HP-UX 10.20 and later	-Ae
 -# HP-UX older versions	-Aa -D_HPUX_SOURCE
 -# SVR4			-Xc -D__EXTENSIONS__
 -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
 +	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  do
    CC="$ac_save_CC $ac_arg"
    rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_prog_cc_stdc=$ac_arg
 -break
 +  $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
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
++
  fi
 -rm -f conftest.err conftest.$ac_objext
++
 +rm -f core conftest.err conftest.$ac_objext
 +  test "x$ac_cv_prog_cc_c89" != "xno" && break
  done
 -rm -f conftest.$ac_ext conftest.$ac_objext
 +rm -f conftest.$ac_ext
  CC=$ac_save_CC
  fi
+-
 -case "x$ac_cv_prog_cc_stdc" in
 -  x|xno)
 -    echo "$as_me:$LINENO: result: none needed" >&5
 -echo "${ECHO_T}none needed" >&6 ;;
 +# AC_CACHE_VAL
 +case "x$ac_cv_prog_cc_c89" in
 +  x)
 +    { $as_echo "$as_me:$LINENO: result: none needed" >&5
 +$as_echo "none needed" >&6; } ;;
 +  xno)
 +    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
 +$as_echo "unsupported" >&6; } ;;
    *)
 -    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
 -    CC="$CC $ac_cv_prog_cc_stdc" ;;
 +    CC="$CC $ac_cv_prog_cc_c89"
 +    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
  esac
 -# Some people use a C++ compiler to compile C.  Since we use `exit',
 -# in C++ we need to declare it.  In case someone uses the same compiler
 -# for both compiling C and C++ we need to have the C++ compiler decide
 -# the declaration of exit, since it's the most demanding environment.
 -cat >conftest.$ac_ext <<_ACEOF
 -#ifndef __cplusplus
 -  choke me
 -#endif
 -_ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  for ac_declaration in \
 -   '' \
 -   'extern "C" void std::exit (int) throw (); using std::exit;' \
 -   'extern "C" void std::exit (int); using std::exit;' \
 -   'extern "C" void exit (int) throw ();' \
 -   'extern "C" void exit (int);' \
 -   'void exit (int);'
 -do
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -$ac_declaration
 -#include <stdlib.h>
 -int
 -main ()
 -{
 -exit (42);
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  :
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
 -continue
 -fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -$ac_declaration
 -int
 -main ()
 -{
 -exit (42);
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  break
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
 -fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -done
 -rm -f conftest*
 -if test -n "$ac_declaration"; then
 -  echo '#ifdef __cplusplus' >>confdefs.h
 -  echo $ac_declaration      >>confdefs.h
 -  echo '#endif'             >>confdefs.h
 -fi
+-
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
 -fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -ac_ext=c
 -ac_cpp='$CPP $CPPFLAGS'
 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
 +ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
  fi
  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
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_RANLIB+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$RANLIB"; then
    ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -2321,34 +2858,36 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
  done
 +IFS=$as_save_IFS
  fi
  fi
  RANLIB=$ac_cv_prog_RANLIB
  if test -n "$RANLIB"; then
 -  echo "$as_me:$LINENO: result: $RANLIB" >&5
 -echo "${ECHO_T}$RANLIB" >&6
 +  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
 +$as_echo "$RANLIB" >&6; }
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
 +  { $as_echo "$as_me:$LINENO: result: no" >&5
 +$as_echo "no" >&6; }
  fi
++
  fi
  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
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ $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_RANLIB+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_RANLIB"; then
    ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -2359,37 +2898,47 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_RANLIB="ranlib"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
  done
 +IFS=$as_save_IFS
 -  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
  fi
  fi
  ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
  if test -n "$ac_ct_RANLIB"; then
 -  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
 -echo "${ECHO_T}$ac_ct_RANLIB" >&6
 +  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
 +$as_echo "$ac_ct_RANLIB" >&6; }
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
 +  { $as_echo "$as_me:$LINENO: result: no" >&5
 +$as_echo "no" >&6; }
  fi
 -  RANLIB=$ac_ct_RANLIB
 +  if test "x$ac_ct_RANLIB" = x; then
 +    RANLIB=":"
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
 +    RANLIB=$ac_ct_RANLIB
 +  fi
  else
    RANLIB="$ac_cv_prog_RANLIB"
  fi
  # Extract the first word of "ar", so it can be a program name with args.
  set dummy ar; ac_word=$2
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_AR+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$AR"; then
    ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -2400,31 +2949,33 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_AR="ar"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
  done
 +IFS=$as_save_IFS
  fi
  fi
  AR=$ac_cv_prog_AR
  if test -n "$AR"; then
 -  echo "$as_me:$LINENO: result: $AR" >&5
 -echo "${ECHO_T}$AR" >&6
 +  { $as_echo "$as_me:$LINENO: result: $AR" >&5
 +$as_echo "$AR" >&6; }
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
 +  { $as_echo "$as_me:$LINENO: result: no" >&5
 +$as_echo "no" >&6; }
  fi
++
  # Extract the first word of "install", so it can be a program name with args.
  set dummy install; ac_word=$2
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_INSTALL+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$INSTALL"; then
    ac_cv_prog_INSTALL="$INSTALL" # Let the user override the test.
@@ -2435,26 +2986,39 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_INSTALL="install"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
  done
 +IFS=$as_save_IFS
  fi
  fi
  INSTALL=$ac_cv_prog_INSTALL
  if test -n "$INSTALL"; then
 -  echo "$as_me:$LINENO: result: $INSTALL" >&5
 -echo "${ECHO_T}$INSTALL" >&6
 +  { $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
 +$as_echo "$INSTALL" >&6; }
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
 +  { $as_echo "$as_me:$LINENO: result: no" >&5
 +$as_echo "no" >&6; }
  fi
++
 +case $host in
 +*-*-darwin*)
 +  EXTRA_OBJS=osx_interface.o
 +  EXTRA_LIBS=-framework CoreFoundation -framework IOKit
 +  ;;
 +*)
 +  EXTRA_OBJS="cooked_interface.o scsi_interface.o"
 +  EXTRA_LIBS=
 +  ;;
 +esac
++
  if test -z "$GCC"; then
  	DEBUG="-g"
  	OPT="-O"
@@ -2463,6 +3027,12 @@ else
  	i?86-*-linux*)
  		DEBUG="-g -Wall -fsigned-char"
  		OPT="-O2 -ffast-math -fsigned-char -finline-functions";;
 +	i?86-*-netbsd*)
 +		DEBUG="-g -Wall -fsigned-char"
 +		OPT="-O2 -ffast-math -fsigned-char -finline-functions";;
 +	*-netbsd*)
 +		DEBUG="-g -Wall"
 +		OPT="-O";;
  	*)
  		DEBUG="-g -Wall -fsigned-char"
  		OPT="-O2 -fsigned-char";;
@@ -2475,15 +3045,15 @@ ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
 -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
 +$as_echo_n "checking how to run the C preprocessor... " >&6; }
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
  fi
  if test -z "$CPP"; then
    if test "${ac_cv_prog_CPP+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
  else
        # Double quotes because CPP needs to be expanded
      for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -2510,35 +3080,35 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  		     Syntax error
  _ACEOF
 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } >/dev/null; then
 -  if test -s conftest.err; then
 -    ac_cpp_err=$ac_c_preproc_warn_flag
 -    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
 -  else
 -    ac_cpp_err=
 -  fi
 -else
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
 +  $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
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
    # Broken: fails on valid input.
  continue
  fi
++
  rm -f conftest.err conftest.$ac_ext
 -  # OK, works on sane cases.  Now check whether non-existent headers
 +  # OK, works on sane cases.  Now check whether nonexistent headers
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@ -2548,34 +3118,34 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } >/dev/null; then
 -  if test -s conftest.err; then
 -    ac_cpp_err=$ac_c_preproc_warn_flag
 -    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
 -  else
 -    ac_cpp_err=
 -  fi
 -else
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
 +  $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
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
    # Passes both tests.
  ac_preproc_ok=:
  break
  fi
++
  rm -f conftest.err conftest.$ac_ext
  done
@@ -2593,8 +3163,8 @@ fi
  else
    ac_cv_prog_CPP=$CPP
  fi
 -echo "$as_me:$LINENO: result: $CPP" >&5
 -echo "${ECHO_T}$CPP" >&6
 +{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
 +$as_echo "$CPP" >&6; }
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
@@ -2617,35 +3187,35 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  		     Syntax error
  _ACEOF
 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } >/dev/null; then
 -  if test -s conftest.err; then
 -    ac_cpp_err=$ac_c_preproc_warn_flag
 -    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
 -  else
 -    ac_cpp_err=
 -  fi
 -else
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
 +  $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
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
    # Broken: fails on valid input.
  continue
  fi
++
  rm -f conftest.err conftest.$ac_ext
 -  # OK, works on sane cases.  Now check whether non-existent headers
 +  # OK, works on sane cases.  Now check whether nonexistent headers
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@ -2655,34 +3225,34 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } >/dev/null; then
 -  if test -s conftest.err; then
 -    ac_cpp_err=$ac_c_preproc_warn_flag
 -    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
 -  else
 -    ac_cpp_err=
 -  fi
 -else
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
 +  $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
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
    # Passes both tests.
  ac_preproc_ok=:
  break
  fi
++
  rm -f conftest.err conftest.$ac_ext
  done
@@ -2691,11 +3261,13 @@ rm -f conftest.err conftest.$ac_ext
  if $ac_preproc_ok; then
+   :
  else
 -  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 +  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
  See \`config.log' for more details." >&5
 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 +$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
 +   { (exit 1); exit 1; }; }; }
  fi
  ac_ext=c
@@ -2705,25 +3277,144 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
 -echo "$as_me:$LINENO: checking for egrep" >&5
 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6
 -if test "${ac_cv_prog_egrep+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
 -    then ac_cv_prog_egrep='grep -E'
 -    else ac_cv_prog_egrep='egrep'
 +{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 +if test "${ac_cv_path_GREP+set}" = set; then
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -z "$GREP"; then
 +  ac_path_GREP_found=false
 +  # Loop through the user's path and test for each of PROGNAME-LIST
 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_prog in grep ggrep; do
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
 +      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
 +# Check for GNU ac_path_GREP and select it if it is found.
 +  # Check for GNU $ac_path_GREP
 +case `"$ac_path_GREP" --version 2>&1` in
 +*GNU*)
 +  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 +*)
 +  ac_count=0
 +  $as_echo_n 0123456789 >"conftest.in"
 +  while :
 +  do
 +    cat "conftest.in" "conftest.in" >"conftest.tmp"
 +    mv "conftest.tmp" "conftest.in"
 +    cp "conftest.in" "conftest.nl"
 +    $as_echo 'GREP' >> "conftest.nl"
 +    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
 +    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
 +    ac_count=`expr $ac_count + 1`
 +    if test $ac_count -gt ${ac_path_GREP_max-0}; then
 +      # Best one so far, save it but keep looking for a better one
 +      ac_cv_path_GREP="$ac_path_GREP"
 +      ac_path_GREP_max=$ac_count
 +    fi
 +    # 10*(2^10) chars as input seems more than enough
 +    test $ac_count -gt 10 && break
 +  done
 +  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 +esac
++
 +      $ac_path_GREP_found && break 3
 +    done
 +  done
 +done
 +IFS=$as_save_IFS
 +  if test -z "$ac_cv_path_GREP"; then
 +    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
 +$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
 +   { (exit 1); exit 1; }; }
 +  fi
 +else
 +  ac_cv_path_GREP=$GREP
 +fi
++
 +fi
 +{ $as_echo "$as_me:$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_n "checking for egrep... " >&6; }
 +if test "${ac_cv_path_EGREP+set}" = set; then
 +  $as_echo_n "(cached) " >&6
 +else
 +  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
 +   then ac_cv_path_EGREP="$GREP -E"
 +   else
 +     if test -z "$EGREP"; then
 +  ac_path_EGREP_found=false
 +  # Loop through the user's path and test for each of PROGNAME-LIST
 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_prog in egrep; do
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
 +      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
 +# Check for GNU ac_path_EGREP and select it if it is found.
 +  # Check for GNU $ac_path_EGREP
 +case `"$ac_path_EGREP" --version 2>&1` in
 +*GNU*)
 +  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 +*)
 +  ac_count=0
 +  $as_echo_n 0123456789 >"conftest.in"
 +  while :
 +  do
 +    cat "conftest.in" "conftest.in" >"conftest.tmp"
 +    mv "conftest.tmp" "conftest.in"
 +    cp "conftest.in" "conftest.nl"
 +    $as_echo 'EGREP' >> "conftest.nl"
 +    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
 +    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
 +    ac_count=`expr $ac_count + 1`
 +    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
 +      # Best one so far, save it but keep looking for a better one
 +      ac_cv_path_EGREP="$ac_path_EGREP"
 +      ac_path_EGREP_max=$ac_count
      fi
 +    # 10*(2^10) chars as input seems more than enough
 +    test $ac_count -gt 10 && break
 +  done
 +  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 +esac
++
 +      $ac_path_EGREP_found && break 3
 +    done
 +  done
 +done
 +IFS=$as_save_IFS
 +  if test -z "$ac_cv_path_EGREP"; then
 +    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
 +$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
 +   { (exit 1); exit 1; }; }
 +  fi
 +else
 +  ac_cv_path_EGREP=$EGREP
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6
 - EGREP=$ac_cv_prog_egrep
++
 +   fi
 +fi
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
 +$as_echo "$ac_cv_path_EGREP" >&6; }
 + EGREP="$ac_cv_path_EGREP"
 -echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 +$as_echo_n "checking for ANSI C header files... " >&6; }
  if test "${ac_cv_header_stdc+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@ -2745,35 +3436,32 @@ main ()
+ }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  $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
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
 -ac_cv_header_stdc=no
 +	ac_cv_header_stdc=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
@@ -2829,6 +3517,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
 +#include <stdlib.h>
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
@@ -2848,36 +3537,50 @@ main ()
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
 -      exit(2);
 -  exit (0);
 +      return 2;
 +  return 0;
+ }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 +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=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) 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=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
+   :
  else
 -  echo "$as_me: program exited with status $ac_status" >&5
 -echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: program exited with status $ac_status" >&5
 +$as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +rm -rf conftest.dSYM
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
++
++
  fi
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
 -echo "${ECHO_T}$ac_cv_header_stdc" >&6
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
 +$as_echo "$ac_cv_header_stdc" >&6; }
  if test $ac_cv_header_stdc = yes; then
  cat >>confdefs.h <<\_ACEOF
@@ -2900,11 +3603,11 @@ fi
  for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
  		  inttypes.h stdint.h unistd.h
  do
 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -echo "$as_me:$LINENO: checking for $ac_header" >&5
 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 +$as_echo_n "checking for $ac_header... " >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@ -2917,41 +3620,42 @@ $ac_includes_default
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  $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
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
 -eval "$as_ac_Header=no"
 +	eval "$as_ac_Header=no"
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
 +ac_res=`eval 'as_val=${'$as_ac_Header'}
 +		 $as_echo "$as_val"'`
 +	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
 +as_val=`eval 'as_val=${'$as_ac_Header'}
 +		 $as_echo "$as_val"'`
 +   if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  fi
@@ -2959,73 +3663,15 @@ fi
  done
 -echo "$as_me:$LINENO: checking for short" >&5
 -echo $ECHO_N "checking for short... $ECHO_C" >&6
 -if test "${ac_cv_type_short+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -$ac_includes_default
 -int
 -main ()
 -{
 -if ((short *) 0)
 -  return 0;
 -if (sizeof (short))
 -  return 0;
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_type_short=yes
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_type_short=no
 -fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
 -echo "${ECHO_T}$ac_cv_type_short" >&6
+-
 -echo "$as_me:$LINENO: checking size of short" >&5
 -echo $ECHO_N "checking size of short... $ECHO_C" >&6
 +# The cast to long int works around a bug in the HP C Compiler
 +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 +# This bug is HP SR number 8606223364.
 +{ $as_echo "$as_me:$LINENO: checking size of short" >&5
 +$as_echo_n "checking size of short... " >&6; }
  if test "${ac_cv_sizeof_short+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
  else
 -  if test "$ac_cv_type_short" = yes; then
 -  # The cast to unsigned long works around a bug in the HP C Compiler
 -  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 -  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 -  # This bug is HP SR number 8606223364.
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
@@ -3038,7 +3684,7 @@ $ac_includes_default
  int
  main ()
+ {
 -static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= 0)];
  test_array [0] = 0
+   ;
@@ -3046,27 +3692,23 @@ test_array [0] = 0
+ }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  $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
@@ -3079,7 +3721,7 @@ $ac_includes_default
  int
  main ()
+ {
 -static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
  test_array [0] = 0
+   ;
@@ -3087,46 +3729,43 @@ test_array [0] = 0
+ }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  $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
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
 -ac_lo=`expr $ac_mid + 1`
 -		    if test $ac_lo -le $ac_mid; then
 -		      ac_lo= ac_hi=
 -		      break
 -		    fi
 -		    ac_mid=`expr 2 '*' $ac_mid + 1`
 +	ac_lo=`expr $ac_mid + 1`
 +			if test $ac_lo -le $ac_mid; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
 -cat >conftest.$ac_ext <<_ACEOF
 +	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
@@ -3136,7 +3775,7 @@ $ac_includes_default
  int
  main ()
+ {
 -static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (short))) < 0)];
  test_array [0] = 0
+   ;
@@ -3144,27 +3783,23 @@ test_array [0] = 0
+ }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  $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
@@ -3177,7 +3812,7 @@ $ac_includes_default
  int
  main ()
+ {
 -static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= $ac_mid)];
  test_array [0] = 0
+   ;
@@ -3185,50 +3820,49 @@ test_array [0] = 0
+ }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  $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
 -  echo "$as_me: failed program was:" >&5
 +  $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`
 +	ac_hi=`expr '(' $ac_mid ')' - 1`
 +			if test $ac_mid -le $ac_hi; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid`
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
 -ac_lo= ac_hi=
 +	ac_lo= ac_hi=
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  # 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`
@@ -3242,7 +3876,7 @@ $ac_includes_default
  int
  main ()
+ {
 -static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
  test_array [0] = 0
+   ;
@@ -3250,52 +3884,48 @@ test_array [0] = 0
+ }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  $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
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
 -ac_lo=`expr '(' $ac_mid ')' + 1`
 +	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
  ?*) ac_cv_sizeof_short=$ac_lo;;
 -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
 +'') if test "$ac_cv_type_short" = yes; then
 +     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (short), 77
 +$as_echo "$as_me: error: cannot compute sizeof (short)
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; } ;;
 +   { (exit 77); exit 77; }; }; }
 +   else
 +     ac_cv_sizeof_short=0
 +   fi ;;
  esac
  else
 -  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
 -else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@ -3303,8 +3933,8 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
 -long longval () { return (long) (sizeof (short)); }
 -unsigned long ulongval () { return (long) (sizeof (short)); }
 +static long int longval () { return (long int) (sizeof (short)); }
 +static unsigned long int ulongval () { return (long int) (sizeof (short)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
@@ -3313,133 +3943,94 @@ main ()
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
 -    exit (1);
 -  if (((long) (sizeof (short))) < 0)
 +    return 1;
 +  if (((long int) (sizeof (short))) < 0)
+     {
 -      long i = longval ();
 -      if (i != ((long) (sizeof (short))))
 -	exit (1);
 -      fprintf (f, "%ld\n", i);
 +      long int i = longval ();
 +      if (i != ((long int) (sizeof (short))))
 +	return 1;
 +      fprintf (f, "%ld", i);
+     }
    else
+     {
 -      unsigned long i = ulongval ();
 -      if (i != ((long) (sizeof (short))))
 -	exit (1);
 -      fprintf (f, "%lu\n", i);
 +      unsigned long int i = ulongval ();
 +      if (i != ((long int) (sizeof (short))))
 +	return 1;
 +      fprintf (f, "%lu", i);
+     }
 -  exit (ferror (f) || fclose (f) != 0);
 +  /* 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 { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 +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=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) 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=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sizeof_short=`cat conftest.val`
  else
 -  echo "$as_me: program exited with status $ac_status" >&5
 -echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: program exited with status $ac_status" >&5
 +$as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  ( exit $ac_status )
 -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
 +if test "$ac_cv_type_short" = yes; then
 +     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (short), 77
 +$as_echo "$as_me: error: cannot compute sizeof (short)
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
 -fi
 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +   { (exit 77); exit 77; }; }; }
 +   else
 +     ac_cv_sizeof_short=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
 -else
 -  ac_cv_sizeof_short=0
 -fi
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_short" >&6
 -cat >>confdefs.h <<_ACEOF
 -#define SIZEOF_SHORT $ac_cv_sizeof_short
 -_ACEOF
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
 +$as_echo "$ac_cv_sizeof_short" >&6; }
 -echo "$as_me:$LINENO: checking for int" >&5
 -echo $ECHO_N "checking for int... $ECHO_C" >&6
 -if test "${ac_cv_type_int+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -$ac_includes_default
 -int
 -main ()
 -{
 -if ((int *) 0)
 -  return 0;
 -if (sizeof (int))
 -  return 0;
 -  ;
 -  return 0;
 -}
++
 +cat >>confdefs.h <<_ACEOF
 +#define SIZEOF_SHORT $ac_cv_sizeof_short
  _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_type_int=yes
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -ac_cv_type_int=no
 -fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
 -echo "${ECHO_T}$ac_cv_type_int" >&6
 -echo "$as_me:$LINENO: checking size of int" >&5
 -echo $ECHO_N "checking size of int... $ECHO_C" >&6
 +# The cast to long int works around a bug in the HP C Compiler
 +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 +# This bug is HP SR number 8606223364.
 +{ $as_echo "$as_me:$LINENO: checking size of int" >&5
 +$as_echo_n "checking size of int... " >&6; }
  if test "${ac_cv_sizeof_int+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
  else
 -  if test "$ac_cv_type_int" = yes; then
 -  # The cast to unsigned long works around a bug in the HP C Compiler
 -  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 -  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 -  # This bug is HP SR number 8606223364.
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
@@ -3452,7 +4043,7 @@ $ac_includes_default
  int
  main ()
+ {
 -static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)];
  test_array [0] = 0
+   ;
@@ -3460,27 +4051,23 @@ test_array [0] = 0
+ }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  $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
@@ -3493,7 +4080,7 @@ $ac_includes_default
  int
  main ()
+ {
 -static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
  test_array [0] = 0
+   ;
@@ -3501,46 +4088,43 @@ test_array [0] = 0
+ }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  $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
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
 -ac_lo=`expr $ac_mid + 1`
 -		    if test $ac_lo -le $ac_mid; then
 -		      ac_lo= ac_hi=
 -		      break
 -		    fi
 -		    ac_mid=`expr 2 '*' $ac_mid + 1`
 +	ac_lo=`expr $ac_mid + 1`
 +			if test $ac_lo -le $ac_mid; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
 -cat >conftest.$ac_ext <<_ACEOF
 +	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
@@ -3550,7 +4134,7 @@ $ac_includes_default
  int
  main ()
+ {
 -static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)];
  test_array [0] = 0
+   ;
@@ -3558,27 +4142,23 @@ test_array [0] = 0
+ }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  $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
@@ -3591,7 +4171,7 @@ $ac_includes_default
  int
  main ()
+ {
 -static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)];
  test_array [0] = 0
+   ;
@@ -3599,50 +4179,49 @@ test_array [0] = 0
+ }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  $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
 -  echo "$as_me: failed program was:" >&5
 +  $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`
 +	ac_hi=`expr '(' $ac_mid ')' - 1`
 +			if test $ac_mid -le $ac_hi; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid`
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
 -ac_lo= ac_hi=
 +	ac_lo= ac_hi=
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  # 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`
@@ -3656,7 +4235,7 @@ $ac_includes_default
  int
  main ()
+ {
 -static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
  test_array [0] = 0
+   ;
@@ -3664,52 +4243,48 @@ test_array [0] = 0
+ }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  $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
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
 -ac_lo=`expr '(' $ac_mid ')' + 1`
 +	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
  ?*) ac_cv_sizeof_int=$ac_lo;;
 -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
 +'') if test "$ac_cv_type_int" = yes; then
 +     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (int), 77
 +$as_echo "$as_me: error: cannot compute sizeof (int)
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; } ;;
 +   { (exit 77); exit 77; }; }; }
 +   else
 +     ac_cv_sizeof_int=0
 +   fi ;;
  esac
  else
 -  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
 -else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@ -3717,8 +4292,8 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
 -long longval () { return (long) (sizeof (int)); }
 -unsigned long ulongval () { return (long) (sizeof (int)); }
 +static long int longval () { return (long int) (sizeof (int)); }
 +static unsigned long int ulongval () { return (long int) (sizeof (int)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
@@ -3727,133 +4302,94 @@ main ()
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
 -    exit (1);
 -  if (((long) (sizeof (int))) < 0)
 +    return 1;
 +  if (((long int) (sizeof (int))) < 0)
+     {
 -      long i = longval ();
 -      if (i != ((long) (sizeof (int))))
 -	exit (1);
 -      fprintf (f, "%ld\n", i);
 +      long int i = longval ();
 +      if (i != ((long int) (sizeof (int))))
 +	return 1;
 +      fprintf (f, "%ld", i);
+     }
    else
+     {
 -      unsigned long i = ulongval ();
 -      if (i != ((long) (sizeof (int))))
 -	exit (1);
 -      fprintf (f, "%lu\n", i);
 +      unsigned long int i = ulongval ();
 +      if (i != ((long int) (sizeof (int))))
 +	return 1;
 +      fprintf (f, "%lu", i);
+     }
 -  exit (ferror (f) || fclose (f) != 0);
 +  /* 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 { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 +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=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) 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=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sizeof_int=`cat conftest.val`
  else
 -  echo "$as_me: program exited with status $ac_status" >&5
 -echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: program exited with status $ac_status" >&5
 +$as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  ( exit $ac_status )
 -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
 +if test "$ac_cv_type_int" = yes; then
 +     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (int), 77
 +$as_echo "$as_me: error: cannot compute sizeof (int)
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
 -fi
 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +   { (exit 77); exit 77; }; }; }
 +   else
 +     ac_cv_sizeof_int=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
 -else
 -  ac_cv_sizeof_int=0
 -fi
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_int" >&6
 -cat >>confdefs.h <<_ACEOF
 -#define SIZEOF_INT $ac_cv_sizeof_int
 -_ACEOF
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
 +$as_echo "$ac_cv_sizeof_int" >&6; }
 -echo "$as_me:$LINENO: checking for long" >&5
 -echo $ECHO_N "checking for long... $ECHO_C" >&6
 -if test "${ac_cv_type_long+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -$ac_includes_default
 -int
 -main ()
 -{
 -if ((long *) 0)
 -  return 0;
 -if (sizeof (long))
 -  return 0;
 -  ;
 -  return 0;
 -}
++
 +cat >>confdefs.h <<_ACEOF
 +#define SIZEOF_INT $ac_cv_sizeof_int
  _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_type_long=yes
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -ac_cv_type_long=no
 -fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
 -echo "${ECHO_T}$ac_cv_type_long" >&6
 -echo "$as_me:$LINENO: checking size of long" >&5
 -echo $ECHO_N "checking size of long... $ECHO_C" >&6
 +# The cast to long int works around a bug in the HP C Compiler
 +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 +# This bug is HP SR number 8606223364.
 +{ $as_echo "$as_me:$LINENO: checking size of long" >&5
 +$as_echo_n "checking size of long... " >&6; }
  if test "${ac_cv_sizeof_long+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
  else
 -  if test "$ac_cv_type_long" = yes; then
 -  # The cast to unsigned long works around a bug in the HP C Compiler
 -  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 -  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 -  # This bug is HP SR number 8606223364.
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
@@ -3866,7 +4402,7 @@ $ac_includes_default
  int
  main ()
+ {
 -static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
  test_array [0] = 0
+   ;
@@ -3874,27 +4410,23 @@ test_array [0] = 0
+ }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  $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
@@ -3907,7 +4439,7 @@ $ac_includes_default
  int
  main ()
+ {
 -static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
  test_array [0] = 0
+   ;
@@ -3915,46 +4447,43 @@ test_array [0] = 0
+ }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  $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
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
 -ac_lo=`expr $ac_mid + 1`
 -		    if test $ac_lo -le $ac_mid; then
 -		      ac_lo= ac_hi=
 -		      break
 -		    fi
 -		    ac_mid=`expr 2 '*' $ac_mid + 1`
 +	ac_lo=`expr $ac_mid + 1`
 +			if test $ac_lo -le $ac_mid; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
 -cat >conftest.$ac_ext <<_ACEOF
 +	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
@@ -3964,7 +4493,7 @@ $ac_includes_default
  int
  main ()
+ {
 -static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
  test_array [0] = 0
+   ;
@@ -3972,27 +4501,23 @@ test_array [0] = 0
+ }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  $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
@@ -4005,7 +4530,7 @@ $ac_includes_default
  int
  main ()
+ {
 -static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
  test_array [0] = 0
+   ;
@@ -4013,50 +4538,49 @@ test_array [0] = 0
+ }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  $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
 -  echo "$as_me: failed program was:" >&5
 +  $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`
 +	ac_hi=`expr '(' $ac_mid ')' - 1`
 +			if test $ac_mid -le $ac_hi; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid`
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
 -ac_lo= ac_hi=
 +	ac_lo= ac_hi=
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  # 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`
@@ -4070,7 +4594,7 @@ $ac_includes_default
  int
  main ()
+ {
 -static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
  test_array [0] = 0
+   ;
@@ -4078,52 +4602,48 @@ test_array [0] = 0
+ }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  $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
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
 -ac_lo=`expr '(' $ac_mid ')' + 1`
 +	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
  ?*) ac_cv_sizeof_long=$ac_lo;;
 -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
 +'') if test "$ac_cv_type_long" = yes; then
 +     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (long), 77
 +$as_echo "$as_me: error: cannot compute sizeof (long)
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; } ;;
 +   { (exit 77); exit 77; }; }; }
 +   else
 +     ac_cv_sizeof_long=0
 +   fi ;;
  esac
  else
 -  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
 -else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@ -4131,8 +4651,8 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
 -long longval () { return (long) (sizeof (long)); }
 -unsigned long ulongval () { return (long) (sizeof (long)); }
 +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
@@ -4141,133 +4661,94 @@ main ()
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
 -    exit (1);
 -  if (((long) (sizeof (long))) < 0)
 +    return 1;
 +  if (((long int) (sizeof (long))) < 0)
+     {
 -      long i = longval ();
 -      if (i != ((long) (sizeof (long))))
 -	exit (1);
 -      fprintf (f, "%ld\n", i);
 +      long int i = longval ();
 +      if (i != ((long int) (sizeof (long))))
 +	return 1;
 +      fprintf (f, "%ld", i);
+     }
    else
+     {
 -      unsigned long i = ulongval ();
 -      if (i != ((long) (sizeof (long))))
 -	exit (1);
 -      fprintf (f, "%lu\n", i);
 +      unsigned long int i = ulongval ();
 +      if (i != ((long int) (sizeof (long))))
 +	return 1;
 +      fprintf (f, "%lu", i);
+     }
 -  exit (ferror (f) || fclose (f) != 0);
 +  /* 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 { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 +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=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) 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=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sizeof_long=`cat conftest.val`
  else
 -  echo "$as_me: program exited with status $ac_status" >&5
 -echo "$as_me: failed program was:" >&5
 +  $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 )
 -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
 +if test "$ac_cv_type_long" = yes; then
 +     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (long), 77
 +$as_echo "$as_me: error: cannot compute sizeof (long)
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
 -fi
 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +   { (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
 -else
 -  ac_cv_sizeof_long=0
 -fi
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_long" >&6
 -cat >>confdefs.h <<_ACEOF
 -#define SIZEOF_LONG $ac_cv_sizeof_long
 -_ACEOF
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
 +$as_echo "$ac_cv_sizeof_long" >&6; }
 -echo "$as_me:$LINENO: checking for long long" >&5
 -echo $ECHO_N "checking for long long... $ECHO_C" >&6
 -if test "${ac_cv_type_long_long+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -$ac_includes_default
 -int
 -main ()
 -{
 -if ((long long *) 0)
 -  return 0;
 -if (sizeof (long long))
 -  return 0;
 -  ;
 -  return 0;
 -}
++
 +cat >>confdefs.h <<_ACEOF
 +#define SIZEOF_LONG $ac_cv_sizeof_long
  _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_type_long_long=yes
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -ac_cv_type_long_long=no
 -fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
 -echo "${ECHO_T}$ac_cv_type_long_long" >&6
 -echo "$as_me:$LINENO: checking size of long long" >&5
 -echo $ECHO_N "checking size of long long... $ECHO_C" >&6
 +# The cast to long int works around a bug in the HP C Compiler
 +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 +# This bug is HP SR number 8606223364.
 +{ $as_echo "$as_me:$LINENO: checking size of long long" >&5
 +$as_echo_n "checking size of long long... " >&6; }
  if test "${ac_cv_sizeof_long_long+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
  else
 -  if test "$ac_cv_type_long_long" = yes; then
 -  # The cast to unsigned long works around a bug in the HP C Compiler
 -  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 -  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 -  # This bug is HP SR number 8606223364.
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
@@ -4280,7 +4761,7 @@ $ac_includes_default
  int
  main ()
+ {
 -static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= 0)];
  test_array [0] = 0
+   ;
@@ -4288,27 +4769,23 @@ test_array [0] = 0
+ }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  $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
@@ -4321,7 +4798,7 @@ $ac_includes_default
  int
  main ()
+ {
 -static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
  test_array [0] = 0
+   ;
@@ -4329,46 +4806,43 @@ test_array [0] = 0
+ }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  $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
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
 -ac_lo=`expr $ac_mid + 1`
 -		    if test $ac_lo -le $ac_mid; then
 -		      ac_lo= ac_hi=
 -		      break
 -		    fi
 -		    ac_mid=`expr 2 '*' $ac_mid + 1`
 +	ac_lo=`expr $ac_mid + 1`
 +			if test $ac_lo -le $ac_mid; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
 -cat >conftest.$ac_ext <<_ACEOF
 +	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
@@ -4378,7 +4852,7 @@ $ac_includes_default
  int
  main ()
+ {
 -static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (long long))) < 0)];
  test_array [0] = 0
+   ;
@@ -4386,27 +4860,23 @@ test_array [0] = 0
+ }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  $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
@@ -4419,7 +4889,7 @@ $ac_includes_default
  int
  main ()
+ {
 -static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= $ac_mid)];
  test_array [0] = 0
+   ;
@@ -4427,50 +4897,49 @@ test_array [0] = 0
+ }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  $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
 -  echo "$as_me: failed program was:" >&5
 +  $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`
 +	ac_hi=`expr '(' $ac_mid ')' - 1`
 +			if test $ac_mid -le $ac_hi; then
 +			  ac_lo= ac_hi=
 +			  break
 +			fi
 +			ac_mid=`expr 2 '*' $ac_mid`
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
 -ac_lo= ac_hi=
 +	ac_lo= ac_hi=
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  # 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`
@@ -4484,7 +4953,7 @@ $ac_includes_default
  int
  main ()
+ {
 -static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
 +static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
  test_array [0] = 0
+   ;
@@ -4492,52 +4961,48 @@ test_array [0] = 0
+ }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  $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
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
 -ac_lo=`expr '(' $ac_mid ')' + 1`
 +	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
  ?*) ac_cv_sizeof_long_long=$ac_lo;;
 -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
 +'') if test "$ac_cv_type_long_long" = yes; then
 +     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (long long), 77
 +$as_echo "$as_me: error: cannot compute sizeof (long long)
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; } ;;
 +   { (exit 77); exit 77; }; }; }
 +   else
 +     ac_cv_sizeof_long_long=0
 +   fi ;;
  esac
  else
 -  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
 -else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@ -4545,8 +5010,8 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
 -long longval () { return (long) (sizeof (long long)); }
 -unsigned long ulongval () { return (long) (sizeof (long long)); }
 +static long int longval () { return (long int) (sizeof (long long)); }
 +static unsigned long int ulongval () { return (long int) (sizeof (long long)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
@@ -4555,61 +5020,80 @@ main ()
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
 -    exit (1);
 -  if (((long) (sizeof (long long))) < 0)
 +    return 1;
 +  if (((long int) (sizeof (long long))) < 0)
+     {
 -      long i = longval ();
 -      if (i != ((long) (sizeof (long long))))
 -	exit (1);
 -      fprintf (f, "%ld\n", i);
 +      long int i = longval ();
 +      if (i != ((long int) (sizeof (long long))))
 +	return 1;
 +      fprintf (f, "%ld", i);
+     }
    else
+     {
 -      unsigned long i = ulongval ();
 -      if (i != ((long) (sizeof (long long))))
 -	exit (1);
 -      fprintf (f, "%lu\n", i);
 +      unsigned long int i = ulongval ();
 +      if (i != ((long int) (sizeof (long long))))
 +	return 1;
 +      fprintf (f, "%lu", i);
+     }
 -  exit (ferror (f) || fclose (f) != 0);
 +  /* 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 { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 +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=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) 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=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sizeof_long_long=`cat conftest.val`
  else
 -  echo "$as_me: program exited with status $ac_status" >&5
 -echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: program exited with status $ac_status" >&5
 +$as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  ( exit $ac_status )
 -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
 +if test "$ac_cv_type_long_long" = yes; then
 +     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (long long), 77
 +$as_echo "$as_me: error: cannot compute sizeof (long long)
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
 -fi
 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +   { (exit 77); exit 77; }; }; }
 +   else
 +     ac_cv_sizeof_long_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
 -else
 -  ac_cv_sizeof_long_long=0
 -fi
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
 +$as_echo "$ac_cv_sizeof_long_long" >&6; }
++
++
++
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
  _ACEOF
@@ -4627,12 +5111,13 @@ case 4 in
  	$ac_cv_sizeof_long) SIZE32="long";;
  esac
 -echo "$as_me:$LINENO: checking for int16_t" >&5
 -echo $ECHO_N "checking for int16_t... $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking for int16_t" >&5
 +$as_echo_n "checking for int16_t... " >&6; }
  if test "${ac_cv_type_int16_t+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 +  ac_cv_type_int16_t=no
 +cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
@@ -4642,57 +5127,95 @@ $ac_includes_default
  int
  main ()
+ {
 -if ((int16_t *) 0)
 -  return 0;
  if (sizeof (int16_t))
 -  return 0;
 +       return 0;
+   ;
    return 0;
+ }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 +  $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 ((int16_t)))
 +	  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=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_type_int16_t=yes
 +  grep -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_int16_t=yes
 +fi
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  else
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
 -ac_cv_type_int16_t=no
++
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_type_int16_t" >&5
 -echo "${ECHO_T}$ac_cv_type_int16_t" >&6
 -if test $ac_cv_type_int16_t = yes; then
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int16_t" >&5
 +$as_echo "$ac_cv_type_int16_t" >&6; }
 +if test "x$ac_cv_type_int16_t" = x""yes; then
    SIZE16="int16_t"
  fi
 -echo "$as_me:$LINENO: checking for int32_t" >&5
 -echo $ECHO_N "checking for int32_t... $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking for int32_t" >&5
 +$as_echo_n "checking for int32_t... " >&6; }
  if test "${ac_cv_type_int32_t+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 +  ac_cv_type_int32_t=no
 +cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
@@ -4702,79 +5225,118 @@ $ac_includes_default
  int
  main ()
+ {
 -if ((int32_t *) 0)
 -  return 0;
  if (sizeof (int32_t))
 -  return 0;
 +       return 0;
+   ;
    return 0;
+ }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 +  $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 ((int32_t)))
 +	  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=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_type_int32_t=yes
 +  grep -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_int32_t=yes
 +fi
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  else
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
 -ac_cv_type_int32_t=no
++
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5
 -echo "${ECHO_T}$ac_cv_type_int32_t" >&6
 -if test $ac_cv_type_int32_t = yes; then
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5
 +$as_echo "$ac_cv_type_int32_t" >&6; }
 +if test "x$ac_cv_type_int32_t" = x""yes; then
    SIZE32="size32_t"
  fi
  if test -z "$SIZE16"; then
 -	{ { echo "$as_me:$LINENO: error: No 16 bit type found on this platform!" >&5
 -echo "$as_me: error: No 16 bit type found on this platform!" >&2;}
 +	{ { $as_echo "$as_me:$LINENO: error: No 16 bit type found on this platform!" >&5
 +$as_echo "$as_me: error: No 16 bit type found on this platform!" >&2;}
     { (exit 1); exit 1; }; }
  fi
  if test -z "$SIZE32"; then
 -	{ { echo "$as_me:$LINENO: error: No 32 bit type found on this platform!" >&5
 -echo "$as_me: error: No 32 bit type found on this platform!" >&2;}
 +	{ { $as_echo "$as_me:$LINENO: error: No 32 bit type found on this platform!" >&5
 +$as_echo "$as_me: error: No 32 bit type found on this platform!" >&2;}
     { (exit 1); exit 1; }; }
  fi
  for ac_header in linux/sbpcd.h
  do
 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
 -  echo "$as_me:$LINENO: checking for $ac_header" >&5
 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 +$as_echo_n "checking for $ac_header... " >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  $as_echo_n "(cached) " >&6
 +fi
 +ac_res=`eval 'as_val=${'$as_ac_Header'}
 +		 $as_echo "$as_val"'`
 +	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
  else
    # Is the header compilable?
 -echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +$as_echo_n "checking $ac_header usability... " >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@ -4785,41 +5347,38 @@ $ac_includes_default
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
    ac_header_compiler=yes
  else
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
 -ac_header_compiler=no
 +	ac_header_compiler=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -echo "${ECHO_T}$ac_header_compiler" >&6
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +$as_echo "$ac_header_compiler" >&6; }
  # Is the header present?
 -echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +$as_echo_n "checking $ac_header presence... " >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@ -4828,81 +5387,78 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } >/dev/null; then
 -  if test -s conftest.err; then
 -    ac_cpp_err=$ac_c_preproc_warn_flag
 -    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
 -  else
 -    ac_cpp_err=
 -  fi
 -else
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } >/dev/null && {
 +	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       }; then
    ac_header_preproc=yes
  else
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
    ac_header_preproc=no
  fi
++
  rm -f conftest.err conftest.$ac_ext
 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -echo "${ECHO_T}$ac_header_preproc" >&6
 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +$as_echo "$ac_header_preproc" >&6; }
-+case $host in
+ # So?  What about this header?
-+*-*-darwin*)
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  EXTRA_OBJS=osx_interface.o
+   yes:no: )
-+  EXTRA_LIBS="-framework CoreFoundation -framework IOKit"
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+  ;;
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+*)
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+  EXTRA_OBJS="cooked_interface.o scsi_interface.o"
+-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+  EXTRA_LIBS=
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+  ;;
++$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
 +    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
      ac_header_preproc=yes
      ;;
    no:yes:* )
 -    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 -echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 -echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 -    (
 -      cat <<\_ASBOX
 -## ------------------------------------------ ##
 -## Report this to the AC_PACKAGE_NAME lists.  ##
 -## ------------------------------------------ ##
 -_ASBOX
 -    ) |
 -      sed "s/^/$as_me: WARNING:     /" >&2
 +    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
 +    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 +$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
 +    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
 +    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 +$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
 +    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
 +    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++
      ;;
  esac
 -echo "$as_me:$LINENO: checking for $ac_header" >&5
 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 +$as_echo_n "checking for $ac_header... " >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  $as_echo_n "(cached) " >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval 'as_val=${'$as_ac_Header'}
 +		 $as_echo "$as_val"'`
 +	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
  fi
 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
 +as_val=`eval 'as_val=${'$as_ac_Header'}
 +		 $as_echo "$as_val"'`
 +   if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
   SBPCD_H="-DSBPCD_H='1' "
  fi
@@ -4912,19 +5468,21 @@ done
  for ac_header in linux/ucdrom.h
  do
 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
 -  echo "$as_me:$LINENO: checking for $ac_header" >&5
 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 +$as_echo_n "checking for $ac_header... " >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  $as_echo_n "(cached) " >&6
 +fi
 +ac_res=`eval 'as_val=${'$as_ac_Header'}
 +		 $as_echo "$as_val"'`
 +	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
  else
    # Is the header compilable?
 -echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +$as_echo_n "checking $ac_header usability... " >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@ -4935,41 +5493,38 @@ $ac_includes_default
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
    ac_header_compiler=yes
  else
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
- if test -z "$GCC"; then
+-ac_header_compiler=no
- 	DEBUG="-g"
++	ac_header_compiler=no
@@ -893,6 +903,12 @@ else
  	i?86-*-linux*)
  		DEBUG="-g -Wall -fsigned-char"
  		OPT="-O20 -ffast-math -fsigned-char -finline-functions";;
 +	i?86-*-netbsd*)
 +		DEBUG="-g -Wall -fsigned-char"
 +		OPT="-O2 -ffast-math -fsigned-char -finline-functions";;
 +	*-netbsd*)
 +		DEBUG="-g -Wall"
 +		OPT="-O";;
  	*)
  		DEBUG="-g -Wall -fsigned-char"
  		OPT="-O20 -fsigned-char";;
@@ -1084,7 +1100,6 @@ EOF
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -echo "${ECHO_T}$ac_header_compiler" >&6
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +$as_echo "$ac_header_compiler" >&6; }
  # Is the header present?
 -echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +$as_echo_n "checking $ac_header presence... " >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@ -4978,81 +5533,78 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } >/dev/null; then
 -  if test -s conftest.err; then
 -    ac_cpp_err=$ac_c_preproc_warn_flag
 -    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
 -  else
 -    ac_cpp_err=
 -  fi
 -else
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } >/dev/null && {
 +	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       }; then
    ac_header_preproc=yes
  else
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
--CFLAGS=""
+   ac_header_preproc=no
  fi
++
  rm -f conftest.err conftest.$ac_ext
 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -echo "${ECHO_T}$ac_header_preproc" >&6
 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +$as_echo "$ac_header_preproc" >&6; }
- TYPESIZES=""
+ # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
    yes:no: )
 -    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
 +    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
 +    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
      ac_header_preproc=yes
      ;;
    no:yes:* )
 -    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 -echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 -echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 -    (
 -      cat <<\_ASBOX
 -## ------------------------------------------ ##
 -## Report this to the AC_PACKAGE_NAME lists.  ##
 -## ------------------------------------------ ##
 -_ASBOX
 -    ) |
 -      sed "s/^/$as_me: WARNING:     /" >&2
 +    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
 +    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 +$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
 +    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
 +    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 +$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
 +    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
 +    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++
      ;;
  esac
 -echo "$as_me:$LINENO: checking for $ac_header" >&5
 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 +$as_echo_n "checking for $ac_header... " >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  $as_echo_n "(cached) " >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +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; }
@@ -1476,6 +1491,143 @@ else
  fi
 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
 +as_val=`eval 'as_val=${'$as_ac_Header'}
 +		 $as_echo "$as_val"'`
 +   if test "x$as_val" = x""yes; then
    cat >>confdefs.h <<_ACEOF
 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
   UCDROM_H="-DUCDROM_H='1' "
  fi
@@ -5060,39 +5612,359 @@ fi
  done
 +for ac_hdr in util.h
 -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
 -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +for ac_header in util.h
 +do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+echo "configure:1489: checking for $ac_hdr" >&5
++  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++$as_echo_n "checking for $ac_header... " >&6; }
-+  echo $ac_n "(cached) $ac_c" 1>&6
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  $as_echo_n "(cached) " >&6
 +fi
 +ac_res=`eval 'as_val=${'$as_ac_Header'}
 +		 $as_echo "$as_val"'`
 +	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
  else
 -  cat >conftest.make <<\_ACEOF
 -all:
 -	@echo 'ac_maketemp="$(MAKE)"'
 +  # Is the header compilable?
 +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +$as_echo_n "checking $ac_header usability... " >&6; }
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
  _ACEOF
 -# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
 -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
 -if test -n "$ac_maketemp"; then
 -  eval ac_cv_prog_make_${ac_make}_set=yes
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +$ac_includes_default
 +#include <$ac_header>
 +_ACEOF
 +rm -f conftest.$ac_objext
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_compile") 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
 +  ac_header_compiler=yes
 +else
-+  cat > conftest.$ac_ext <<EOF
++  $as_echo "$as_me: failed program was:" >&5
-+#line 1494 "configure"
++sed 's/^/| /' conftest.$ac_ext >&5
 +#include "confdefs.h"
-+#include <$ac_hdr>
++	ac_header_compiler=no
-+EOF
++fi
 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:1499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+if test -z "$ac_err"; then
++$as_echo "$ac_header_compiler" >&6; }
 +  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=yes"
++# Is the header present?
 +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +$as_echo_n "checking $ac_header presence... " >&6; }
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +#include <$ac_header>
 +_ACEOF
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } >/dev/null && {
 +	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       }; then
 +  ac_header_preproc=yes
 +else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
++
 +  ac_header_preproc=no
 +fi
++
 +rm -f conftest.err conftest.$ac_ext
 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +$as_echo "$ac_header_preproc" >&6; }
++
 +# So?  What about this header?
 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 +  yes:no: )
 +    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
 +    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
 +    ac_header_preproc=yes
 +    ;;
 +  no:yes:* )
 +    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
 +    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 +$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
 +    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
 +    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 +$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
 +    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
 +    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++
 +    ;;
 +esac
 +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 +$as_echo_n "checking for $ac_header... " >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  $as_echo_n "(cached) " >&6
 +else
-+  echo "$ac_err" >&5
++  eval "$as_ac_Header=\$ac_header_preproc"
 +  echo "configure: failed program was:" >&5
 +  cat conftest.$ac_ext >&5
 +  rm -rf conftest*
 +  eval "ac_cv_header_$ac_safe=no"
 +fi
-+rm -f conftest*
++ac_res=`eval 'as_val=${'$as_ac_Header'}
 +		 $as_echo "$as_val"'`
 +	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
++
 +fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++as_val=`eval 'as_val=${'$as_ac_Header'}
-+  echo "$ac_t""yes" 1>&6
++		 $as_echo "$as_val"'`
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++   if test "x$as_val" = x""yes; then
-+  cat >> confdefs.h <<EOF
++  cat >>confdefs.h <<_ACEOF
-+#define $ac_tr_hdr 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+EOF
++_ACEOF
-+ echo $ac_n "checking for getrawpartition in -lutil""... $ac_c" 1>&6
++ { $as_echo "$as_me:$LINENO: checking for getrawpartition in -lutil" >&5
-+echo "configure:1520: checking for getrawpartition in -lutil" >&5
++$as_echo_n "checking for getrawpartition in -lutil... " >&6; }
-+ac_lib_var=`echo util'_'getrawpartition | sed 'y%./+-%__p_%'`
++if test "${ac_cv_lib_util_getrawpartition+set}" = set; then
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  $as_echo_n "(cached) " >&6
 +  echo $ac_n "(cached) $ac_c" 1>&6
 +else
-+  ac_save_LIBS="$LIBS"
++  ac_check_lib_save_LIBS=$LIBS
 +LIBS="-lutil  $LIBS"
-+cat > conftest.$ac_ext <<EOF
++cat >conftest.$ac_ext <<_ACEOF
-+#line 1528 "configure"
++/* confdefs.h.  */
-+#include "confdefs.h"
++_ACEOF
-+/* Override any gcc2 internal prototype to avoid an error.  */
++cat confdefs.h >>conftest.$ac_ext
-+/* We use char because int might match the return type of a gcc2
++cat >>conftest.$ac_ext <<_ACEOF
-+    builtin and then its argument prototype would still apply.  */
++/* end confdefs.h.  */
 +char getrawpartition();
 +/* Override any GCC internal prototype to avoid an error.
-+int main() {
++   Use char because int might match the return type of a GCC
-+getrawpartition()
++   builtin and then its argument prototype would still apply.  */
-+; return 0; }
++#ifdef __cplusplus
-+EOF
++extern "C"
-+if { (eval echo configure:1539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++#endif
-+  rm -rf conftest*
++char getrawpartition ();
-+  eval "ac_cv_lib_$ac_lib_var=yes"
++int
-+else
++main ()
-+  echo "configure: failed program was:" >&5
++{
-+  cat conftest.$ac_ext >&5
++return getrawpartition ();
-+  rm -rf conftest*
++  ;
-+  eval "ac_cv_lib_$ac_lib_var=no"
++  return 0;
-+fi
++}
-+rm -f conftest*
++_ACEOF
-+LIBS="$ac_save_LIBS"
++rm -f conftest.$ac_objext conftest$ac_exeext
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 +$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_link") 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest$ac_exeext && {
 +	 test "$cross_compiling" = yes ||
 +	 $as_test_x conftest$ac_exeext
 +       }; then
 +  ac_cv_lib_util_getrawpartition=yes
  else
 -  eval ac_cv_prog_make_${ac_make}_set=no
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
++
 +	ac_cv_lib_util_getrawpartition=no
 +fi
 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
++rm -rf conftest.dSYM
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
  fi
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_util_getrawpartition" >&5
 +$as_echo "$ac_cv_lib_util_getrawpartition" >&6; }
 +if test "x$ac_cv_lib_util_getrawpartition" = x""yes; then
 +  RAWPART="-DHAVE_GETRAWPARTITION='1' " LIBUTIL="-lutil"
++
 +else
 +  echo "$ac_t""no" 1>&6
 +fi
++
++
 +else
 +  echo "$ac_t""no" 1>&6
 +fi
++
 +done
++
++
++
 +for ac_func in getopt_long
 +do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "configure:1570: checking for $ac_func" >&5
++{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++$as_echo_n "checking for $ac_func... " >&6; }
-+  echo $ac_n "(cached) $ac_c" 1>&6
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+else
++  $as_echo_n "(cached) " >&6
-+  cat > conftest.$ac_ext <<EOF
++else
-+#line 1575 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
-+#include "confdefs.h"
++/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 +   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 +#define $ac_func innocuous_$ac_func
++
 +/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
++    which can conflict with char $ac_func (); below.
-+#include <assert.h>
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+/* Override any gcc2 internal prototype to avoid an error.  */
++    <limits.h> exists even on freestanding compilers.  */
 +/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
++#ifdef __STDC__
-+char $ac_func();
++# include <limits.h>
 +#else
 +# include <assert.h>
 +#endif
++
-+int main() {
++#undef $ac_func
++
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
 +#ifdef __cplusplus
 +extern "C"
 +#endif
 +char $ac_func ();
 +/* The GNU C library defines this for functions which it implements
 +    to always fail with ENOSYS.  Some functions are actually named
 +    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
 +choke me
 +#else
 +$ac_func();
 +#endif
++
-+; return 0; }
++int
-+EOF
++main ()
-+if { (eval echo configure:1598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++{
-+  rm -rf conftest*
++return $ac_func ();
-+  eval "ac_cv_func_$ac_func=yes"
++  ;
-+else
++  return 0;
-+  echo "configure: failed program was:" >&5
++}
-+  cat conftest.$ac_ext >&5
++_ACEOF
-+  rm -rf conftest*
++rm -f conftest.$ac_objext conftest$ac_exeext
-+  eval "ac_cv_func_$ac_func=no"
++if { (ac_try="$ac_link"
-+fi
++case "(($ac_try" in
-+rm -f conftest*
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+fi
++  *) ac_try_echo=$ac_try;;
 +esac
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+  echo "$ac_t""yes" 1>&6
++$as_echo "$ac_try_echo") >&5
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  (eval "$ac_link") 2>conftest.er1
-+  cat >> confdefs.h <<EOF
++  ac_status=$?
-+#define $ac_tr_func 1
++  grep -v '^ *+' conftest.er1 >conftest.err
-+EOF
++  rm -f conftest.er1
 +  cat conftest.err >&5
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest$ac_exeext && {
 +	 test "$cross_compiling" = yes ||
 +	 $as_test_x conftest$ac_exeext
 +       }; then
 +  eval "$as_ac_var=yes"
 +else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
++
 +	eval "$as_ac_var=no"
 +fi
++
 +rm -rf conftest.dSYM
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +fi
 +ac_res=`eval 'as_val=${'$as_ac_var'}
 +		 $as_echo "$as_val"'`
 +	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
 +as_val=`eval 'as_val=${'$as_ac_var'}
 +		 $as_echo "$as_val"'`
 +   if test "x$as_val" = x""yes; then
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +_ACEOF
 + GETOPT_LONG="-DGETOPT_LONG='1' "
 +fi
 +done
++
++
 +{ $as_echo "$as_me:$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
 +  $as_echo_n "(cached) " >&6
 +else
 +  cat >conftest.make <<\_ACEOF
 +SHELL = /bin/sh
 +all:
 +	@echo '@@@%%%=$(MAKE)=@@@%%%'
 +_ACEOF
 +# 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;;
 +  *)
 +    eval ac_cv_prog_make_${ac_make}_set=no;;
 +esac
  rm -f conftest.make
  fi
 -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
 -  echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
 +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
 +  { $as_echo "$as_me:$LINENO: result: yes" >&5
 +$as_echo "yes" >&6; }
    SET_MAKE=
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
 +  { $as_echo "$as_me:$LINENO: result: no" >&5
 +$as_echo "no" >&6; }
    SET_MAKE="MAKE=${MAKE-make}"
  fi
 -echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
 +{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
  if test "${ac_cv_c_const+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@ -5108,10 +5980,10 @@ main ()
  #ifndef __cplusplus
    /* Ultrix mips cc rejects this.  */
    typedef int charset[2];
 -  const charset x;
 +  const charset cs;
    /* SunOS 4.1.1 cc rejects this.  */
 -  char const *const *ccp;
 -  char **p;
 +  char const *const *pcpcc;
 +  char **ppc;
    /* NEC SVR4.0.2 mips cc rejects this.  */
    struct point {int x, y;};
    static struct point const zero = {0,0};
@@ -5120,16 +5992,17 @@ main ()
       an arm of an if-expression whose if-part is not a constant
       expression */
    const char *g = "string";
 -  ccp = &g + (g ? g-g : 0);
 +  pcpcc = &g + (g ? g-g : 0);
    /* HPUX 7.0 cc rejects these. */
 -  ++ccp;
 -  p = (char**) ccp;
 -  ccp = (char const *const *) p;
 +  ++pcpcc;
 +  ppc = (char**) pcpcc;
 +  pcpcc = (char const *const *) ppc;
    { /* SCO 3.2v4 cc rejects this.  */
      char *t;
      char const *s = 0 ? (char *) 0 : (char const *) 0;
      *t++ = 0;
 +    if (s) return 0;
+   }
    { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
      int x[] = {25, 17};
@@ -5148,7 +6021,9 @@ main ()
+   }
    { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
      const int foo = 10;
 +    if (!foo) return 0;
+   }
 +  return !cs[0] && !zero.x;
  #endif
+   ;
@@ -5156,42 +6031,39 @@ main ()
+ }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
 +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
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
    ac_cv_c_const=yes
  else
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
 -ac_cv_c_const=no
 +	ac_cv_c_const=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
 -echo "${ECHO_T}$ac_cv_c_const" >&6
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
 +$as_echo "$ac_cv_c_const" >&6; }
  if test $ac_cv_c_const = no; then
  cat >>confdefs.h <<\_ACEOF
 -#define const
 +#define const /**/
  _ACEOF
  fi
@@ -5204,7 +6076,13 @@ fi
 -                              ac_config_files="$ac_config_files Makefile interface/Makefile paranoia/Makefile"
++
++
++
++
++
 +ac_config_files="$ac_config_files Makefile interface/Makefile paranoia/Makefile"
++
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
@@ -5223,39 +6101,59 @@ _ACEOF
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
 -# So, don't put newlines in cache variables' values.
 +# So, we kill variables containing newlines.
  # Ultrix sh set writes to stderr and can't be redirected directly,
  # and sets the high bit in the cache file unless we assign to the vars.
 -{
 +(
 +  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
 +    eval ac_val=\$$ac_var
 +    case $ac_val in #(
 +    *${as_nl}*)
 +      case $ac_var in #(
 +      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 +      esac
 +      case $ac_var in #(
 +      _ | IFS | as_nl) ;; #(
 +      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
 +      *) $as_unset $ac_var ;;
 +      esac ;;
 +    esac
 +  done
++
    (set) 2>&1 |
 -    case `(ac_space=' '; set | grep ac_space) 2>&1` in
 -    *ac_space=\ *)
 +    case $as_nl`(ac_space=' '; set) 2>&1` in #(
 +    *${as_nl}ac_space=\ *)
        # `set' does not quote correctly, so add quotes (double-quote
        # substitution turns \\\\ into \\, and sed turns \\ into \).
        sed -n \
  	"s/'/'\\\\''/g;
  	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
 -      ;;
 +      ;; #(
      *)
        # `set' quotes correctly as required by POSIX, so do not add quotes.
 -      sed -n \
 -	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
 +      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
        ;;
 -    esac;
 -} |
 +    esac |
 +    sort
 +) |
    sed '
 +     /^ac_cv_env_/b end
       t clear
 -     : clear
 +     :clear
       s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
       t end
 -     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
 -     : end' >>confcache
 -if diff $cache_file confcache >/dev/null 2>&1; then :; else
 -  if test -w $cache_file; then
 -    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
 +     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
 +     :end' >>confcache
 +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 +  if test -w "$cache_file"; then
 +    test "x$cache_file" != "x/dev/null" &&
 +      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
 +$as_echo "$as_me: updating cache $cache_file" >&6;}
      cat confcache >$cache_file
    else
 -    echo "not updating unwritable cache $cache_file"
 +    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
    fi
  fi
  rm -f confcache
@@ -5264,63 +6162,54 @@ test "x$prefix" = xNONE && prefix=$ac_de
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 -# VPATH may cause trouble with some makes, so we remove $(srcdir),
 -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 -# trailing colons and then remove the whole line if VPATH becomes empty
 -# (actually we leave an empty line to preserve line numbers).
 -if test "x$srcdir" = x.; then
 -  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
 -s/:*\$(srcdir):*/:/;
 -s/:*\${srcdir}:*/:/;
 -s/:*@srcdir@:*/:/;
 -s/^\([^=]*=[	 ]*\):*/\1/;
 -s/:*$//;
 -s/^[^=]*=[	 ]*$//;
 -}'
 -fi
+-
  # Transform confdefs.h into DEFS.
  # Protect against shell expansion while executing Makefile rules.
  # Protect against Makefile macro expansion.
+ #
  # If the first sed substitution is executed (which looks for macros that
 -# take arguments), then we branch to the quote section.  Otherwise,
 +# take arguments), then branch to the quote section.  Otherwise,
  # look for a macro that doesn't take arguments.
 -cat >confdef2opt.sed <<\_ACEOF
 +ac_script='
 +:mline
 +/\\$/{
 + N
 + s,\\\n,,
 + b mline
 +}
  t clear
 -: clear
 -s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
 +:clear
 +s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
  t quote
 -s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
 +s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)/-D\1=\2/g
  t quote
 -d
 -: quote
 -s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
 -s,\[,\\&,g
 -s,\],\\&,g
 -s,\$,$$,g
 -p
 -_ACEOF
 -# We use echo to avoid assuming a particular line-breaking character.
 -# The extra dot is to prevent the shell from consuming trailing
 -# line-breaks from the sub-command output.  A line-break within
 -# single-quotes doesn't work because, if this script is created in a
 -# platform that uses two characters for line-breaks (e.g., DOS), tr
 -# would break.
 -ac_LF_and_DOT=`echo; echo .`
 -DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
 -rm -f confdef2opt.sed
 +b any
 +:quote
 +s/[	 `~#$^&*(){}\\|;'\''"<>?]/\\&/g
 +s/\[/\\&/g
 +s/\]/\\&/g
 +s/\$/$$/g
 +H
 +:any
 +${
 +	g
 +	s/^\n//
 +	s/\n/ /g
 +	p
 +}
 +'
 +DEFS=`sed -n "$ac_script" confdefs.h`
  ac_libobjs=
  ac_ltlibobjs=
  for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
    # 1. Remove the extension, and $U if already installed.
 -  ac_i=`echo "$ac_i" |
 -	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
 -  # 2. Add them.
 -  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
 -  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
 +  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
 +  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
 +  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
 +  #    will be set to the directory where LIBOBJS objects are built.
 +  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
 +  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
  done
  LIBOBJS=$ac_libobjs
@@ -5329,11 +6218,12 @@ LTLIBOBJS=$ac_ltlibobjs
  : ${CONFIG_STATUS=./config.status}
 +ac_write_fail=0
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
 -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
 -echo "$as_me: creating $CONFIG_STATUS" >&6;}
 -cat >$CONFIG_STATUS <<_ACEOF
 +{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
 +cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  #! $SHELL
  # Generated by $as_me.
  # Run this file to recreate the current configuration.
@@ -5346,22 +6236,78 @@ ac_cs_silent=false
  SHELL=\${CONFIG_SHELL-$SHELL}
  _ACEOF
 -cat >>$CONFIG_STATUS <<\_ACEOF
 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  ## --------------------- ##
  ## M4sh Initialization.  ##
  ## --------------------- ##
 -# Be Bourne compatible
 +# Be more Bourne compatible
 +DUALCASE=1; export DUALCASE # for MKS sh
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
    emulate sh
    NULLCMD=:
 -  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
 +  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
    # is contrary to our usage.  Disable this feature.
    alias -g '${1+"$@"}'='"$@"'
 -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
 -  set -o posix
 +  setopt NO_GLOB_SUBST
 +else
 +  case `(set -o) 2>/dev/null` in
 +  *posix*) set -o posix ;;
 +esac
++
 +fi
++
++
++
++
 +# 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
 +# Printing a long string crashes Solaris 7 /usr/bin/printf.
 +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
 +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
 +  as_echo='printf %s\n'
 +  as_echo_n='printf %s'
 +else
 +  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
 +    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
 +    as_echo_n='/usr/ucb/echo -n'
 +  else
 +    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
 +    as_echo_n_body='eval
 +      arg=$1;
 +      case $arg in
 +      *"$as_nl"*)
 +	expr "X$arg" : "X\\(.*\\)$as_nl";
 +	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
 +      esac;
 +      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
 +    '
 +    export as_echo_n_body
 +    as_echo_n='sh -c $as_echo_n_body as_echo'
 +  fi
 +  export as_echo_body
 +  as_echo='sh -c $as_echo_body as_echo'
 +fi
++
 +# The user is always right.
 +if test "${PATH_SEPARATOR+set}" != set; then
 +  PATH_SEPARATOR=:
 +  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
 +    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
 +      PATH_SEPARATOR=';'
 +  }
  fi
 -DUALCASE=1; export DUALCASE # for MKS sh
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
@@ -5371,33 +6317,60 @@ else
  fi
 +# IFS
 +# We need space, tab and new line, in precisely that order.  Quoting is
 +# there to prevent editors from complaining about space-tab.
 +# (If _AS_PATH_WALK were called with IFS unset, it would disable word
 +# splitting by setting IFS to empty value.)
 +IFS=" ""	$as_nl"
++
 +# Find who we are.  Look in the path if we contain no directory separator.
 +case $0 in
 +  *[\\/]* ) as_myself=$0 ;;
 +  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
 +done
 +IFS=$as_save_IFS
++
 +     ;;
 +esac
 +# We did not find ourselves, most probably we were run as `sh COMMAND'
 +# in which case we are not to be found in the path.
 +if test "x$as_myself" = x; then
 +  as_myself=$0
 +fi
 +if test ! -f "$as_myself"; then
 +  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
 +  { (exit 1); exit 1; }
 +fi
++
  # Work around bugs in pre-3.0 UWIN ksh.
 -$as_unset ENV MAIL MAILPATH
 +for as_var in ENV MAIL MAILPATH
 +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
 +done
  PS1='$ '
  PS2='> '
  PS4='+ '
  # NLS nuisances.
 -for as_var in \
 -  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
 -  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
 -  LC_TELEPHONE LC_TIME
 -do
 -  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
 -    eval $as_var=C; export $as_var
 -  else
 -    $as_unset $as_var
 -  fi
 -done
 +LC_ALL=C
 +export LC_ALL
 +LANGUAGE=C
 +export LANGUAGE
  # Required to use basename.
 -if expr a : '\(a\)' >/dev/null 2>&1; then
 +if expr a : '\(a\)' >/dev/null 2>&1 &&
 +   test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
  else
    as_expr=false
  fi
 -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
 +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
    as_basename=basename
  else
    as_basename=false
@@ -5405,159 +6378,122 @@ fi
  # Name of the executable.
 -as_me=`$as_basename "$0" ||
 +as_me=`$as_basename -- "$0" ||
  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  	 X"$0" : 'X\(//\)$' \| \
 -	 X"$0" : 'X\(/\)$' \| \
 -	 .     : '\(.\)' 2>/dev/null ||
 -echo X/"$0" |
 -    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
 -  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
 -  	  /^X\/\(\/\).*/{ s//\1/; q; }
 -  	  s/.*/./; q'`
+-
+-
 -# PATH needs CR, and LINENO needs CR and PATH.
 -# 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
 +	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 +$as_echo X/"$0" |
 +    sed '/^.*\/\([^/][^/]*\)\/*$/{
 +	    s//\1/
 +	    q
 +	  }
 +	  /^X\/\(\/\/\)$/{
 +	    s//\1/
 +	    q
 +	  }
 +	  /^X\/\(\/\).*/{
 +	    s//\1/
 +	    q
 +	  }
 +	  s/.*/./; q'`
 -# The user is always right.
 -if test "${PATH_SEPARATOR+set}" != set; then
 -  echo "#! /bin/sh" >conf$$.sh
 -  echo  "exit 0"   >>conf$$.sh
 -  chmod +x conf$$.sh
 -  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
 -    PATH_SEPARATOR=';'
 -  else
 -    PATH_SEPARATOR=:
 -  fi
 -  rm -f conf$$.sh
 -fi
 +# CDPATH.
 +$as_unset CDPATH
 -  as_lineno_1=$LINENO
 -  as_lineno_2=$LINENO
 -  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
 -  test "x$as_lineno_1" != "x$as_lineno_2" &&
 -  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
 -  # Find who we are.  Look in the path if we contain no path at all
 -  # relative or not.
 -  case $0 in
 -    *[\\/]* ) as_myself=$0 ;;
 -    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 -for as_dir in $PATH
 -do
 -  IFS=$as_save_IFS
 -  test -z "$as_dir" && as_dir=.
 -  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
 -done
 -       ;;
 -  esac
 -  # We did not find ourselves, most probably we were run as `sh COMMAND'
 -  # in which case we are not to be found in the path.
 -  if test "x$as_myself" = x; then
 -    as_myself=$0
 -  fi
 -  if test ! -f "$as_myself"; then
 -    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
 -   { (exit 1); exit 1; }; }
 -  fi
 -  case $CONFIG_SHELL in
 -  '')
 -    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 -do
 -  IFS=$as_save_IFS
 -  test -z "$as_dir" && as_dir=.
 -  for as_base in sh bash ksh sh5; do
 -	 case $as_dir in
 -	 /*)
 -	   if ("$as_dir/$as_base" -c '
    as_lineno_1=$LINENO
    as_lineno_2=$LINENO
 -  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
    test "x$as_lineno_1" != "x$as_lineno_2" &&
 -  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
 -	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
 -	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
 -	     CONFIG_SHELL=$as_dir/$as_base
 -	     export CONFIG_SHELL
 -	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
 -	   fi;;
 -	 esac
 -       done
 -done
 -;;
 -  esac
 +  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 before each line; the second 'sed' does the real
 -  # work.  The second script uses 'N' to pair each line-number line
 -  # with the numbered line, and appends trailing '-' during
 -  # substitution so that $LINENO is not a special case at line end.
 +  # 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
 -  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
 -  sed '=' <$as_myself |
 +  # 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
 -      s,$,-,
 -      : loop
 -      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
 +      :loop
 +      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
        t loop
 -      s,-$,,
 -      s,^['$as_cr_digits']*\n,,
 +      s/-\n.*//
      ' >$as_me.lineno &&
 -  chmod +x $as_me.lineno ||
 -    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
 +  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 sensible to this).
 -  . ./$as_me.lineno
 +  # original and so on.  Autoconf is especially sensitive to this).
 +  . "./$as_me.lineno"
    # Exit status is that of the last command.
    exit
+ }
 -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
 -  *c*,-n*) ECHO_N= ECHO_C='
 -' ECHO_T='	' ;;
 -  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
 -  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
 -esac
 +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
 +  as_dirname=dirname
 +else
 +  as_dirname=false
 +fi
 -if expr a : '\(a\)' >/dev/null 2>&1; then
 +ECHO_C= ECHO_N= ECHO_T=
 +case `echo -n x` in
 +-n*)
 +  case `echo 'x\c'` in
 +  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
 +  *)   ECHO_C='\c';;
 +  esac;;
 +*)
 +  ECHO_N='-n';;
 +esac
 +if expr a : '\(a\)' >/dev/null 2>&1 &&
 +   test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
  else
    as_expr=false
  fi
  rm -f conf$$ conf$$.exe conf$$.file
 -echo >conf$$.file
 -if ln -s conf$$.file conf$$ 2>/dev/null; then
 -  # We could just check for DJGPP; but this test a) works b) is more generic
 -  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
 -  if test -f conf$$.exe; then
 -    # Don't use ln at all; we don't have any links
 -    as_ln_s='cp -p'
 -  else
 +if test -d conf$$.dir; then
 +  rm -f conf$$.dir/conf$$.file
 +else
 +  rm -f conf$$.dir
 +  mkdir conf$$.dir 2>/dev/null
 +fi
 +if (echo >conf$$.file) 2>/dev/null; then
 +  if ln -s conf$$.file conf$$ 2>/dev/null; then
      as_ln_s='ln -s'
 +    # ... but there are two gotchas:
 +    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
 +    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
 +    # In both cases, we have to default to `cp -p'.
 +    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
 +      as_ln_s='cp -p'
 +  elif ln conf$$.file conf$$ 2>/dev/null; then
 +    as_ln_s=ln
 +  else
 +    as_ln_s='cp -p'
    fi
 -elif ln conf$$.file conf$$ 2>/dev/null; then
 -  as_ln_s=ln
  else
    as_ln_s='cp -p'
  fi
 -rm -f conf$$ conf$$.exe conf$$.file
 +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 +rmdir conf$$.dir 2>/dev/null
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
@@ -5566,7 +6502,28 @@ else
    as_mkdir_p=false
  fi
 -as_executable_p="test -f"
 +if test -x / >/dev/null 2>&1; then
 +  as_test_x='test -x'
 +else
 +  if ls -dL / >/dev/null 2>&1; then
 +    as_ls_L_option=L
 +  else
 +    as_ls_L_option=
 +  fi
 +  as_test_x='
 +    eval sh -c '\''
 +      if test -d "$1"; then
 +	test -d "$1/.";
 +      else
 +	case $1 in
 +	-*)set "./$1";;
 +	esac;
 +	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 +	???[sx]*):;;*)false;;esac;fi
 +    '\'' sh
 +  '
 +fi
 +as_executable_p=$as_test_x
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -5575,31 +6532,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 -# IFS
 -# We need space, tab and new line, in precisely that order.
 -as_nl='
 -'
 -IFS=" 	$as_nl"
+-
 -# CDPATH.
 -$as_unset CDPATH
+-
  exec 6>&1
 -# Open the log real soon, to keep \$[0] and so on meaningful, and to
 +# Save the log message, to keep $[0] and so on meaningful, and to
  # report actual input values of CONFIG_FILES etc. instead of their
 -# values after options handling.  Logging --version etc. is OK.
 -exec 5>>config.log
 -{
 -  echo
 -  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 -## Running $as_me. ##
 -_ASBOX
 -} >&5
 -cat >&5 <<_CSEOF
+-
 +# values after options handling.
 +ac_log="
  This file was extended by $as_me, which was
 -generated by GNU Autoconf 2.59.  Invocation command line was
 +generated by GNU Autoconf 2.63.  Invocation command line was
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -5607,124 +6547,106 @@ generated by GNU Autoconf 2.59.  Invocat
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
 -_CSEOF
 -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
 -echo >&5
 +on `(hostname || uname -n) 2>/dev/null | sed 1q`
 +"
++
  _ACEOF
 -# Files that config.status was made for.
 -if test -n "$ac_config_files"; then
 -  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
 -fi
 +case $ac_config_files in *"
 +"*) set x $ac_config_files; shift; ac_config_files=$*;;
 +esac
 -if test -n "$ac_config_headers"; then
 -  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
 -fi
 -if test -n "$ac_config_links"; then
 -  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
 -fi
 -if test -n "$ac_config_commands"; then
 -  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
 -fi
 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 +# Files that config.status was made for.
 +config_files="$ac_config_files"
 -cat >>$CONFIG_STATUS <<\_ACEOF
 +_ACEOF
 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
  current configuration.
 -Usage: $0 [OPTIONS] [FILE]...
 +Usage: $0 [OPTION]... [FILE]...
    -h, --help       print this help, then exit
 -  -V, --version    print version number, then exit
 -  -q, --quiet      do not print progress messages
 +  -V, --version    print version number and configuration settings, then exit
 +  -q, --quiet, --silent
 +                   do not print progress messages
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
 -  --file=FILE[:TEMPLATE]
 -		   instantiate the configuration file FILE
 +      --file=FILE[:TEMPLATE]
 +                   instantiate the configuration file FILE
  Configuration files:
  $config_files
  Report bugs to <bug-autoconf@gnu.org>."
 -_ACEOF
 -cat >>$CONFIG_STATUS <<_ACEOF
 +_ACEOF
 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  ac_cs_version="\\
  config.status
 -configured by $0, generated by GNU Autoconf 2.59,
 -  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 +configured by $0, generated by GNU Autoconf 2.63,
 +  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 -Copyright (C) 2003 Free Software Foundation, Inc.
 +Copyright (C) 2008 Free Software Foundation, Inc.
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
 -srcdir=$srcdir
++
 +ac_pwd='$ac_pwd'
 +srcdir='$srcdir'
 +test -n "\$AWK" || AWK=awk
  _ACEOF
 -cat >>$CONFIG_STATUS <<\_ACEOF
 -# If no file are specified by the user, then we need to provide default
 -# value.  By we need to know if files were specified by the user.
 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 +# The default lists apply if the user does not specify any file.
  ac_need_defaults=:
  while test $# != 0
  do
    case $1 in
    --*=*)
 -    ac_option=`expr "x$1" : 'x\([^=]*\)='`
 -    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
 +    ac_option=`expr "X$1" : 'X\([^=]*\)='`
 +    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
      ac_shift=:
      ;;
 -  -*)
 +  *)
      ac_option=$1
      ac_optarg=$2
      ac_shift=shift
      ;;
 -  *) # This is not an option, so the user has probably given explicit
 -     # arguments.
 -     ac_option=$1
 -     ac_need_defaults=false;;
    esac
    case $ac_option in
    # Handling of the options.
 -_ACEOF
 -cat >>$CONFIG_STATUS <<\_ACEOF
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
      ac_cs_recheck=: ;;
 -  --version | --vers* | -V )
 -    echo "$ac_cs_version"; exit 0 ;;
 -  --he | --h)
 -    # Conflict between --help and --header
 -    { { echo "$as_me:$LINENO: error: ambiguous option: $1
 -Try \`$0 --help' for more information." >&5
 -echo "$as_me: error: ambiguous option: $1
 -Try \`$0 --help' for more information." >&2;}
 -   { (exit 1); exit 1; }; };;
 -  --help | --hel | -h )
 -    echo "$ac_cs_usage"; exit 0 ;;
 -  --debug | --d* | -d )
 +  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
 +    $as_echo "$ac_cs_version"; exit ;;
 +  --debug | --debu | --deb | --de | --d | -d )
      debug=: ;;
    --file | --fil | --fi | --f )
      $ac_shift
 -    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
 -    ac_need_defaults=false;;
 -  --header | --heade | --head | --hea )
 -    $ac_shift
 -    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
 +    case $ac_optarg in
 +    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
 +    esac
 +    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
      ac_need_defaults=false;;
 +  --he | --h |  --help | --hel | -h )
 +    $as_echo "$ac_cs_usage"; exit ;;
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil | --si | --s)
      ac_cs_silent=: ;;
    # This is an error.
 -  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
 -Try \`$0 --help' for more information." >&5
 -echo "$as_me: error: unrecognized option: $1
 -Try \`$0 --help' for more information." >&2;}
 +  -*) { $as_echo "$as_me: error: unrecognized option: $1
 +Try \`$0 --help' for more information." >&2
     { (exit 1); exit 1; }; } ;;
 -  *) ac_config_targets="$ac_config_targets $1" ;;
 +  *) ac_config_targets="$ac_config_targets $1"
 +     ac_need_defaults=false ;;
    esac
    shift
@@ -5738,32 +6660,48 @@ if $ac_cs_silent; then
  fi
  _ACEOF
 -cat >>$CONFIG_STATUS <<_ACEOF
 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  if \$ac_cs_recheck; then
 -  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
 -  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
 +  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
 +  shift
 +  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
 +  CONFIG_SHELL='$SHELL'
 +  export CONFIG_SHELL
 +  exec "\$@"
  fi
  _ACEOF
 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 +exec 5>>config.log
 +{
 +  echo
 +  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 +## Running $as_me. ##
 +_ASBOX
 +  $as_echo "$ac_log"
 +} >&5
 +_ACEOF
 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 +_ACEOF
 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-
+-
 -cat >>$CONFIG_STATUS <<\_ACEOF
 +# Handling of arguments.
  for ac_config_target in $ac_config_targets
  do
 -  case "$ac_config_target" in
 -  # Handling of arguments.
 -  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
 -  "interface/Makefile" ) CONFIG_FILES="$CONFIG_FILES interface/Makefile" ;;
 -  "paranoia/Makefile" ) CONFIG_FILES="$CONFIG_FILES paranoia/Makefile" ;;
 -  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
 +  case $ac_config_target in
 +    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
 +    "interface/Makefile") CONFIG_FILES="$CONFIG_FILES interface/Makefile" ;;
 +    "paranoia/Makefile") CONFIG_FILES="$CONFIG_FILES paranoia/Makefile" ;;
++
 +  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 +$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
     { (exit 1); exit 1; }; };;
    esac
  done
++
  # If the user did not use the arguments to specify the items to instantiate,
  # then the envvar interface is used.  Set only those that are not.
  # We use the long form for the default assignment because of an extremely
@@ -5773,344 +6711,464 @@ if $ac_need_defaults; then
  fi
  # Have a temporary directory for convenience.  Make it in the build tree
 -# simply because there is no reason to put it here, and in addition,
 +# simply because there is no reason against having it here, and in addition,
  # creating and moving files from /tmp can sometimes cause problems.
 -# Create a temporary directory, and hook for its removal unless debugging.
 +# Hook for its removal unless debugging.
 +# Note that there is a small window in which the directory will not be cleaned:
 +# after its creation but before its name has been assigned to `$tmp'.
  $debug ||
+ {
 -  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
 +  tmp=
 +  trap 'exit_status=$?
 +  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
 +' 0
    trap '{ (exit 1); exit 1; }' 1 2 13 15
+ }
+-
  # Create a (secure) tmp directory for tmp files.
+ {
 -  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
 +  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
    test -n "$tmp" && test -d "$tmp"
  }  ||
+ {
 -  tmp=./confstat$$-$RANDOM
 -  (umask 077 && mkdir $tmp)
 +  tmp=./conf$$-$RANDOM
 +  (umask 077 && mkdir "$tmp")
  } ||
+ {
 -   echo "$me: cannot create a temporary directory in ." >&2
 +   $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.
 +# This happens for instance with `./config.status config.h'.
 +if test -n "$CONFIG_FILES"; then
++
++
 +ac_cr='
'
 +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
 +  ac_cs_awk_cr='\\r'
 +else
-+  echo "$ac_t""no" 1>&6
++  ac_cs_awk_cr=$ac_cr
 +fi
++
 +echo 'BEGIN {' >"$tmp/subs1.awk" &&
  _ACEOF
 -cat >>$CONFIG_STATUS <<_ACEOF
 -#
 -# CONFIG_FILES section.
 -#
 +{
 +  echo "cat >conf$$subs.awk <<_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_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
 +   { (exit 1); exit 1; }; }
 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 +ac_delim='%!_!# '
 +for ac_last_try in false false false false false :; do
 +  . ./conf$$subs.sh ||
 +    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
 +   { (exit 1); exit 1; }; }
 -# No need to generate the scripts if there are no CONFIG_FILES.
 -# This happens for instance when ./config.status config.h
 -if test -n "\$CONFIG_FILES"; then
 -  # Protect against being on the right side of a sed subst in config.status.
 -  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
 -   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
 -s,@SHELL@,$SHELL,;t t
 -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
 -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
 -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
 -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
 -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
 -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
 -s,@exec_prefix@,$exec_prefix,;t t
 -s,@prefix@,$prefix,;t t
 -s,@program_transform_name@,$program_transform_name,;t t
 -s,@bindir@,$bindir,;t t
 -s,@sbindir@,$sbindir,;t t
 -s,@libexecdir@,$libexecdir,;t t
 -s,@datadir@,$datadir,;t t
 -s,@sysconfdir@,$sysconfdir,;t t
 -s,@sharedstatedir@,$sharedstatedir,;t t
 -s,@localstatedir@,$localstatedir,;t t
 -s,@libdir@,$libdir,;t t
 -s,@includedir@,$includedir,;t t
 -s,@oldincludedir@,$oldincludedir,;t t
 -s,@infodir@,$infodir,;t t
 -s,@mandir@,$mandir,;t t
 -s,@build_alias@,$build_alias,;t t
 -s,@host_alias@,$host_alias,;t t
 -s,@target_alias@,$target_alias,;t t
 -s,@DEFS@,$DEFS,;t t
 -s,@ECHO_C@,$ECHO_C,;t t
 -s,@ECHO_N@,$ECHO_N,;t t
 -s,@ECHO_T@,$ECHO_T,;t t
 -s,@LIBS@,$LIBS,;t t
 -s,@build@,$build,;t t
 -s,@build_cpu@,$build_cpu,;t t
 -s,@build_vendor@,$build_vendor,;t t
 -s,@build_os@,$build_os,;t t
 -s,@host@,$host,;t t
 -s,@host_cpu@,$host_cpu,;t t
 -s,@host_vendor@,$host_vendor,;t t
 -s,@host_os@,$host_os,;t t
 -s,@CC@,$CC,;t t
 -s,@CFLAGS@,$CFLAGS,;t t
 -s,@LDFLAGS@,$LDFLAGS,;t t
 -s,@CPPFLAGS@,$CPPFLAGS,;t t
 -s,@ac_ct_CC@,$ac_ct_CC,;t t
 -s,@EXEEXT@,$EXEEXT,;t t
 -s,@OBJEXT@,$OBJEXT,;t t
 -s,@RANLIB@,$RANLIB,;t t
 -s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
 -s,@AR@,$AR,;t t
 -s,@INSTALL@,$INSTALL,;t t
 -s,@CPP@,$CPP,;t t
 -s,@EGREP@,$EGREP,;t t
 -s,@SET_MAKE@,$SET_MAKE,;t t
 -s,@SBPCD_H@,$SBPCD_H,;t t
 -s,@UCDROM_H@,$UCDROM_H,;t t
 -s,@TYPESIZES@,$TYPESIZES,;t t
 -s,@OPT@,$OPT,;t t
 -s,@DEBUG@,$DEBUG,;t t
 -s,@LIBOBJS@,$LIBOBJS,;t t
 -s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 -CEOF
+-
 -_ACEOF
+-
 -  cat >>$CONFIG_STATUS <<\_ACEOF
 -  # Split the substitutions into bite-sized pieces for seds with
 -  # small command number limits, like on Digital OSF/1 and HP-UX.
 -  ac_max_sed_lines=48
 -  ac_sed_frag=1 # Number of current file.
 -  ac_beg=1 # First line for current file.
 -  ac_end=$ac_max_sed_lines # Line after last line for current file.
 -  ac_more_lines=:
 -  ac_sed_cmds=
 -  while $ac_more_lines; do
 -    if test $ac_beg -gt 1; then
 -      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
 -    else
 -      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
 -    fi
 -    if test ! -s $tmp/subs.frag; then
 -      ac_more_lines=false
 -    else
 -      # The purpose of the label and of the branching condition is to
 -      # speed up the sed processing (if there are no `@' at all, there
 -      # is no need to browse any of the substitutions).
 -      # These are the two extra sed commands mentioned above.
 -      (echo ':t
 -  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
 -      if test -z "$ac_sed_cmds"; then
 -	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
 -      else
 -	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
 -      fi
 -      ac_sed_frag=`expr $ac_sed_frag + 1`
 -      ac_beg=$ac_end
 -      ac_end=`expr $ac_end + $ac_max_sed_lines`
 -    fi
 -  done
 -  if test -z "$ac_sed_cmds"; then
 -    ac_sed_cmds=cat
 +  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
 +  if test $ac_delim_n = $ac_delim_num; then
 +    break
 +  elif $ac_last_try; then
 +    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
 +   { (exit 1); exit 1; }; }
 +  else
 +    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
 -fi # test -n "$CONFIG_FILES"
 +done
 +rm -f conf$$subs.sh
 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
  _ACEOF
 -cat >>$CONFIG_STATUS <<\_ACEOF
 -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
 -  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
 -  case $ac_file in
 -  - | *:- | *:-:* ) # input from stdin
 -	cat >$tmp/stdin
 -	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
 -	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
 -  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
 -	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
 -  * )   ac_file_in=$ac_file.in ;;
 +sed -n '
 +h
 +s/^/S["/; s/!.*/"]=/
 +p
 +g
 +s/^[^!]*!//
 +:repl
 +t repl
 +s/'"$ac_delim"'$//
 +t delim
 +:nl
 +h
 +s/\(.\{148\}\).*/\1/
 +t more1
 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 +p
 +n
 +b repl
 +:more1
 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/
 +p
 +g
 +s/.\{148\}//
 +t nl
 +:delim
 +h
 +s/\(.\{148\}\).*/\1/
 +t more2
 +s/["\\]/\\&/g; s/^/"/; s/$/"/
 +p
 +b
 +:more2
 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/
 +p
 +g
 +s/.\{148\}//
 +t delim
 +' <conf$$subs.awk | sed '
 +/^[^""]/{
 +  N
 +  s/\n//
 +}
 +' >>$CONFIG_STATUS || ac_write_fail=1
 +rm -f conf$$subs.awk
 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 +_ACAWK
 +cat >>"\$tmp/subs1.awk" <<_ACAWK &&
 +  for (key in S) S_is_set[key] = 1
 +  FS = ""
++
 +}
 +{
 +  line = $ 0
 +  nfields = split(line, field, "@")
 +  substed = 0
 +  len = length(field[1])
 +  for (i = 2; i < nfields; i++) {
 +    key = field[i]
 +    keylen = length(key)
 +    if (S_is_set[key]) {
 +      value = S[key]
 +      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
 +      len += length(value) + length(field[++i])
 +      substed = 1
 +    } else
 +      len += 1 + keylen
 +  }
++
 +  print line
 +}
++
 +_ACAWK
 +_ACEOF
 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
 +  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 +else
 +  cat
 +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
 +  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
 +$as_echo "$as_me: error: could not setup config files machinery" >&2;}
 +   { (exit 1); exit 1; }; }
 +_ACEOF
++
 +# VPATH may cause trouble with some makes, so we remove $(srcdir),
 +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 +# trailing colons and then remove the whole line if VPATH becomes empty
 +# (actually we leave an empty line to preserve line numbers).
 +if test "x$srcdir" = x.; then
 +  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
 +s/:*\$(srcdir):*/:/
 +s/:*\${srcdir}:*/:/
 +s/:*@srcdir@:*/:/
 +s/^\([^=]*=[	 ]*\):*/\1/
 +s/:*$//
 +s/^[^=]*=[	 ]*$//
 +}'
 +fi
++
 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 +fi # test -n "$CONFIG_FILES"
++
++
 +eval set X "  :F $CONFIG_FILES      "
 +shift
 +for ac_tag
 +do
 +  case $ac_tag in
 +  :[FHLC]) ac_mode=$ac_tag; continue;;
 +  esac
 +  case $ac_mode$ac_tag in
 +  :[FHL]*:*);;
 +  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
 +$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
 +   { (exit 1); exit 1; }; };;
 +  :[FH]-) ac_tag=-:-;;
 +  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    esac
 +  ac_save_IFS=$IFS
 +  IFS=:
 +  set x $ac_tag
 +  IFS=$ac_save_IFS
 +  shift
 +  ac_file=$1
 +  shift
 -  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
 -  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
 +  case $ac_mode in
 +  :L) ac_source=$1;;
 +  :[FH])
 +    ac_file_inputs=
 +    for ac_f
 +    do
 +      case $ac_f in
 +      -) ac_f="$tmp/stdin";;
 +      *) # Look for the file first in the build tree, then in the source tree
 +	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 +	 # because $ac_f cannot contain `:'.
 +	 test -f "$ac_f" ||
 +	   case $ac_f in
 +	   [\\/$]*) false;;
 +	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 +	   esac ||
 +	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
 +$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
 +   { (exit 1); exit 1; }; };;
 +      esac
 +      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
 +      ac_file_inputs="$ac_file_inputs '$ac_f'"
 +    done
++
 +    # Let's still pretend it is `configure' which instantiates (i.e., don't
 +    # use $as_me), people would be surprised to read:
 +    #    /* config.h.  Generated by config.status.  */
 +    configure_input='Generated from '`
 +	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 +	`' by configure.'
 +    if test x"$ac_file" != x-; then
 +      configure_input="$ac_file.  $configure_input"
 +      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
 +$as_echo "$as_me: creating $ac_file" >&6;}
 +    fi
 +    # Neutralize special characters interpreted by sed in replacement strings.
 +    case $configure_input in #(
 +    *\&* | *\|* | *\\* )
 +       ac_sed_conf_input=`$as_echo "$configure_input" |
 +       sed 's/[\\\\&|]/\\\\&/g'`;; #(
 +    *) ac_sed_conf_input=$configure_input;;
 +    esac
++
 +    case $ac_tag in
 +    *:-:* | *:-) cat >"$tmp/stdin" \
 +      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
 +$as_echo "$as_me: error: could not create $ac_file" >&2;}
 +   { (exit 1); exit 1; }; } ;;
 +    esac
 +    ;;
 +  esac
++
 +  ac_dir=`$as_dirname -- "$ac_file" ||
  $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  	 X"$ac_file" : 'X\(//\)[^/]' \| \
  	 X"$ac_file" : 'X\(//\)$' \| \
 -	 X"$ac_file" : 'X\(/\)' \| \
 -	 .     : '\(.\)' 2>/dev/null ||
 -echo X"$ac_file" |
 -    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
 -  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
 -  	  /^X\(\/\/\)$/{ s//\1/; q; }
 -  	  /^X\(\/\).*/{ s//\1/; q; }
 -  	  s/.*/./; q'`
 -  { if $as_mkdir_p; then
 -    mkdir -p "$ac_dir"
 -  else
 -    as_dir="$ac_dir"
 +	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
 +$as_echo X"$ac_file" |
 +    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 +	    s//\1/
 +	    q
 +	  }
 +	  /^X\(\/\/\)[^/].*/{
 +	    s//\1/
 +	    q
 +	  }
 +	  /^X\(\/\/\)$/{
 +	    s//\1/
 +	    q
 +	  }
 +	  /^X\(\/\).*/{
 +	    s//\1/
 +	    q
 +	  }
 +	  s/.*/./; q'`
 +  { as_dir="$ac_dir"
 +  case $as_dir in #(
 +  -*) as_dir=./$as_dir;;
 +  esac
 +  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
      as_dirs=
 -    while test ! -d "$as_dir"; do
 -      as_dirs="$as_dir $as_dirs"
 -      as_dir=`(dirname "$as_dir") 2>/dev/null ||
 +    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 ||
 -echo X"$as_dir" |
 -    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
 -  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
 -  	  /^X\(\/\/\)$/{ s//\1/; q; }
 -  	  /^X\(\/\).*/{ s//\1/; q; }
 -  	  s/.*/./; q'`
 +	 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 ! -n "$as_dirs" || mkdir $as_dirs
 -  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
 +    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=.
 -if test "$ac_dir" != .; then
 -  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
 -  # A "../" for each directory in $ac_dir_suffix.
 -  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
 -else
 -  ac_dir_suffix= ac_top_builddir=
 -fi
 +case "$ac_dir" in
 +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 +*)
 +  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
 +  # A ".." for each directory in $ac_dir_suffix.
 +  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
 +  case $ac_top_builddir_sub in
 +  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
 +  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
 +  esac ;;
 +esac
 +ac_abs_top_builddir=$ac_pwd
 +ac_abs_builddir=$ac_pwd$ac_dir_suffix
 +# for backward compatibility:
 +ac_top_builddir=$ac_top_build_prefix
  case $srcdir in
 -  .)  # No --srcdir option.  We are building in place.
 +  .)  # We are building in place.
      ac_srcdir=.
 -    if test -z "$ac_top_builddir"; then
 -       ac_top_srcdir=.
 -    else
 -       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
 -    fi ;;
 -  [\\/]* | ?:[\\/]* )  # Absolute path.
 +    ac_top_srcdir=$ac_top_builddir_sub
 +    ac_abs_top_srcdir=$ac_pwd ;;
 +  [\\/]* | ?:[\\/]* )  # Absolute name.
      ac_srcdir=$srcdir$ac_dir_suffix;
 -    ac_top_srcdir=$srcdir ;;
 -  *) # Relative path.
 -    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
 -    ac_top_srcdir=$ac_top_builddir$srcdir ;;
 +    ac_top_srcdir=$srcdir
 +    ac_abs_top_srcdir=$srcdir ;;
 +  *) # Relative name.
 +    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
 +    ac_top_srcdir=$ac_top_build_prefix$srcdir
 +    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
  esac
 +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 -# Do not use `cd foo && pwd` to compute absolute paths, because
 -# the directories may not exist.
 -case `pwd` in
 -.) ac_abs_builddir="$ac_dir";;
 -*)
 -  case "$ac_dir" in
 -  .) ac_abs_builddir=`pwd`;;
 -  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
 -  *) ac_abs_builddir=`pwd`/"$ac_dir";;
 -  esac;;
 -esac
 -case $ac_abs_builddir in
 -.) ac_abs_top_builddir=${ac_top_builddir}.;;
 -*)
 -  case ${ac_top_builddir}. in
 -  .) ac_abs_top_builddir=$ac_abs_builddir;;
 -  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
 -  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
 -  esac;;
 -esac
 -case $ac_abs_builddir in
 -.) ac_abs_srcdir=$ac_srcdir;;
 -*)
 -  case $ac_srcdir in
 -  .) ac_abs_srcdir=$ac_abs_builddir;;
 -  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
 -  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
 -  esac;;
 -esac
 -case $ac_abs_builddir in
 -.) ac_abs_top_srcdir=$ac_top_srcdir;;
 -*)
 -  case $ac_top_srcdir in
 -  .) ac_abs_top_srcdir=$ac_abs_builddir;;
 -  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
 -  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
 -  esac;;
 -esac
 +  case $ac_mode in
 +  :F)
 +  #
 +  # CONFIG_FILE
 +  #
 +_ACEOF
- echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+-  if test x"$ac_file" != x-; then
- echo "configure:1482: checking whether ${MAKE-make} sets \${MAKE}" >&5
+-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-@@ -1736,6 +1892,8 @@ s%@host_alias@%$host_alias%g
+-echo "$as_me: creating $ac_file" >&6;}
- s%@host_cpu@%$host_cpu%g
+-    rm -f "$ac_file"
- s%@host_vendor@%$host_vendor%g
+-  fi
- s%@host_os@%$host_os%g
+-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-+s%@EXTRA_OBJS@%$EXTRA_OBJS%g
+-  # use $as_me), people would be surprised to read:
-+s%@EXTRA_LIBS@%$EXTRA_LIBS%g
+-  #    /* config.h.  Generated by config.status.  */
- s%@CC@%$CC%g
+-  if test x"$ac_file" = x-; then
- s%@RANLIB@%$RANLIB%g
+-    configure_input=
- s%@AR@%$AR%g
+-  else
-@@ -1744,9 +1902,12 @@ s%@CPP@%$CPP%g
+-    configure_input="$ac_file.  "
- s%@SET_MAKE@%$SET_MAKE%g
+-  fi
- s%@SBPCD_H@%$SBPCD_H%g
+-  configure_input=$configure_input"Generated from `echo $ac_file_in |
- s%@UCDROM_H@%$UCDROM_H%g
+-				     sed 's,.*/,,'` by configure."
-+s%@GETOPT_LONG@%$GETOPT_LONG%g
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+s%@RAWPART@%$RAWPART%g
++# If the template does not know about datarootdir, expand it.
- s%@TYPESIZES@%$TYPESIZES%g
++# FIXME: This hack should be removed a few years after 2.60.
- s%@OPT@%$OPT%g
++ac_datarootdir_hack=; ac_datarootdir_seen=
  s%@DEBUG@%$DEBUG%g
-+s%@LIBUTIL@%$LIBUTIL%g
+-  # First look for the input files in the build tree, otherwise in the
 -  # src tree.
 -  ac_file_inputs=`IFS=:
 -    for f in $ac_file_in; do
 -      case $f in
 -      -) echo $tmp/stdin ;;
 -      [\\/$]*)
 -	 # Absolute (can't be DOS-style, as IFS=:)
 -	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
 -echo "$as_me: error: cannot find input file: $f" >&2;}
 -   { (exit 1); exit 1; }; }
 -	 echo "$f";;
 -      *) # Relative
 -	 if test -f "$f"; then
 -	   # Build tree
 -	   echo "$f"
 -	 elif test -f "$srcdir/$f"; then
 -	   # Source tree
 -	   echo "$srcdir/$f"
 -	 else
 -	   # /dev/null tree
 -	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
 -echo "$as_me: error: cannot find input file: $f" >&2;}
 -   { (exit 1); exit 1; }; }
 -	 fi;;
 -      esac
 -    done` || { (exit 1); exit 1; }
 +ac_sed_dataroot='
 +/datarootdir/ {
 +  p
 +  q
 +}
 +/@datadir@/p
 +/@docdir@/p
 +/@infodir@/p
 +/@localedir@/p
 +/@mandir@/p
 +'
 +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 +*datarootdir*) ac_datarootdir_seen=yes;;
 +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
 +  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 +_ACEOF
 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 +  ac_datarootdir_hack='
 +  s&@datadir@&$datadir&g
 +  s&@docdir@&$docdir&g
 +  s&@infodir@&$infodir&g
 +  s&@localedir@&$localedir&g
 +  s&@mandir@&$mandir&g
 +    s&\\\${datarootdir}&$datarootdir&g' ;;
 +esac
  _ACEOF
 -cat >>$CONFIG_STATUS <<_ACEOF
 -  sed "$ac_vpsub
++
 +# Neutralize VPATH when `$srcdir' = `.'.
 +# Shell code in configure.ac might set extrasub.
 +# FIXME: do we really want to maintain this feature?
 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 +ac_sed_extra="$ac_vpsub
  $extrasub
  _ACEOF
 -cat >>$CONFIG_STATUS <<\_ACEOF
 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  :t
  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 -s,@configure_input@,$configure_input,;t t
 -s,@srcdir@,$ac_srcdir,;t t
 -s,@abs_srcdir@,$ac_abs_srcdir,;t t
 -s,@top_srcdir@,$ac_top_srcdir,;t t
 -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
 -s,@builddir@,$ac_builddir,;t t
 -s,@abs_builddir@,$ac_abs_builddir,;t t
 -s,@top_builddir@,$ac_top_builddir,;t t
 -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
 -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
 -  rm -f $tmp/stdin
 -  if test x"$ac_file" != x-; then
 -    mv $tmp/out $ac_file
 -  else
 -    cat $tmp/out
 -    rm -f $tmp/out
 -  fi
 +s|@configure_input@|$ac_sed_conf_input|;t t
 +s&@top_builddir@&$ac_top_builddir_sub&;t t
 +s&@top_build_prefix@&$ac_top_build_prefix&;t t
 +s&@srcdir@&$ac_srcdir&;t t
 +s&@abs_srcdir@&$ac_abs_srcdir&;t t
 +s&@top_srcdir@&$ac_top_srcdir&;t t
 +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
 +s&@builddir@&$ac_builddir&;t t
 +s&@abs_builddir@&$ac_abs_builddir&;t t
 +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 +$ac_datarootdir_hack
 +"
 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
 +  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
 +$as_echo "$as_me: error: could not create $ac_file" >&2;}
 +   { (exit 1); exit 1; }; }
 -done
 -_ACEOF
 +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
 +  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
 +  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
 +  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 +which seems to be undefined.  Please make sure it is defined." >&5
 +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 +which seems to be undefined.  Please make sure it is defined." >&2;}
++
 +  rm -f "$tmp/stdin"
 +  case $ac_file in
 +  -) cat "$tmp/out" && rm -f "$tmp/out";;
 +  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
 +  esac \
 +  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
 +$as_echo "$as_me: error: could not create $ac_file" >&2;}
 +   { (exit 1); exit 1; }; }
 + ;;
++
++
++
 +  esac
++
 +done # for ac_tag
 -cat >>$CONFIG_STATUS <<\_ACEOF
  { (exit 0); exit 0; }
  _ACEOF
  chmod +x $CONFIG_STATUS
  ac_clean_files=$ac_clean_files_save
 +test $ac_write_fail = 0 ||
 +  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
 +$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
 +   { (exit 1); exit 1; }; }
++
  # configure is writing to config.log, and then calls config.status.
  # config.status does its own redirection, appending to config.log.
@@ -6132,4 +7190,8 @@ if test "$no_create" != yes; then
    # would make configure fail if this is the last instruction.
    $ac_cs_success || { (exit 1); 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: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 +fi
  CEOF
  EOF

 @@ -1,21 +1,20 @@
-# $NetBSD: Makefile,v 1.27 2009/05/19 00:36:06 dholland Exp $
+# $NetBSD: Makefile,v 1.28 2009/08/09 16:00:53 drochner Exp $
+#
-DISTNAME=	cdparanoia-III-alpha9.8
+DISTNAME=	cdparanoia-III-10.2
-PKGNAME=	cdparanoia-3.0.9.8
+PKGNAME=	cdparanoia-3.0.10.2
 PKGREVISION=	8
 CATEGORIES=	audio
-MASTER_SITES=	http://www.xiph.org/paranoia/download/
+MASTER_SITES=	http://downloads.xiph.org/releases/cdparanoia/
 EXTRACT_SUFX=	.src.tgz
 MAINTAINER=	kim@tac.nyc.ny.us
 HOMEPAGE=	http://www.xiph.org/paranoia/
 COMMENT=	CDDA reading utility with extra data verification features
 ONLY_FOR_PLATFORM=	FreeBSD-*-* NetBSD-*-* Linux-*-* DragonFly-*-* Darwin-*-*
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 USE_TOOLS+=	gmake
 USE_LIBTOOL=	YES

 @@ -1,25 +1,23 @@
-$NetBSD: distinfo,v 1.22 2009/05/19 00:36:06 dholland Exp $
+$NetBSD: distinfo,v 1.23 2009/08/09 16:00:53 drochner Exp $
-SHA1 (cdparanoia-III-alpha9.8.src.tgz) = 04cc33a7d22d6255f6239e3e74195506b3bdde06
+SHA1 (cdparanoia-III-10.2.src.tgz) = 1901e20d3a370ca6afa4c76a9ef30d3f03044320
-RMD160 (cdparanoia-III-alpha9.8.src.tgz) = d9225165f83b5386c58db263d6918a7006df1481
+RMD160 (cdparanoia-III-10.2.src.tgz) = d6c4ea9cc4aa4d5bcca4985e668ea6142d53cc55
-Size (cdparanoia-III-alpha9.8.src.tgz) = 116591 bytes
+Size (cdparanoia-III-10.2.src.tgz) = 183236 bytes
-SHA1 (patch-aa) = 29fd5767b37360fe804013bb171fc7e5f4d8311f
+SHA1 (patch-aa) = e47579c7c20d6170d7ef9c9952914309653fbeb1
-SHA1 (patch-ab) = d02dd70c45ec97e859c024d11d7bc74c79d96f62
+SHA1 (patch-ab) = af07649ac4e0d4a5c2798e4cfc903e6959adea44
-SHA1 (patch-ac) = 6bd7ad7a0e8bcd1f8354c73706cafb0e789b8252
+SHA1 (patch-ac) = 809a306e3ee07493167ee652efd8899fd38af15f
 SHA1 (patch-ad) = 9a1ea1b98b5f3810e1ccae57beb8c68b5e189716
-SHA1 (patch-ae) = 59d74c0392d5bcc37299326efa8ba700722d5cf4
+SHA1 (patch-ae) = dda320ca0817b06cb25be86b2a891776550603ae
-SHA1 (patch-ba) = 51151796493c946e5bdafbd22005136ea7f27a09
+SHA1 (patch-ba) = 0f4f8ddecd9f5f273f7a1687bbb1477fd64500c1
-SHA1 (patch-ca) = 9c35254c09a96b622cac44198443f66f7bc0e428
+SHA1 (patch-ca) = 39b06a65f1feed4170c0f7305f7a56f104c4a043
-SHA1 (patch-cb) = c19ee04017b836842bb0f2d2c77e8f35aad0f9bb
+SHA1 (patch-cb) = b38b9119273aef002e1fde8f84888b303d7833d9
-SHA1 (patch-cc) = adea4fd9682c0543e5749c6f3fe73697d8663c6c
+SHA1 (patch-cc) = a2f78daf62ecae73ab3cc264f39b367dfa249129
-SHA1 (patch-cd) = 81d31fb55db0f982959395cdecc3da826bf23bfb
+SHA1 (patch-cd) = 7141563e10b0d23dbd4ff824224a10908741be5b
-SHA1 (patch-ce) = 3a4e9a83753e2eb6595bcb4e7a47c42b72ef5702
+SHA1 (patch-ce) = 75b152acaf730eafa76dffc44e2bec95c0ae6397
-SHA1 (patch-cf) = 6236318d39f9d3d1e5f93a91048ec2777291dc63
+SHA1 (patch-cf) = 73cdff1ab6b9857cd3299f3eb152c399a7e38227
-SHA1 (patch-cg) = c962cbc84f021e399b6f210d0e7a140fd7004222
+SHA1 (patch-cg) = 9a979bcac06da564e6d86d0ffc04848e529367cf
-SHA1 (patch-ch) = 8d16dd8c80e8f1ee35ccc299ba927d685adde01c
+SHA1 (patch-ch) = 1e17f98007b7e566dd88e30bea27247a9be6cc28
-SHA1 (patch-ci) = 60db1d1d2e8ec9c6d446543762218b22c597d986
+SHA1 (patch-ci) = d8a85b0e5858650050a05fdca612bc0fadd42065
 SHA1 (patch-cj) = e2420e2ccadd2d6ea30d6bf48af9c141dc395afc
 SHA1 (patch-ck) = 0232f8f42d98b49043f55cd6aaf1f50ab38fadfb
 SHA1 (patch-cl) = f511570233524feac434db160e51099316618058
 SHA1 (patch-cm) = 18001a6cf96dd6bfde8e1208be56a40fac9aa0d5
 SHA1 (patch-cn) = b79db0b24a042a5801b47e6db5e20cbf07a53475

 @@ -1,79 +1,82 @@
-$NetBSD: patch-cd,v 1.4 2006/09/03 17:13:30 ben Exp $
+$NetBSD: patch-cd,v 1.5 2009/08/09 16:00:53 drochner Exp $
---- interface/common_interface.c.orig	2000-04-19 15:41:04.000000000 -0700
+--- interface/common_interface.c.orig	2008-08-21 18:08:54.000000000 +0200
 +++ interface/common_interface.c
-@@ -9,23 +9,39 @@
+@@ -9,26 +9,42 @@
   ******************************************************************/
  #include <math.h>
 +#if defined(__APPLE__) && defined(__MACH__)
 +#include <sys/syslimits.h>
 +#include <assert.h>
 +#include <stdlib.h>
 +#include <paths.h>
 +#include <fcntl.h>
 +#endif
  #include "low_interface.h"
  #include "utils.h"
  #include "smallft.h"
 +#ifdef __linux__
  #include <linux/hdreg.h>
 +#endif
  /* Test for presence of a cdrom by pinging with the 'CDROMVOLREAD' ioctl() */
  /* Also test using CDROM_GET_CAPABILITY (if available) as some newer DVDROMs will
     reject CDROMVOLREAD ioctl for god-knows-what reason */
  int ioctl_ping_cdrom(int fd){
 +#ifdef __linux__
    struct cdrom_volctrl volctl;
-   if (ioctl(fd, CDROMVOLREAD, &volctl))
+   if (ioctl(fd, CDROMVOLREAD, &volctl) &&
        ioctl(fd, CDROM_GET_CAPABILITY, NULL)<0)
      return(1); /* failure */
 +#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
 +  struct ioc_vol volctl;
 +  if (ioctl(fd, CDIOCGETVOL, &volctl))
 +    return(1); /* failure */
 +#endif
    return(0);
    /* success! */
+ }
 +#ifdef __linux__
  /* Use the ioctl thingy above ping the cdrom; this will get model info */
  char *atapi_drive_info(int fd){
    /* Work around the fact that the struct grew without warning in
-@@ -46,6 +62,7 @@ char *atapi_drive_info(int fd){
+@@ -49,6 +65,7 @@ char *atapi_drive_info(int fd){
    free(id);
    return(ret);
+ }
 +#endif
  int data_bigendianp(cdrom_drive *d){
    float lsb_votes=0;
-@@ -171,9 +188,12 @@ int data_bigendianp(cdrom_drive *d){
+@@ -174,9 +191,12 @@ int data_bigendianp(cdrom_drive *d){
-    knows the leasoud/leadin size. */
+    knows the leadout/leadin size. */
  int FixupTOC(cdrom_drive *d,int tracks){
 +#ifdef __linux__
    struct cdrom_multisession ms_str;
 +#endif
    int j;
 +#if !(defined(__APPLE__) && defined(__MACH__))
    /* First off, make sure the 'starting sector' is >=0 */
    for(j=0;j<tracks;j++){
-@@ -208,14 +228,26 @@ int FixupTOC(cdrom_drive *d,int tracks){
+@@ -211,14 +231,26 @@ int FixupTOC(cdrom_drive *d,int tracks){
    /* For a scsi device, the ioctl must go to the specialized SCSI
       CDROM device, not the generic device. */
 +#if !defined(__FreeBSD__) && !defined(__DragonFly__)
    if (d->ioctl_fd != -1) {
 +#ifdef __linux__
      int result;
      ms_str.addr_format = CDROM_LBA;
      result = ioctl(d->ioctl_fd, CDROMMULTISESSION, &ms_str);
      if (result == -1) return -1;
 +# define ms_addr	(ms_str.addr.lba)
 +#endif
 @@ -81,32 +84,34 @@ $NetBSD: patch-cd,v 1.4 2006/09/03 17:13
 +#ifdef __NetBSD__
 +    int ms_addr;
++
 +    ms_addr = 0;	/* last session */
 +    if (ioctl(d->ioctl_fd, CDIOREADMSADDR, &ms_addr) == -1)
 +      return -1;
 +#endif
 -    if (ms_str.addr.lba > 100) {
 +    if (ms_addr > 100) {
        /* This is an odd little piece of code --Monty */
-@@ -223,14 +255,16 @@ int FixupTOC(cdrom_drive *d,int tracks){
+@@ -226,15 +258,17 @@ int FixupTOC(cdrom_drive *d,int tracks){
        /* adjust end of last audio track to be in the first session */
        for (j = tracks-1; j >= 0; j--) {
  	if (j > 0 && !IS_AUDIO(d,j) && IS_AUDIO(d,j-1)) {
--	  if (d->disc_toc[j].dwStartSector > ms_str.addr.lba - 11400)
+-	  if ((d->disc_toc[j].dwStartSector > ms_str.addr.lba - 11400) &&
 -	      (ms_str.addr.lba - 11400 > d->disc_toc[j-1].dwStartSector))
 -	    d->disc_toc[j].dwStartSector = ms_str.addr.lba - 11400;
-+	  if (d->disc_toc[j].dwStartSector > ms_addr - 11400)
++	  if ((d->disc_toc[j].dwStartSector > ms_addr - 11400) &&
 +	      (ms_addr - 11400 > d->disc_toc[j-1].dwStartSector))
 +	    d->disc_toc[j].dwStartSector = ms_addr - 11400;
  	  break;
+ 	}
+       }
        return 1;
+     }
+   }
 +#endif
 +#endif
    return 0;
+ }

 @@ -1,56 +1,56 @@
-$NetBSD: patch-ci,v 1.4 2006/09/03 17:13:30 ben Exp $
+$NetBSD: patch-ci,v 1.5 2009/08/09 16:00:53 drochner Exp $
---- interface/interface.c.orig	2000-04-19 15:41:04.000000000 -0700
+--- interface/interface.c.orig	2008-09-11 12:43:52.000000000 +0200
 +++ interface/interface.c
-@@ -30,12 +30,29 @@ int cdda_close(cdrom_drive *d){
+@@ -35,6 +35,10 @@ int cdda_close(cdrom_drive *d){
      _clean_messages(d);
      if(d->cdda_device_name)free(d->cdda_device_name);
 +#if !defined(__FreeBSD__) && !defined(__DragonFly__)
 +#if defined(__APPLE__) && defined(__MACH__)
 +    if(d->fd != -1) close(d->fd);
 +#else
      if(d->ioctl_device_name)free(d->ioctl_device_name);
      if(d->drive_model)free(d->drive_model);
      if(d->cdda_fd!=-1)close(d->cdda_fd);
-     if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd);
+@@ -43,6 +47,19 @@ int cdda_close(cdrom_drive *d){
-     if(d->sg)free(d->sg);
+       if(d->private->sg_hd)free(d->private->sg_hd);
        free(d->private);
+     }
 +#endif
 +#else
 +    if(d->drive_model)
 +	  free(d->drive_model);
 +    if(d->ccb)
 +	  cam_freeccb(d->ccb);
 +    if(d->dev)
 +	  cam_close_device(d->dev);
 +    if(d->sg_buffer)
 +	  free(d->sg_buffer);
 +    if(d->ioctl_fd != -1)
 +	  close(d->ioctl_fd);
 +#endif
      free(d);
+   }
-   return(0);
+@@ -55,6 +72,12 @@ int cdda_open(cdrom_drive *d){
@@ -47,6 +64,12 @@ int cdda_open(cdrom_drive *d){
    if(d->opened)return(0);
    switch(d->interface){
 +#if defined(__APPLE__) && defined(__MACH__)
 +  case OSX_IOKIT:
 +    if((ret=osx_open_device(d)))
 +      return ret;
 +    break;
 +#else
    case SGIO_SCSI_BUGGY1:
    case SGIO_SCSI:
    case GENERIC_SCSI:
-     if((ret=scsi_init_drive(d)))
+@@ -71,6 +94,7 @@ int cdda_open(cdrom_drive *d){
        return(ret);
@@ -61,6 +84,7 @@ int cdda_open(cdrom_drive *d){
        return(ret);
      break;
  #endif
 +#endif
    default:
      cderror(d,"100: Interface not supported\n");
      return(-100);

 @@ -1,82 +1,80 @@
-$NetBSD: patch-ab,v 1.9 2009/05/19 00:36:06 dholland Exp $
+$NetBSD: patch-ab,v 1.10 2009/08/09 16:00:53 drochner Exp $
---- Makefile.in.orig	2001-03-27 17:46:58.000000000 -0500
+--- Makefile.in.orig	2008-09-11 22:33:30.000000000 +0200
-+++ Makefile.in	2009-05-17 17:21:32.000000000 -0400
++++ Makefile.in
 @@ -3,12 +3,12 @@
  # DO NOT EDIT BELOW! ##########################################################
  # (unless, of course, you know what you are doing :) ##########################
--VERSION=9.8
+-VERSION=10.2
-+VERSION=98
++VERSION=102
  VPATH=@srcdir@
  srcdir=@srcdir@
  @SET_MAKE@
 -FLAGS=@TYPESIZES@ @CFLAGS@
 +FLAGS=@GETOPT_LONG@ @TYPESIZES@ @CFLAGS@
  OPT=@OPT@ $(FLAGS)
  DEBUG=@DEBUG@ $(FLAGS)
  CC=@CC@
-@@ -27,29 +27,29 @@ PWD = $(shell pwd)
+@@ -27,28 +27,28 @@ PWD = $(shell pwd)
- OFILES = main.o report.o header.o buffering_write.o
+ OFILES = main.o report.o header.o buffering_write.o cachetest.o
 -export STATIC
  export VERSION
 -ifeq ($(STATIC),TRUE)
 -	LIBS = interface/libcdda_interface.a paranoia/libcdda_paranoia.a \
--		-static -lm
+-		-static -lm -lrt
 -	LIBDEP = interface/libcdda_interface.a paranoia/libcdda_paranoia.a
 -else
--	LIBS = -lcdda_interface -lcdda_paranoia -lm
+-	LIBS = -lcdda_interface -lcdda_paranoia -lm -lrt
 -	LIBDEP = interface/libcdda_interface.so paranoia/libcdda_paranoia.so
 -endif
 +STLIBS = interface/libcdda_interface.a paranoia/libcdda_paranoia.a -lm
 +STLIBDEP = interface/libcdda_interface.a paranoia/libcdda_paranoia.a
 +SHLIBDEP = interface/libcdda_interface.la paranoia/libcdda_paranoia.la
 +SHLIBS = $(SHLIBDEP) @EXTRA_LIBS@ -lm
 -all:
 +all:
  	cd interface && $(MAKE) all
  	cd paranoia && $(MAKE) all
 -	$(MAKE) cdparanoia CFLAGS="$(OPT)"
 -	strip cdparanoia
 +	$(MAKE) cdparanoia CFLAGS="$(OPT)" LIBS="$(SHLIBS)" LIBDEP="$(SHLIBDEP)"
 -debug:
 +static:
 +	cd interface && $(MAKE) lib
 +	cd paranoia && $(MAKE) lib
 +	$(MAKE) cdparanoia CFLAGS="$(OPT)" LIBS="$(STLIBS)" LIBDEP="$(STLIBDEP)"
++
 -debug:
 +debug:
  	cd interface && $(MAKE) debug
  	cd paranoia && $(MAKE) debug
 -	$(MAKE) cdparanoia CFLAGS="$(DEBUG)" STATIC=TRUE
 +	$(MAKE) cdparanoia CFLAGS="$(DEBUG)" LIBS="$(STLIBS)" LIBDEP="$(STLIBDEP)"
  test:
  	cd interface && $(MAKE) all
-@@ -64,32 +64,20 @@ slib:
+@@ -63,32 +63,20 @@ slib:
  	cd paranoia && $(MAKE) slib
  install:
 -	$(INSTALL) -d -m 0755 $(BINDIR)
--	$(INSTALL) -m 0755 $(srcdir)/cdparanoia $(BINDIR)
+-	$(INSTALL) -m 755 $(srcdir)/cdparanoia $(BINDIR)
 -	$(INSTALL) -d -m 0755 $(MANDIR)
 -	$(INSTALL) -d -m 0755 $(MANDIR)/man1
 -	$(INSTALL) -m 0644 $(srcdir)/cdparanoia.1 $(MANDIR)/man1
 -	$(INSTALL) -d -m 0755 $(INCLUDEDIR)
 -	$(INSTALL) -m 0644 $(srcdir)/paranoia/cdda_paranoia.h $(INCLUDEDIR)
 -	$(INSTALL) -d -m 0755 $(LIBDIR)
 -	$(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.so.0.$(VERSION) $(LIBDIR)
 -	$(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.a $(LIBDIR)
 -	$(INSTALL) -m 0644 $(srcdir)/interface/cdda_interface.h $(INCLUDEDIR)
 -	$(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.so.0.$(VERSION) $(LIBDIR)
 -	$(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.a $(LIBDIR)
 -	$(INSTALL) -m 0644 $(srcdir)/utils.h $(INCLUDEDIR)
 -	ln -fs libcdda_interface.so.0.$(VERSION) \

 @@ -1,515 +1,219 @@
-$NetBSD: patch-cg,v 1.9 2007/10/09 21:26:11 heinz Exp $
+$NetBSD: patch-cg,v 1.10 2009/08/09 16:00:53 drochner Exp $
---- interface/scsi_interface.c.orig	2001-03-24 02:15:46.000000000 +0100
+--- interface/scsi_interface.c.orig	2008-09-11 22:33:30.000000000 +0200
 +++ interface/scsi_interface.c
-@@ -3,6 +3,8 @@
+@@ -12,6 +12,11 @@
-  * Original interface.c Copyright (C) 1994-1997
+ #include "common_interface.h"
-  *            Eissfeldt heiko@colossus.escape.de
+ #include "utils.h"
-  * Current blenderization Copyright (C) 1998-1999 Monty xiphmont@mit.edu
+ #include <time.h>
 + * FreeBSD porting (c) 2003
-+ *	Simon 'corecode' Schubert <corecode@corecode.ath.cx>
++#ifdef __NetBSD__
 +#define SG_MAX_SENSE SENSEBUFLEN
-  * Generic SCSI interface specific code.
++#endif
++
-@@ -23,6 +25,8 @@ static void tweak_SG_buffer(cdrom_drive
+ static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){
-   int table,reserved;
+   struct timespec tv1;
    struct timespec tv2;
@@ -36,6 +41,7 @@ static void tweak_SG_buffer(cdrom_drive
    int table, reserved, cur, err;
    char buffer[256];
 +#if !defined(__FreeBSD__) || defined(__DragonFly__)
 +#ifdef __linux__
-   /* maximum transfer size? */
+   /* SG_SET_RESERVED_SIZE doesn't actually allocate or reserve anything.
-   if(ioctl(d->cdda_fd,SG_GET_RESERVED_SIZE,&reserved)){
+    * what it _does_ do is give you an error if you ask for a value
-     /* Up, guess not. */
+    * larger than q->max_sectors (the length of the device's bio request
-@@ -31,6 +35,10 @@ static void tweak_SG_buffer(cdrom_drive
+@@ -54,6 +60,10 @@ static void tweak_SG_buffer(cdrom_drive
       implement working sg lists with SG_IO devices, so who knows... */
    if (ioctl(d->cdda_fd, SG_GET_SG_TABLESIZE, &table) < 0)
-   if(ioctl(d->cdda_fd,SG_GET_SG_TABLESIZE,&table))table=1;
+     table=1;
 +#else
-+  reserved = 32*1024;	/* ? */
++  reserved = 32*1024;   /* ? */
 +  table = 1;
 +#endif
      int cur;
@@ -53,14 +61,24 @@ static void tweak_SG_buffer(cdrom_drive
      cdmessage(d,buffer);
-+#ifdef __linux__
+   sprintf(buffer,"\tDMA scatter/gather table entries: %d\n\t"
-   /* Disable command queue; we don't need it, no reason to have it on */
+ 	  "table entry size: %d bytes\n\t"
-   reserved=0;
+@@ -93,6 +103,7 @@ static void tweak_SG_buffer(cdrom_drive
-   if(ioctl(d->cdda_fd,SG_SET_COMMAND_Q,&reserved)){
+   cdmessage(d,buffer);
      cdmessage(d,"\tCouldn't disable command queue!  Continuing anyway...\n");
 +#endif
 +#else /* FreeBSD */
 +  d->nsectors = 26;		/* FreeBSD only supports 64K I/O transfer size */
 +  d->bigbuff = d->nsectors * CD_FRAMESIZE_RAW;
 +  sprintf(buffer,"\tSetting default read size to %d sectors (%d bytes).\n\n",
 +      d->nsectors,d->nsectors*CD_FRAMESIZE_RAW);
 +  cdmessage(d,buffer);
 +#endif
+ }
 +#ifdef __linux__
  static void reset_scsi(cdrom_drive *d){
    int arg;
    d->enable_cdda(d,0);
@@ -74,6 +92,44 @@ static void reset_scsi(cdrom_drive *d){
    d->enable_cdda(d,1);
 +#elif defined(__NetBSD__)
 +static void reset_scsi(cdrom_drive *d){
 +  int arg;
 +  d->enable_cdda(d,0);
 +  cdmessage(d,"sending SCSI reset... ");
 +  if(ioctl(d->cdda_fd,CDIOCRESET,&arg))
 +    cdmessage(d,"FAILED: EBUSY\n");
 +  else
 +    cdmessage(d,"OK\n");
 +  d->enable_cdda(d,1);
 +}
 +#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +static void reset_scsi(cdrom_drive *d) {
 +	d->enable_cdda(d,0);
 +	d->ccb->ccb_h.func_code = XPT_RESET_DEV;
 +	d->ccb->ccb_h.timeout = 5000;
 +	cdmessage(d, "sending SCSI reset... ");
 +	if (cam_send_ccb(d->dev, d->ccb)) {
 +		cdmessage(d, "error sending XPT_RESET_DEV CCB");
 +	} else {
 +		if (((d->ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP) ||
 +		    ((d->ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_BDR_SENT))
 +			cdmessage(d,"OK\n");
 +		else
 +			cdmessage(d,"FAILED\n");
 +	}
 +	d->enable_cdda(d,1);
 +}
 +#endif
 +#ifdef __linux__
  static void clear_garbage(cdrom_drive *d){
    fd_set fdset;
    struct timeval tv;
-@@ -104,21 +160,30 @@ static void clear_garbage(cdrom_drive *d
+@@ -123,6 +134,7 @@ static void clear_garbage(cdrom_drive *d
      flag=1;
+   }
+ }
 +#endif
- /* process a complete scsi command. */
+ static int check_sbp_error(const unsigned char status,
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
+ 			   const unsigned char *sbp) {
- static int handle_scsi_cmd(cdrom_drive *d,
+@@ -172,6 +184,7 @@ static int check_sbp_error(const unsigne
- 			   unsigned int cmd_len,
+   return 0;
  			   unsigned int in_size,
  			   unsigned int out_size,
 -			   unsigned char bytefill,
 + 			   unsigned int bfill,
  			   int bytecheck){
 +  unsigned char bytefill = bfill;
    int status = 0;
 +#ifdef __linux__
    struct sg_header *sg_hd=(struct sg_header *)d->sg;
    long writebytes=SG_OFF+cmd_len+in_size;
 +#endif
 +#ifdef __NetBSD__
 +  scsireq_t *sreq = (scsireq_t *)d->sg;
 +#endif
    /* generic scsi device services */
 +#ifdef __linux__
-   /* clear out any possibly preexisting garbage */
+ /* process a complete scsi command. */
-   clear_garbage(d);
+ static int sg2_handle_scsi_cmd(cdrom_drive *d,
  			       unsigned char *cmd,
-@@ -224,11 +289,53 @@ static int handle_scsi_cmd(cdrom_drive *
+@@ -417,6 +430,71 @@ static int sgio_handle_scsi_cmd(cdrom_dr
-     if(errno==0)errno=EIO;
+   errno = 0;
-     return(TR_EREAD);
+   return 0;
+ }
-+#endif	/* __linux__ */
++#endif /* __linux__ */
++
--  if(sg_hd->sense_buffer[0]){
++#ifdef __NetBSD__
-+#ifdef __NetBSD__
++static int nb_handle_scsi_cmd(cdrom_drive *d,
 +			       unsigned char *cmd,
 +			       unsigned int cmd_len,
 +			       unsigned int in_size,
 +			       unsigned int out_size,
 +			       unsigned char bytefill,
 +			       int bytecheck,
 +			       unsigned char *sense_buffer){
 +  int status = 0;
 +  scsireq_t *sreq = (scsireq_t *)d->private->sg_hd;
++
 +  memset(sense_buffer,0,SENSEBUFLEN);
 +  memcpy(d->private->sg_buffer,cmd+cmd_len,in_size);
++
 +  if (in_size && out_size) {
 +    warnx("handle_scsi_cmd: in and out is not supported");
 +    abort();
 +  }
 +  memset(sreq, 0, sizeof(scsireq_t));
 +  sreq->cmdlen = cmd_len;
-+  memcpy(sreq->cmd, d->sg_buffer, cmd_len);
++  memcpy(sreq->cmd, cmd, cmd_len);
 +  if (in_size) {
 +    sreq->flags = SCCMD_WRITE;
-+    sreq->databuf = d->sg_buffer + cmd_len;
++    sreq->databuf = d->private->sg_buffer;
 +    sreq->datalen = in_size;
 +  }
 +  if (out_size) {
 +    sreq->flags = SCCMD_READ;
-+    sreq->databuf = d->sg_buffer;
++    sreq->databuf = d->private->sg_buffer;
 +    sreq->datalen = out_size;
 +    if(bytecheck)
-+      memset(d->sg_buffer, bytefill, out_size);
++      memset(d->private->sg_buffer, bytefill, out_size);
 +  }
 +  sreq->senselen = SENSEBUFLEN;
-+  sreq->timeout = 60000;	/* 60s */
++  sreq->timeout = 60000;        /* 60s */
++
-+  status = ioctl(d->cdda_fd, SCIOCCOMMAND, (void *) sreq);
++  status = timed_ioctl(d, d->cdda_fd, SCIOCCOMMAND, (void *) sreq);
 +  if (status < 0)
 +    return(TR_ILLEGAL);
-+#endif
++  memcpy(sense_buffer,sreq->sense,SENSEBUFLEN);
 +  status = check_sbp_error(sreq->status,sense_buffer);
 +  if (status)
 +    return status;
++
-+#ifdef __linux__
++  if(bytecheck && out_size){
-+  if(sg_hd->sense_buffer[0])
++    long i,flag=0;
 +#endif
 +#ifdef __NetBSD__
 +  if (sreq->sense[0])
 +#endif
 +  {
 +#ifdef __linux__
      char key=sg_hd->sense_buffer[2]&0xf;
      char ASC=sg_hd->sense_buffer[12];
      char ASCQ=sg_hd->sense_buffer[13];
 +#endif
 +#ifdef __NetBSD__
 +    char key = sreq->sense[2]&0xf;
 +    char ASC = sreq->sense[12];
 +    char ASCQ = sreq->sense[13];
 +#endif
      switch(key){
      case 0:
        if(errno==0)errno=EIO;
@@ -266,9 +373,20 @@ static int handle_scsi_cmd(cdrom_drive *
       commands still get through.  Perhaps no data comes back even
       though the target reports success? */
 -  if(bytecheck && in_size+cmd_len<out_size){
 +#ifdef __linux__
 +  if(bytecheck && in_size+cmd_len<out_size)
 +#endif
 +#ifdef __NetBSD__
 +  if(bytecheck && out_size)
 +#endif
 +  {
      long i,flag=0;
 +#ifdef __linux__
      for(i=in_size;i<out_size;i++)
 +#endif
 +#ifdef __NetBSD__
 +    for(i=0;i<out_size;i++)
-+#endif
++      if(d->private->sg_buffer[i]!=bytefill){
-       if(d->sg_buffer[i]!=bytefill){
++	flag=1;
- 	flag=1;
++	break;
- 	break;
++      }
@@ -284,6 +402,83 @@ static int handle_scsi_cmd(cdrom_drive *
-   return(0);
++    if(!flag){
 +      errno=EINVAL;
 +      return(TR_ILLEGAL);
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
++    }
-+static int handle_scsi_cmd(cdrom_drive *d,
++  }
 +			   unsigned int cmd_len,
 +			   unsigned int out_size,
 +			   unsigned int in_size,
 +			   unsigned char bytefill,
 +			   int bytecheck) {
 +	int result;
 +	bzero(&d->ccb->csio, sizeof(d->ccb->csio));
 +	memcpy(d->ccb->csio.cdb_io.cdb_bytes, d->sg_buffer, cmd_len);
 +	if (bytecheck && out_size == 0)
 +		memset(d->sg_buffer, bytefill, in_size);
 +	cam_fill_csio(&d->ccb->csio,
 +	    /* retries */ 0,
 +	    /* cbfcnp */ NULL,
 +	    /* flags */ CAM_DEV_QFRZDIS | (out_size ? CAM_DIR_OUT : CAM_DIR_IN),
 +	    /* tag_action */ MSG_SIMPLE_Q_TAG,
 +	    /* data_ptr */ out_size ? d->sg_buffer + cmd_len : d->sg_buffer,
 +	    /* dxfer_len */ out_size ? out_size : in_size,
 +	    /* sense_len */ SSD_FULL_SIZE,
 +	    /* cdb_len */ cmd_len,
 +	    /* timeout */ 60000);	/* XXX */
 +	if ((result = cam_send_ccb(d->dev, d->ccb)) < 0 ||
 +	    (d->ccb->ccb_h.status & CAM_STATUS_MASK) == 0 /* hack? */)
 +		return TR_EREAD;
 +	if ((d->ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP &&
 +	    (d->ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_SCSI_STATUS_ERROR) {
 +		fprintf (stderr, "\t\terror returned from SCSI command:\n"
 +				 "\t\tccb->ccb_h.status == %d\n", d->ccb->ccb_h.status);
 +		errno = EIO;
 +		return TR_UNKNOWN;
 +	}
 +	if (d->ccb->csio.dxfer_len != in_size) {
 +		errno = EIO;
 +		return TR_EREAD;
 +	}
 +	if (d->ccb->csio.sense_data.error_code & SSD_ERRCODE) {
 +		switch (d->ccb->csio.sense_data.flags & SSD_KEY) {
 +		case SSD_KEY_NO_SENSE:
 +			errno = EIO;
 +			return TR_UNKNOWN;
 +		case SSD_KEY_RECOVERED_ERROR:
 +			break;
 +		case SSD_KEY_NOT_READY:
 +			errno = EBUSY;
 +			return TR_BUSY;
 +		case SSD_KEY_MEDIUM_ERROR:
 +			errno = EIO;
 +			if (d->ccb->csio.sense_data.add_sense_code == 0x0c &&
 +			    d->ccb->csio.sense_data.add_sense_code_qual == 0x09)
 +				return TR_STREAMING;
 +			else
 +				return TR_MEDIUM;
 +		case SSD_KEY_HARDWARE_ERROR:
 +			errno = EIO;
 +			return TR_FAULT;
 +		case SSD_KEY_ILLEGAL_REQUEST:
 +			errno = EINVAL;
 +			return TR_ILLEGAL;
 +		default:
 +			errno = EIO;
 +			return TR_UNKNOWN;
 +		}
 +	}
++
-+	return 0;
++  errno=0;
 +  return 0;
 +}
-+#endif
++#endif /* __NetBSD__ */
  /* Group 1 (10b) command */
- static int mode_sense_atapi(cdrom_drive *d,int size,int page){
+ static int handle_scsi_cmd(cdrom_drive *d,
-@@ -600,6 +795,23 @@ static int scsi_read_toc2 (cdrom_drive *
+ 			   unsigned char *cmd,
-   return(tracks);
+@@ -427,9 +505,14 @@ static int handle_scsi_cmd(cdrom_drive *
  			   int bytecheck,
  			   unsigned char *sense){
 +/* Set operating speed */
 +static int scsi_setspeed(cdrom_drive *d, int speed)
 +{
 +  if (speed == 0)
 +    speed = 0xffff;		/* maximum speed */
 +  else if (speed < 176)
 +    speed *= 176;
 +  memset(d->sg_buffer, 0, 12);
 +  d->sg_buffer[0] = 0xbb;	/* set speed */
 +  d->sg_buffer[2] = speed >> 8;
 +  d->sg_buffer[3] = speed;
 +  d->sg_buffer[4] = -1;
 +  d->sg_buffer[5] = -1;
 +  return handle_scsi_cmd(d, 12, 0, 0, 0, 0);
 +}
  /* These do one 'extra' copy in the name of clean code */
  static int i_read_28 (cdrom_drive *d, void *p, long begin, long sectors){
@@ -833,30 +1045,59 @@ static long scsi_read_map (cdrom_drive *
    while(1) {
      if((err=map(d,(p?buffer:NULL),begin,sectors))){
        if(d->report_all){
 +#ifdef __linux__
- 	struct sg_header *sg_hd=(struct sg_header *)d->sg;
+   if(d->interface == SGIO_SCSI || d->interface == SGIO_SCSI_BUGGY1)
      return sgio_handle_scsi_cmd(d,cmd,cmd_len,in_size,out_size,bytefill,bytecheck,sense);
    return sg2_handle_scsi_cmd(d,cmd,cmd_len,in_size,out_size,bytefill,bytecheck,sense);
 +#endif
 +#ifdef __NetBSD__
-+	scsireq_t *sreq=(scsireq_t *)d->sg;
++  return nb_handle_scsi_cmd(d,cmd,cmd_len,in_size,out_size,bytefill,bytecheck,sense);
 +#endif
  	char b[256];
  	sprintf(b,"scsi_read error: sector=%ld length=%ld retry=%d\n",
  		begin,sectors,retry_count);
-+	fputs(b, stderr);
+@@ -453,6 +536,7 @@ static int test_unit_ready(cdrom_drive *
- 	cdmessage(d,b);
+   return 1;
  	sprintf(b,"                 Sense key: %x ASC: %x ASCQ: %x\n",
 +#ifdef __linux__
  		(int)(sg_hd->sense_buffer[2]&0xf),
  		(int)(sg_hd->sense_buffer[12]),
  		(int)(sg_hd->sense_buffer[13]));
 +#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +		d->ccb->csio.sense_data.flags & SSD_KEY,
 +		d->ccb->csio.sense_data.add_sense_code,
 +		d->ccb->csio.sense_data.add_sense_code_qual);
 +#elif defined(__NetBSD__)
 +		(int)(sreq->sense[2]&0xf),
 +		(int)(sreq->sense[12]),
 +		(int)(sreq->sense[13]));
 +#endif
 +	fputs(b, stderr);
  	cdmessage(d,b);
  	sprintf(b,"                 Transport error: %s\n",strerror_tr[err]);
 +	fputs(b, stderr);
  	cdmessage(d,b);
  	sprintf(b,"                 System error: %s\n",strerror(errno));
 +	fputs(b, stderr);
  	cdmessage(d,b);
 +#if !defined(__FreeBSD__) && !defined(__DragonFly__)
  	fprintf(stderr,"scsi_read error: sector=%ld length=%ld retry=%d\n",
  		begin,sectors,retry_count);
  	fprintf(stderr,"                 Sense key: %x ASC: %x ASCQ: %x\n",
 +#ifdef __linux__
- 		(int)(sg_hd->sense_buffer[2]&0xf),
+ static void reset_scsi(cdrom_drive *d){
- 		(int)(sg_hd->sense_buffer[12]),
+   int arg,tries=0;
--		(int)(sg_hd->sense_buffer[13]));
+   d->enable_cdda(d,0);
-+		(int)(sg_hd->sense_buffer[13])
+@@ -471,6 +555,22 @@ static void reset_scsi(cdrom_drive *d){
    d->enable_cdda(d,1);
+ }
 +#endif
++
 +#ifdef __NetBSD__
-+		(int)(sreq->sense[2]&0xf),
++static void reset_scsi(cdrom_drive *d){
-+		(int)(sreq->sense[12]),
++  int arg;
-+		(int)(sreq->sense[13])
++  d->enable_cdda(d,0);
 +#endif
-+		);
++  cdmessage(d,"sending SCSI reset... ");
- 	fprintf(stderr,"                 Transport error: %s\n",strerror_tr[err]);
++  if(ioctl(d->cdda_fd,CDIOCRESET,&arg))
- 	fprintf(stderr,"                 System error: %s\n",strerror(errno));
++    cdmessage(d,"FAILED: EBUSY\n");
 +  else
 +    cdmessage(d,"OK\n");
++
 +  d->enable_cdda(d,1);
 +}
 +#endif
-       if(!d->error_retry)return(-7);
+ static int mode_sense_atapi(cdrom_drive *d,int size,int page){
-@@ -1307,22 +1548,45 @@ static void check_fua_bit(cdrom_drive *d
+   unsigned char sense[SG_MAX_SENSE];
-   return;
+@@ -1587,6 +1687,7 @@ static void check_cache(cdrom_drive *d){
+   }
+ }
 +#if !defined(__FreeBSD__) && !defined(__DragonFly__)
  static int check_atapi(cdrom_drive *d){
 +#ifdef __linux__
  static int check_atapi(cdrom_drive *d){
    int atapiret=-1;
-+#endif
+   int fd = d->cdda_fd; /* check the device we'll actually be using to read */
-+#ifdef __NetBSD__
+@@ -1616,7 +1717,32 @@ static int check_atapi(cdrom_drive *d){
 +  struct scsi_addr scaddr;
 +#endif
    int fd = d->cdda_fd; /* this is the correct fd (not ioctl_fd), as the
  			  generic device is the device we need to check */
    cdmessage(d,"\nChecking for SCSI emulation...\n");
--  if (ioctl(fd,SG_EMULATED_HOST,&atapiret)){
+     return(d->is_atapi);
 +#ifdef __linux__
-+  if (ioctl(fd,SG_EMULATED_HOST,&atapiret))
+-}
-+#endif
++}
 +#ifdef __NetBSD__
 +  if(ioctl(fd,SCIOCIDENTIFY,&scaddr))
 +#endif
 +  {
      cderror(d,"\tSG_EMULATED_HOST ioctl() failed!\n");
      return(-1);
    } else {
 -    if(atapiret==1){
 +#ifdef __linux__
 +    if(atapiret==1)
 +#endif
 +#ifdef __NetBSD__
 +    if(scaddr.type == TYPE_ATAPI)
 +#endif
 +    {
 +#ifdef __linux__
        cdmessage(d,"\tDrive is ATAPI (using SCSI host adaptor emulation)\n");
        /* Disable kernel SCSI command translation layer for access through sg */
        if (ioctl(fd,SG_SET_TRANSFORM,0))
  	cderror(d,"\tCouldn't disable kernel command translation layer\n");
 +#endif
++
 +#ifdef __NetBSD__
 +static int check_atapi(cdrom_drive *d){
 +  struct scsi_addr scaddr;
 +  int fd = d->cdda_fd; /* check the device we'll actually be using to read */
++
 +  cdmessage(d,"\nChecking for SCSI emulation...\n");
++
 +  if (ioctl(fd,SCIOCIDENTIFY,&scaddr)){
 +    cderror(d,"\tSG_EMULATED_HOST ioctl() failed!\n");
 +    return(-1);
 +  } else {
 +    if(scaddr.type == TYPE_ATAPI){
 +      cdmessage(d,"\tDrive is ATAPI\n");
-+#endif
++      d->is_atapi=1;
-       d->is_atapi=1;
++    }else{
-     }else{
++      cdmessage(d,"\tDrive is SCSI\n");
-       cdmessage(d,"\tDrive is SCSI\n");
++      d->is_atapi=0;
-@@ -1332,6 +1596,46 @@ static int check_atapi(cdrom_drive *d){
++    }
      return(d->is_atapi);
 +    return(d->is_atapi);
 +  }
 +#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +static int
 +check_atapi(cdrom_drive *d)
 +{
 +	bzero(&(&d->ccb->ccb_h)[1], sizeof(d->ccb->cpi) - sizeof(d->ccb->ccb_h));
 +	d->ccb->ccb_h.func_code = XPT_PATH_INQ;
 +	cdmessage(d, "\nChecking for ATAPICAM...\n");
 +	if (cam_send_ccb(d->dev, d->ccb) < 0) {
 +		cderror(d, "\terror sending XPT_PATH_INQ CCB: ");
 +		cderror(d, cam_errbuf);
 +		cderror(d, "\n");
 +		return -1;
 +	}
 +	if ((d->ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
 +		cderror(d, "\tXPT_PATH_INQ CCB failed: ");
 +		cderror(d, cam_errbuf);
 +		cderror(d, "\n");
 +		return -1;
 +	}
 +	/*
 +	 * if the bus device name is `ata', we're (obviously)
 +	 * running ATAPICAM.
 +	 */
 +	if (strncmp(d->ccb->cpi.dev_name, "ata", 3) == 0) {
 +		cdmessage(d, "\tDrive is ATAPI (using ATAPICAM)\n");
 +		d->is_atapi = 1;
 +	} else {
 +		cdmessage(d, "\tDrive is SCSI\n");
 +		d->is_atapi = 0;
 +	}
 +	return d->is_atapi;
 +}
 +#endif
  static int check_mmc(cdrom_drive *d){
-   char *b;
+   unsigned char *b;
@@ -1379,6 +1683,7 @@ static void check_exceptions(cdrom_drive
 +#if !defined(__FreeBSD__) && !defined(__DragonFly__)
  /* request vendor brand and model */
  unsigned char *scsi_inquiry(cdrom_drive *d){
    memcpy(d->sg_buffer,(char[]){ 0x12,0,0,0,56,0},6);
@@ -1389,6 +1694,7 @@ unsigned char *scsi_inquiry(cdrom_drive
    return (d->sg_buffer);
 +#endif
  int scsi_init_drive(cdrom_drive *d){
@@ -1434,7 +1740,7 @@ int scsi_init_drive(cdrom_drive *d){
    d->read_toc = (!memcmp(d->drive_model, "IMS", 3) && !d->is_atapi) ? scsi_read_toc2 :
      scsi_read_toc;
 -  d->set_speed = NULL;
 +  d->set_speed = scsi_setspeed;
    if(!d->is_atapi){
@@ -1458,8 +1764,12 @@ int scsi_init_drive(cdrom_drive *d){
    check_fua_bit(d);
    d->error_retry=1;
 +#if !defined(__FreeBSD__) && !defined(__DragonFly__)
    d->sg=realloc(d->sg,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128);
    d->sg_buffer=d->sg+SG_OFF;
 +#else
 +  d->sg_buffer = realloc(d->sg_buffer, d->nsectors * CD_FRAMESIZE_RAW);
 +#endif
    d->report_all=1;
    return(0);

 @@ -1,58 +1,59 @@
-$NetBSD: patch-ca,v 1.7 2009/05/19 00:36:06 dholland Exp $
+$NetBSD: patch-ca,v 1.8 2009/08/09 16:00:53 drochner Exp $
---- interface/Makefile.in.orig	1999-12-13 20:27:59.000000000 -0800
+--- interface/Makefile.in.orig	2008-08-21 18:08:54.000000000 +0200
 +++ interface/Makefile.in
 @@ -18,12 +18,10 @@ RANLIB=@RANLIB@
- LIBS = -lm
+ LIBS = -lm -lrt
  CPPFLAGS+=-D_REENTRANT
 -OFILES = scan_devices.o	common_interface.o cooked_interface.o interface.o\
 -	scsi_interface.o smallft.o toc.o test_interface.o
 +OFILES = scan_devices.o	common_interface.o interface.o\
 +	smallft.o toc.o test_interface.o @EXTRA_OBJS@
 -export VERSION
+-
 -all: lib slib
 +all: slib
  debug:
  	$(MAKE) libcdda_interface.a CFLAGS="$(DEBUG)"
 @@ -32,26 +30,24 @@ lib:
  	$(MAKE) libcdda_interface.a CFLAGS="$(OPT)"
  slib:
 -	$(MAKE) lessmessy
 -	$(MAKE) libcdda_interface.so CFLAGS="$(OPT) -fpic"
 -	[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so libcdda_interface.so.0
 +	$(MAKE) libcdda_interface.la VERSION=$(VERSION) CFLAGS="$(OPT)"
- test:
+-test:
 +test:
 +	$(MAKE) lessmessy
  	$(MAKE) libcdda_interface.a CFLAGS="$(DEBUG)"
  	$(CC) $(DEBUG) -c test.c
 -	$(LD) $(DEBUG) test.o $(LDFLAGS) -o cdda_test $(LIBS) libcdda_interface.a
 +	$(LIBTOOL) --mode=link $(LD) $(DEBUG) test.o $(LDFLAGS) -o cdda_test $(LIBS) libcdda_interface.la
++
 +libcdda_interface.la: 	$(OFILES)
 +	$(LIBTOOL) --mode=link $(CC) -o libcdda_interface.la $(OFILES:.o=.lo) \
 +	    -version-info 1:0 -rpath $(PREFIX)/lib $(LDFLAGS)
++
-+libcdda_interface.a: 	libcdda_interface.la
++libcdda_interface.a:	libcdda_interface.la
 -libcdda_interface.a: 	$(OFILES)
 -	$(AR) -r libcdda_interface.a $(OFILES)
 -	$(RANLIB) libcdda_interface.a
+-
 -libcdda_interface.so: 	$(OFILES)
--	$(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES)
+-	$(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS)
 -	[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so.0
 -	[ -e libcdda_interface.so ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so
-+libcdda_interface.so: 	libcdda_interface.la
++libcdda_interface.so:	libcdda_interface.la
  .c.o:
 -	$(CC) $(CFLAGS) -c $<
 +	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
  lessmessy:
  	-rm  -f *.o core *~ *.out

 @@ -1,48 +1,52 @@
-$NetBSD: patch-ae,v 1.6 2009/05/17 21:29:34 dholland Exp $
+$NetBSD: patch-ae,v 1.7 2009/08/09 16:00:53 drochner Exp $
---- main.c.orig	2001-03-25 22:44:50.000000000 -0500
+--- main.c.orig	2008-09-11 23:11:02.000000000 +0200
-+++ main.c	2009-05-17 17:20:20.000000000 -0400
++++ main.c
-@@ -49,7 +49,9 @@
+@@ -25,7 +25,9 @@
  #include <unistd.h>
  #include <string.h>
  #include <fcntl.h>
 +#ifdef GETOPT_LONG
  #include <getopt.h>
 +#endif
  #include <errno.h>
  #include <math.h>
  #include <sys/time.h>
-@@ -231,6 +233,7 @@ VERSION"\n"
+@@ -204,6 +206,7 @@ VERSION"\n"
  "  cdparanoia [options] <span> [outfile]\n\n"
  "OPTIONS:\n"
 +#ifdef GETOPT_LONG
- "  -v --verbose                    : extra verbose operation\n"
+ "  -A --analyze-drive              : run and log a complete analysis of drive\n"
- "  -q --quiet                      : quiet operation\n"
+ "                                    caching, timing and reading behavior;\n"
- "  -e --stderr-progress            : force output of progress information to\n"
+ "                                    verifies that cdparanoia is correctly\n"
-@@ -256,9 +259,11 @@ VERSION"\n"
+@@ -239,6 +242,7 @@ VERSION"\n"
  "                                    to n sectors\n"
  "  -o --force-search-overlap  <n>  : force minimum overlap search during\n"
  "                                    verification to n sectors\n"
 +#if !(defined(__APPLE__) && defined(__MACH__))
  "  -d --force-cdrom-device   <dev> : use specified device; disallow \n"
  "                                    autosense\n"
- "  -g --force-generic-device <dev> : use specified generic scsi device\n"
+ "  -k --force-cooked-device  <dev> : use specified cdrom device and force\n"
-+#endif
+@@ -248,6 +252,7 @@ VERSION"\n"
- "  -S --force-read-speed <n>       : read from device at specified speed\n"
+ "  -g --force-generic-device <dev> : use specified generic scsi device and\n"
- "  -t --toc-offset <n>             : Add <n> sectors to the values reported\n"
+ "                                    force use of the old SG kernel\n"
- "                                    when addressing tracks. May be negative\n"
+ "                                    interface. -g cannot be used with -k.\n"
-@@ -276,6 +281,52 @@ VERSION"\n"
++#endif
  "  -S --force-read-speed <n>       : read from device at specified speed; by\n"
  "                                    default, cdparanoia sets drive to full\n"
  "                                    speed.\n"
@@ -267,6 +272,52 @@ VERSION"\n"
  "  -Z --disable-paranoia           : disable all paranoia checking\n"
  "  -Y --disable-extra-paranoia     : only do cdda2wav-style overlap checking\n"
  "  -X --abort-on-skip              : abort on imperfect reads/skips\n\n"
 +#else
 +"  -v         : extra verbose operation\n"
 +"  -q         : quiet operation\n"
 +"  -e         : force output of progress information to\n"
 +"               stderr (for wrapper scripts)\n"
 +"  -V         : print version info and quit\n"
 +"  -Q         : autosense drive, query disc and quit\n"
 +"  -B         : 'batch' mode (saves each track to a seperate file.\n"
 +"  -s         : do an exhaustive search for drive\n"
 +"  -h         : print help\n\n"
 @@ -75,105 +79,96 @@ $NetBSD: patch-ae,v 1.6 2009/05/17 21:29
 +"  -O <n>     : Add <n> samples to the offset when\n"
 +"               reading data.  May be negative.\n"
 +"  -z[=n]     : never accept any less than perfect\n"
 +"               data reconstruction (don't allow 'V's)\n"
 +"               but if [n] is given, skip after [n]\n"
 +"               retries without progress.\n"
 +"  -Z         : disable all paranoia checking\n"
 +"  -Y         : only do cdda2wav-style overlap checking\n"
 +"  -X         : abort on imperfect reads/skips\n\n"
 +#endif
  "OUTPUT SMILIES:\n"
  "  :-)   Normal operation, low/no jitter\n"
-@@ -376,7 +427,7 @@ static void callback(long inpos, int fun
+@@ -606,6 +657,7 @@ static void callback(long inpos, int fun
    int graph=30;
    char buffer[256];
    static long c_sector=0,v_sector=0;
 -  static char dispcache[30]="                              ";
 +  static char dispcache[30 + 1]="                              ";
    static int last=0;
    static long lasttime=0;
    long sector,osector=0;
@@ -587,6 +638,7 @@ static void callback(long inpos, int fun
- const char *optstring = "escCn:o:O:d:g:S:prRwafvqVQhZz::YXWBi:Tt:";
+ const char *optstring = "escCn:o:O:d:g:k:S:prRwafvqVQhZz::YXWBi:Tt:l::L::A";
 +#ifdef GETOPT_LONG
  struct option options [] = {
  	{"stderr-progress",no_argument,NULL,'e'},
  	{"search-for-drive",no_argument,NULL,'s'},
-@@ -621,6 +673,7 @@ struct option options [] = {
+@@ -644,6 +696,7 @@ struct option options [] = {
  	{NULL,0,NULL,0}
  };
 +#endif
  long blocking_write(int outf, char *buffer, long num){
    long words=0,temp;
-@@ -673,7 +726,12 @@ int main(int argc,char *argv[]){
+@@ -703,7 +756,12 @@ int main(int argc,char *argv[]){
    atexit(cleanup);
 -  while((c=getopt_long(argc,argv,optstring,options,&long_option_index))!=EOF){
 +#ifdef GETOPT_LONG
 +  while((c=getopt_long(argc,argv,optstring,options,&long_option_index))!=EOF)
 +#else
 +  while((c=getopt(argc,argv,optstring))!=EOF)
 +#endif
 +  {
      switch(c){
      case 'B':
        batch=1;
-@@ -690,6 +748,7 @@ int main(int argc,char *argv[]){
+@@ -720,6 +778,7 @@ int main(int argc,char *argv[]){
      case 'o':
        force_cdrom_overlap=atoi(optarg);
        break;
 +#if !(defined(__APPLE__) && defined(__MACH__))
      case 'd':
        if(force_cdrom_device)free(force_cdrom_device);
        force_cdrom_device=copystring(optarg);
-@@ -698,6 +757,7 @@ int main(int argc,char *argv[]){
+@@ -733,6 +792,7 @@ int main(int argc,char *argv[]){
        if(force_generic_device)free(force_generic_device);
        force_generic_device=copystring(optarg);
        break;
 +#endif
-     case 'S':
+     case 'k':
-       force_cdrom_speed=atoi(optarg);
+       if(force_generic_device || force_cdrom_device){
-       break;
+ 	report("-k option incompatable with -d and -g\n");
-@@ -811,6 +871,18 @@ int main(int argc,char *argv[]){
+@@ -939,6 +999,18 @@ int main(int argc,char *argv[]){
    /* Query the cdrom/disc; we may need to override some settings */
 +#if defined(__APPLE__) && defined(__MACH__)
 +  d=cdda_find_a_cdrom(verbose,NULL);
 +#else
 +#ifndef __linux__	/* XXX */
 +#ifndef __NetBSD__ /* XXX: is this needed? */
 +  if (!force_generic_device)
 +    errx(1, "-g option is currently required by the NetBSD pkg version");
 +#endif
 +  if (!force_cdrom_device)
 +    force_cdrom_device=copystring(force_generic_device);
 +#endif
++
-   if(force_generic_device)
+   if(force_cooked_device){
-     d=cdda_identify_scsi(force_generic_device,force_cdrom_device,verbose,NULL);
+     d=cdda_identify_cooked(force_cooked_device,verbose,NULL);
-   else
+   }else if(force_generic_device)
-@@ -841,6 +913,7 @@ int main(int argc,char *argv[]){
+@@ -971,6 +1043,7 @@ int main(int argc,char *argv[]){
- 	    report("");
+ 	    report(" ");
+ 	}
+       }
 +#endif /* __APPLE__ && __DARWIN__ */
    if(!d){
      if(!verbose)
-@@ -878,7 +951,9 @@ int main(int argc,char *argv[]){
+@@ -1005,7 +1078,9 @@ int main(int argc,char *argv[]){
- 	      "ignoring preset and autosense",force_cdrom_sectors);
+     report("Forcing default to read %d sectors; "
-       report(buffer);
+ 	   "ignoring preset and autosense",force_cdrom_sectors);
-       d->nsectors=force_cdrom_sectors;
+     d->nsectors=force_cdrom_sectors;
 +#if !(defined(__APPLE__) && defined(__MACH__))
-       d->bigbuff=force_cdrom_sectors*CD_FRAMESIZE_RAW;
+     d->bigbuff=force_cdrom_sectors*CD_FRAMESIZE_RAW;
 +#endif
+   }
    if(force_cdrom_overlap!=-1){
      if(force_cdrom_overlap<0 || force_cdrom_overlap>75){

 @@ -1,16 +1,16 @@
-$NetBSD: patch-cc,v 1.6 2006/09/03 17:13:30 ben Exp $
+$NetBSD: patch-cc,v 1.7 2009/08/09 16:00:53 drochner Exp $
---- interface/utils.h.orig	2000-04-19 15:41:04.000000000 -0700
+--- interface/utils.h.orig	2008-08-14 15:56:20.000000000 +0200
 +++ interface/utils.h
 @@ -1,4 +1,23 @@
 +#ifdef __linux__
  #include <endian.h>
 +#endif
 +#ifdef __NetBSD__
 +#include <sys/param.h>
 +#if __NetBSD_Version__ >= 104010000
 +#include <sys/endian.h>
 +#else
 +#include <machine/endian.h>
 +#include <machine/bswap.h>
 +#endif
 @@ -44,45 +44,13 @@ $NetBSD: patch-cc,v 1.6 2006/09/03 17:13
+ }
  static inline int16_t swap16(int16_t x){
 +#if defined(__APPLE__) && defined(__MACH__)
 +  return((((uint16_t)x & 0x00ffU) <<  8) |
 +	 (((uint16_t)x & 0xff00U) >>  8));
 +#else
    return((((u_int16_t)x & 0x00ffU) <<  8) |
  	 (((u_int16_t)x & 0xff00U) >>  8));
 +#endif
+ }
  #if BYTE_ORDER == LITTLE_ENDIAN
@@ -112,6 +143,7 @@ static void cderror(cdrom_drive *d,const
        break;
      case CDDA_MESSAGE_FORGETIT:
      default:
 +      break;
@@ -127,6 +159,7 @@ static void cdmessage(cdrom_drive *d,con
        break;
      case CDDA_MESSAGE_FORGETIT:
      default:
 +      break;
@@ -169,6 +202,7 @@ static void idperror(int messagedest,cha
        break;
      case CDDA_MESSAGE_FORGETIT:
      default:
 +      break;
    if(malloced)free(buffer);
@@ -205,6 +239,7 @@ static void idmessage(int messagedest,ch
        break;
      case CDDA_MESSAGE_FORGETIT:
      default:
 +      break;
    if(malloced)free(buffer);

 @@ -1,50 +1,50 @@
-$NetBSD: patch-ba,v 1.3 2006/03/07 06:29:03 joerg Exp $
+$NetBSD: patch-ba,v 1.4 2009/08/09 16:00:53 drochner Exp $
---- paranoia/Makefile.in.orig	Tue Dec 14 04:28:04 1999
+--- paranoia/Makefile.in.orig	2008-09-04 21:02:47.000000000 +0200
 +++ paranoia/Makefile.in
 @@ -21,10 +21,9 @@ CPPFLAGS+=-D_REENTRANT
  OFILES = paranoia.o p_block.o overlap.o gap.o isort.o
  #TFILES = isort.t gap.t p_block.t paranoia.t
 -LIBS = ../interface/libcdda_interface.a -lm
 -export VERSION
 +LIBS = ../interface/libcdda_interface.la -lm
 -all: lib slib
 +all: slib
  debug:
  	$(MAKE) libcdda_paranoia.a CFLAGS="$(DEBUG)"
 @@ -33,23 +32,21 @@ lib:
  	$(MAKE) libcdda_paranoia.a CFLAGS="$(OPT)"
  slib:
 -	$(MAKE) lessmessy
 -	$(MAKE) libcdda_paranoia.so CFLAGS="$(OPT) -fpic"
 +	$(MAKE) libcdda_paranoia.so VERSION=$(VERSION) CFLAGS="$(OPT)"
  #test:	$(TFILES)
+ #
 -libcdda_paranoia.a: 	$(OFILES)
 -	$(AR) -r libcdda_paranoia.a $(OFILES)
 -	$(RANLIB) libcdda_paranoia.a
+-
 -libcdda_paranoia.so: 	$(OFILES)
--	$(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES)
+-	$(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface
 -	[ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0
 -	[ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so
 +libcdda_paranoia.la: 	$(OFILES)
 +	$(LIBTOOL) --mode=link $(CC) -o libcdda_paranoia.la $(OFILES:.o=.lo) \
-+	    -version-info 1:0 -rpath $(PREFIX)/lib
++	    -version-info 1:0 -rpath $(PREFIX)/lib $(LIBS)
++
-+libcdda_paranoia.a: 	libcdda_paranoia.la
++libcdda_paranoia.a:	libcdda_paranoia.la
++
-+libcdda_paranoia.so: 	libcdda_paranoia.la
++libcdda_paranoia.so:	libcdda_paranoia.la
  .c.o:
 -	$(CC) $(CFLAGS) -c $<
 +	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
  .c.t:
  	$(CC) -g -DTEST $(DEBUG) -o $@ $< $(LIBS)

 @@ -1,46 +1,50 @@
-$NetBSD: patch-ch,v 1.3 2006/09/03 17:13:30 ben Exp $
+$NetBSD: patch-ch,v 1.4 2009/08/09 16:00:53 drochner Exp $
---- interface/cdda_interface.h.orig	2001-03-23 17:15:46.000000000 -0800
+--- interface/cdda_interface.h.orig	2008-09-11 12:43:52.000000000 +0200
 +++ interface/cdda_interface.h
-@@ -18,9 +18,19 @@
+@@ -18,9 +18,23 @@
  #endif
  #define CD_FRAMESAMPLES (CD_FRAMESIZE_RAW / 4)
 +#if defined(__APPLE__) && defined(__MACH__)
 +#include <IOKit/IOKitLib.h>
 +#include <IOKit/storage/IOCDTypes.h>
 +#endif
++
  #include <sys/types.h>
  #include <signal.h>
 +#if defined(__FreeBSD__) || defined(__DragonFly__)
 +#include <stdio.h>
 +#include <camlib.h>
 +#endif
++
 +#ifdef __NetBSD__
 +#define ENOMEDIUM 12345
 +#endif
++
  #define MAXTRK 100
  typedef struct TOC {	/* structure of table of contents */
-@@ -33,6 +43,7 @@ typedef struct TOC {	/* structure of tab
+@@ -35,6 +49,7 @@ typedef struct TOC {	/* structure of tab
- #define GENERIC_SCSI	0
+ #define TEST_INTERFACE	 2
- #define COOKED_IOCTL	1
+ #define SGIO_SCSI	 3
- #define TEST_INTERFACE	2
+ #define SGIO_SCSI_BUGGY1 4
-+#define OSX_IOKIT	3
++#define OSX_IOKIT        5
  #define CDDA_MESSAGE_FORGETIT 0
  #define CDDA_MESSAGE_PRINTIT 1
-@@ -47,13 +58,27 @@ typedef struct cdrom_drive{
+@@ -49,13 +64,27 @@ typedef struct cdrom_drive{
    int opened; /* This struct may just represent a candidate for opening */
    char *cdda_device_name;
 +#if !defined(__FreeBSD__) && !defined(__DragonFly__)
    char *ioctl_device_name;
    int cdda_fd;
 -  int ioctl_fd;
 -  char *drive_model;
    int drive_type;
 +#else
 +  struct cam_device *dev;
 @@ -50,27 +54,13 @@ $NetBSD: patch-ch,v 1.3 2006/09/03 17:13
 +#if defined(__APPLE__) && defined(__MACH__)
 +  io_object_t io;
 +  int fd;
 +  char *dev;
 +  CDTOC *raw_toc;
 +  int descriptor_count;
 +#endif
++
 +  int ioctl_fd;
 +  char *drive_model;
    int interface;
    int bigendianp;
    int nsectors;
@@ -83,9 +108,13 @@ typedef struct cdrom_drive{
    int is_mmc;
    /* SCSI command buffer and offset pointers */
 +#if !defined(__FreeBSD__) && !defined(__DragonFly__)
    unsigned char *sg;
    unsigned char *sg_buffer;
    unsigned char inqbytes[4];
 +#else
 +  unsigned char *sg_buffer;
 +#endif
    /* Scsi parameters and state */
    unsigned char density;

 @@ -1,55 +1,52 @@
-$NetBSD: patch-cb,v 1.5 2006/09/03 17:13:30 ben Exp $
+$NetBSD: patch-cb,v 1.6 2009/08/09 16:00:53 drochner Exp $
---- interface/low_interface.h.orig	2001-03-25 22:12:11.000000000 -0800
+--- interface/low_interface.h.orig	2008-09-11 12:43:52.000000000 +0200
 +++ interface/low_interface.h
-@@ -25,6 +25,7 @@
+@@ -26,6 +26,7 @@
  #include <sys/time.h>
  #include <sys/types.h>
 +#ifdef __linux__
  #include <linux/major.h>
  #include <linux/version.h>
-@@ -48,12 +49,32 @@
+@@ -54,6 +55,20 @@
  #include <linux/cdrom.h>
  #include <linux/major.h>
 +#elif defined(__FreeBSD__) || defined(__DragonFly__)
++
 +#include <sys/cdio.h>
 +#include <sys/cdrio.h>
++
 +#include <cam/scsi/scsi_message.h>
 +#include <camlib.h>
++
 +#elif defined(__NetBSD__)
++
 +#include <sys/scsiio.h>
 +#include <sys/cdio.h>
 +#endif
++
  #include "cdda_interface.h"
  #ifndef SG_EMULATED_HOST
@@ -107,10 +122,18 @@ struct cdda_private_data {
  #define MAX_RETRIES 8
  #define MAX_BIG_BUFF_SIZE 65536
  #define MIN_BIG_BUFF_SIZE 4096
 +#ifdef __linux__
  #define SG_OFF sizeof(struct sg_header)
 +#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +#define SG_OFF (0)
 +#elif defined(__NetBSD__)
 +#define SG_OFF sizeof(scsireq_t)
 +#endif
  #ifndef SG_EMULATED_HOST
  /* old kernel version; the check for the ioctl is still runtime, this
@@ -64,7 +85,9 @@
  #endif
  extern int  cooked_init_drive (cdrom_drive *d);
 +#if !defined(__FreeBSD__) && !defined(__DragonFly__)
  extern unsigned char *scsi_inquiry (cdrom_drive *d);
 +#endif
  extern int  scsi_init_drive (cdrom_drive *d);
  #ifdef CDDA_TEST
  extern int  test_init_drive (cdrom_drive *d);

 @@ -1,39 +1,39 @@
-$NetBSD: patch-ce,v 1.5 2007/10/09 21:26:11 heinz Exp $
+$NetBSD: patch-ce,v 1.6 2009/08/09 16:00:53 drochner Exp $
---- interface/cooked_interface.c.orig	2000-04-20 00:41:04.000000000 +0200
+--- interface/cooked_interface.c.orig	2008-08-26 11:55:22.000000000 +0200
 +++ interface/cooked_interface.c
 @@ -1,6 +1,8 @@
  /******************************************************************
-  * CopyPolicy: GNU Public License 2 applies
+  * CopyPolicy: GNU Lesser General Public License 2.1 applies
   * Copyright (C) Monty xiphmont@mit.edu
 + * FreeBSD porting (c) 2003
 + *	Simon 'corecode' Schubert <corecode@corecode.ath.cx>
+  *
   * CDROM code specific to the cooked ioctl interface
+  *
-@@ -10,9 +12,11 @@
+@@ -24,9 +26,11 @@ static int timed_ioctl(cdrom_drive *d, i
- #include "common_interface.h"
+   return ret2;
  #include "utils.h"
 +#if !defined(__FreeBSD__) && !defined(__DragonFly__)
  static int cooked_readtoc (cdrom_drive *d){
    int i;
    int tracks;
 +#ifdef __linux__
    struct cdrom_tochdr hdr;
    struct cdrom_tocentry entry;
-@@ -52,6 +56,45 @@ static int cooked_readtoc (cdrom_drive *
+@@ -66,6 +70,45 @@ static int cooked_readtoc (cdrom_drive *
    d->disc_toc[i].dwStartSector = entry.cdte_addr.lba;
    tracks=hdr.cdth_trk1+1;
 +#endif
++
 +#ifdef __NetBSD__
 +  struct ioc_read_toc_entry hdr;
 +  struct cd_toc_entry entries[MAXTRK + 1];	/* + 1 for leadout */
++
 +  hdr.address_format = CD_LBA_FORMAT;
 +  hdr.starting_track = 1;
 +  hdr.data_len = sizeof entries;
 +  hdr.data = entries;
 @@ -59,54 +59,54 @@ $NetBSD: patch-ce,v 1.5 2007/10/09 21:26
 +    d->disc_toc[i].dwStartSector = entries[i].addr.lba;
 +    if (entries[i].track == 0) {
 +      cderror(d,"005: Unable to read table of contents entry\n");
 +      return(-5);
 +    }
 +    if (entries[i].track >= 100)
 +      break;	/* leadout */
 +  }
 +  tracks = i;
 +#endif
    d->cd_extra=FixupTOC(d,tracks);
    return(--tracks);  /* without lead-out */
+ }
-@@ -60,10 +103,15 @@ static int cooked_readtoc (cdrom_drive *
+@@ -73,10 +116,15 @@ static int cooked_readtoc (cdrom_drive *
  /* Set operating speed */
  static int cooked_setspeed(cdrom_drive *d, int speed)
+ {
 +#ifdef __linux__
    if(d->ioctl_fd!=-1)
      return ioctl(d->ioctl_fd, CDROM_SELECT_SPEED, speed);
    else
      return 0;
 +#endif
 +#ifdef __NetBSD__
 +  errx(1, "cooked_setspeed: not implemented");
 +#endif
+ }
  /* read 'SectorBurst' adjacent sectors of audio sectors
-@@ -72,6 +120,7 @@ static int cooked_setspeed(cdrom_drive *
+@@ -84,6 +132,7 @@ static int cooked_setspeed(cdrom_drive *
   */
  static long cooked_read (cdrom_drive *d, void *p, long begin, long sectors){
 +#ifdef __linux__
-   int retry_count,err;
+   int retry_count,err,ret=0;
    struct cdrom_read_audio arg;
    char *buffer=(char *)p;
-@@ -127,7 +176,147 @@ static long cooked_read (cdrom_drive *d,
+@@ -155,7 +204,147 @@ static long cooked_read (cdrom_drive *d,
-   } while (err);
+  done:
    if(p==NULL && buffer)free(buffer);
-   return(sectors);
+   return ret;
 +#endif
 +#ifdef __NetBSD__
 +  errx(1, "cooked_read: not implemented");
 +#endif
+ }
 +#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +static int
 +cooked_readtoc(cdrom_drive *d)
 +{
 +	int i;
 +	struct ioc_toc_header hdr;
 +	struct ioc_read_toc_single_entry entry;
++
 @@ -231,43 +231,43 @@ $NetBSD: patch-ce,v 1.5 2007/10/09 21:26
 +				return -7;
 +			}
 +		} else
 +			break;
 +	}
++
 +	return sectors;
 +}
 +#endif
++
  /* hook */
  static int Dummy (cdrom_drive *d,int Switch){
-@@ -191,8 +380,11 @@ static void check_exceptions(cdrom_drive
+@@ -219,8 +408,11 @@ static void check_exceptions(cdrom_drive
  /* set function pointers to use the ioctl routines */
  int cooked_init_drive (cdrom_drive *d){
 +#ifdef __NetBSD__
 +  errx(1, "cooked_init_drive: not implemented");
 +#else
    int ret;
+-
 +#ifdef __linux__
    switch(d->drive_type){
    case MATSUSHITA_CDROM_MAJOR:	/* sbpcd 1 */
    case MATSUSHITA_CDROM2_MAJOR:	/* sbpcd 2 */
-@@ -243,6 +435,9 @@ int cooked_init_drive (cdrom_drive *d){
+@@ -271,6 +463,9 @@ int cooked_init_drive (cdrom_drive *d){
    default:
      d->nsectors=40;
+   }
 +#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +  d->nsectors = 26;	/* FreeBSD only supports 64K I/O transfer size */
 +#endif
    d->enable_cdda = Dummy;
    d->read_audio = cooked_read;
-   d->set_speed = cooked_setspeed;
+   d->read_toc = cooked_readtoc;
-@@ -255,5 +450,6 @@ int cooked_init_drive (cdrom_drive *d){
+@@ -283,5 +478,6 @@ int cooked_init_drive (cdrom_drive *d){
    if((ret=verify_read_command(d)))return(ret);
    d->error_retry=1;
    return(0);
 +#endif
+ }

 @@ -1,36 +1,36 @@
-$NetBSD: patch-cf,v 1.10 2009/05/19 00:36:06 dholland Exp $
+$NetBSD: patch-cf,v 1.11 2009/08/09 16:00:53 drochner Exp $
---- interface/scan_devices.c.orig	2001-03-26 00:44:01.000000000 -0500
+--- interface/scan_devices.c.orig	2008-08-26 11:55:22.000000000 +0200
-+++ interface/scan_devices.c	2009-05-18 20:11:24.000000000 -0400
++++ interface/scan_devices.c
 @@ -1,6 +1,8 @@
  /******************************************************************
-  * CopyPolicy: GNU Public License 2 applies
+  * CopyPolicy: GNU Lesser General Public License 2.1 applies
-  * Copyright (C) 1998 Monty xiphmont@mit.edu
+  * Copyright (C) 1998-2008 Monty xiphmont@mit.edu
 + * FreeBSD porting (c) 2003
 + *	Simon 'corecode' Schubert <corecode@corecode.ath.cx>
+  *
   * Autoscan for or verify presence of a cdrom device
+  *
-@@ -19,6 +21,8 @@
+@@ -22,6 +24,8 @@
  #include "common_interface.h"
  #include "utils.h"
 +#ifdef __linux__
++
  #define MAX_DEV_LEN 20 /* Safe because strings only come from below */
  /* must be absolute paths! */
  static char *scsi_cdrom_prefixes[]={
-@@ -49,11 +53,30 @@ static char *cdrom_devices[]={
+@@ -52,11 +56,30 @@ static char *cdrom_devices[]={
    "/dev/cm206cd",
    "/dev/gscd",
    "/dev/optcd",NULL};
 +#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +static char *cdrom_devices[] = {
 +	"/dev/cd?c",
 +	"/dev/acd?c",
 +	"/dev/wcd?c",
 +	"/dev/mcd?c", NULL};
 +#elif defined(__NetBSD__)
 +static char *cdrom_devices[] = {
 +	"/dev/rcd?c",
 +	"/dev/rcd?d",
 @@ -41,77 +41,81 @@ $NetBSD: patch-cf,v 1.10 2009/05/19 00:3
  /* Functions here look for a cdrom drive; full init of a drive type
     happens in interface.c */
 +#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || (defined(__APPLE__) && defined(__MACH__))
  cdrom_drive *cdda_find_a_cdrom(int messagedest,char **messages){
 +#if defined(__APPLE__) && defined(__MACH__)
 +  cdrom_drive *d = calloc(1, sizeof(cdrom_drive));
 +  d->interface = OSX_IOKIT;
 +  return d;
 +#else
    /* Brute force... */
    int i=0;
-@@ -75,10 +98,12 @@ cdrom_drive *cdda_find_a_cdrom(int messa
+@@ -78,10 +101,12 @@ cdrom_drive *cdda_find_a_cdrom(int messa
  	if((d=cdda_identify(buffer,messagedest,messages)))
  	  return(d);
  	idmessage(messagedest,messages,"",NULL);
 +#ifdef __linux__
  	buffer[pos-(cdrom_devices[i])]=j+97;
  	if((d=cdda_identify(buffer,messagedest,messages)))
  	  return(d);
  	idmessage(messagedest,messages,"",NULL);
 +#endif
+       }
      }else{
        /* Name.  Go for it. */
-@@ -97,8 +122,11 @@ cdrom_drive *cdda_find_a_cdrom(int messa
+@@ -93,11 +118,13 @@ cdrom_drive *cdda_find_a_cdrom(int messa
- 	      temp->pw_name);
+     i++;
+   }
-   return(NULL);
+   idmessage(messagedest,messages,
 -	    "\n\nNo cdrom drives accessible to %s found.\n",
 -	    cuserid(NULL));
 +	    "\n\nNo cdrom drives found.\n", NULL);
 +#endif
    return(NULL);
+ }
 +#endif	/* __linux__ */
 +#if !(defined(__APPLE__) && defined(__MACH__))
  cdrom_drive *cdda_identify(const char *device, int messagedest,char **messages){
    struct stat st;
    cdrom_drive *d=NULL;
-@@ -117,8 +145,14 @@ cdrom_drive *cdda_identify(const char *d
+@@ -119,8 +146,14 @@ cdrom_drive *cdda_identify(const char *d
  #endif
    /* an IDE device may have scsi-ide support, SG_IO support and cooked
       support.  Prefer the SCSI variants, they give the most control */
 +#if defined(__linux__) || defined(__NetBSD__)
-   d=cdda_identify_cooked(device,messagedest,messages);
+   d=cdda_identify_scsi(NULL,device,messagedest,messages);
-   if(!d)d=cdda_identify_scsi(device,NULL,messagedest,messages);
+   if(!d)d=cdda_identify_cooked(device,messagedest,messages);
 +#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +  d = cdda_identify_scsi(device, NULL, messagedest, messages);
 +  if (d == NULL)
 +	d = cdda_identify_cooked(device, messagedest, messages);
 +#endif
  #ifdef CDDA_TEST
    if(!d)d=cdda_identify_test(device,messagedest,messages);
-@@ -146,6 +180,7 @@ char *test_resolve_symlink(const char *f
+@@ -148,6 +181,7 @@ char *test_resolve_symlink(const char *f
  cdrom_drive *cdda_identify_cooked(const char *dev, int messagedest,
  				  char **messages){
 +#ifdef __linux__
    cdrom_drive *d=NULL;
    struct stat st;
-   int fd=-1;
+   int fd=-1, i;
-@@ -273,8 +308,60 @@ cdrom_drive *cdda_identify_cooked(const
+@@ -272,8 +306,60 @@ cdrom_drive *cdda_identify_cooked(const
+   }
    idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description);
    return(d);
 +#elif defined(__NetBSD__)
 +  /* no kernel support for CD-DA */
 +  return NULL;
 +#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +	cdrom_drive *d;
 +	struct stat st;
++
 +	if (stat(dev, &st)) {
 +		idperror(messagedest, messages, "\t\tCould not stat %s", dev);
 +		return NULL;
 +	}
++
 @@ -150,203 +154,210 @@ $NetBSD: patch-cf,v 1.10 2009/05/19 00:3
 +	if (d != NULL) {
 +		if (d->ioctl_fd != -1)
 +			close(d->ioctl_fd);
 +		free(d);
 +	}
 +	return NULL;
 +#endif
+ }
 +#if !defined(__FreeBSD__) || defined(__DragonFly__)
  struct  sg_id {
    long    l1; /* target | lun << 8 | channel << 16 | low_ino << 24 */
    long    l2; /* Unique id */
-@@ -289,12 +376,18 @@ typedef struct scsiid{
+@@ -288,12 +374,18 @@ typedef struct scsiid{
  /* Even *this* isn't as simple as it bloody well should be :-P */
  /* SG has an easy interface, but SCSI overall does not */
  static int get_scsi_id(int fd, scsiid *id){
 +#ifdef __linux__
    struct sg_id argid;
 +#endif
 +#ifdef __NetBSD__
 +  struct scsi_addr argid;
 +#endif
    int busarg;
    /* get the host/id/lun */
    if(fd==-1)return(-1);
 +#ifdef __linux__
    if(ioctl(fd,SCSI_IOCTL_GET_IDLUN,&argid))return(-1);
    id->bus=argid.l2; /* for now */
    id->id=argid.l1&0xff;
-@@ -302,6 +395,13 @@ static int get_scsi_id(int fd, scsiid *i
+@@ -301,6 +393,13 @@ static int get_scsi_id(int fd, scsiid *i
    if(ioctl(fd,SCSI_IOCTL_GET_BUS_NUMBER,&busarg)==0)
      id->bus=busarg;
 +#endif
 +#ifdef __NetBSD__
 +  if(ioctl(fd,SCIOCIDENTIFY,&argid))return(-1);
 +  id->bus=argid.addr.scsi.scbus;
 +  id->id=argid.addr.scsi.target;
 +  id->lun=argid.addr.scsi.lun;
 +#endif
    return(0);
+ }
-@@ -390,6 +490,7 @@ matchfail:
+@@ -400,6 +499,7 @@ matchfail:
    if(dev!=-1)close(dev);
    return(NULL);
+ }
 +#endif
  void strscat(char *a,char *b,int n){
    int i;
-@@ -401,6 +502,7 @@ void strscat(char *a,char *b,int n){
+@@ -411,6 +511,7 @@ void strscat(char *a,char *b,int n){
    strcat(a," ");
+ }
 +#ifdef __linux__
  /* At this point, we're going to punt compatability before SG2, and
     allow only SG2 and SG3 */
  static int verify_SG_version(cdrom_drive *d,int messagedest,
-@@ -430,7 +532,9 @@ static int verify_SG_version(cdrom_drive
+@@ -488,7 +589,9 @@ int check_sgio(const char *device, int m
-   idmessage(messagedest,messages,buffer,"");
+   close(fd);
-   return(major);
+   return 0;
+ }
 +#endif
 +#if defined(__linux__) || defined(__NetBSD__)
- cdrom_drive *cdda_identify_scsi(const char *generic_device,
+ /* scanning is always done by specifying a device name in
- 				const char *ioctl_device, int messagedest,
+    specialized_device; generic_device is only filled when the generic device
- 				char **messages){
+    force option is used, and in that case, use of SG (not SGIO) should indeed be
-@@ -460,6 +564,7 @@ cdrom_drive *cdda_identify_scsi(const ch
+@@ -527,11 +630,13 @@ cdrom_drive *cdda_identify_scsi(const ch
  	       generic_device);
        return(NULL);
+     }
 +#ifdef __linux__
      if((int)(g_st.st_rdev>>8)!=SCSI_GENERIC_MAJOR){
-       if((int)(g_st.st_rdev>>8)!=SCSI_CDROM_MAJOR){
+       idmessage(messagedest,messages,"\t\t%s is not a generic SCSI device",
- 	idmessage(messagedest,messages,"\t\t%s is not a SCSI device",
+ 		generic_device);
@@ -471,6 +576,7 @@ cdrom_drive *cdda_identify_scsi(const ch
  	ioctl_device=temp;
 +#endif
    if(ioctl_device){
      if(stat(ioctl_device,&i_st)){
@@ -478,6 +584,7 @@ cdrom_drive *cdda_identify_scsi(const ch
  	       ioctl_device);
        return(NULL);
+     }
 +#ifdef __linux__
      if((int)(i_st.st_rdev>>8)!=SCSI_CDROM_MAJOR){
        if((int)(i_st.st_rdev>>8)!=SCSI_GENERIC_MAJOR){
  	idmessage(messagedest,messages,"\t\t%s is not a SCSI device",
@@ -489,6 +596,7 @@ cdrom_drive *cdda_identify_scsi(const ch
  	ioctl_device=temp;
 +#endif
+   }
-   /* we need to resolve any symlinks for the lookup code to work */
+   if(specialized_device){
-@@ -505,6 +613,7 @@ cdrom_drive *cdda_identify_scsi(const ch
+@@ -553,6 +658,7 @@ cdrom_drive *cdda_identify_scsi(const ch
      if(specialized_device==NULL)goto cdda_identify_scsi_fail;
+   }
    if(!generic_device || !ioctl_device){
 +#ifdef __linux__
-     if(generic_device){
+   /* sgio is always preferred if it's there, unless user has forced the generic scsi device name */
-       ioctl_device=
+   if(use_sgio){
- 	scsi_match(generic_device,scsi_cdrom_prefixes,
+     if(check_sgio(specialized_device,messagedest,messages)){
-@@ -520,6 +629,12 @@ cdrom_drive *cdda_identify_scsi(const ch
+@@ -562,18 +668,24 @@ cdrom_drive *cdda_identify_scsi(const ch
-       if(!generic_device)
+       use_sgio=0;
  	goto cdda_identify_scsi_fail;
+     }
+   }
 +#else
-+    if(!generic_device)
++  use_sgio=0;
 +      generic_device = strdup(ioctl_device);
 +    else
 +      ioctl_device = strdup(generic_device);
 +#endif
-   idmessage(messagedest,messages,"\t\tgeneric device: %s",generic_device);
+   if(!use_sgio){
@@ -556,6 +671,7 @@ cdrom_drive *cdda_identify_scsi(const ch
      /* was a generic device passed in as the specialized device name? */
      if(specialized_device){
 +#ifdef __linux__
        if((int)(i_st.st_rdev>>8)==SCSI_GENERIC_MAJOR){
  	char *temp=(char *)generic_device;
  	generic_device=specialized_device;
  	specialized_device=temp;
+       }
 +#endif
        if(!generic_device || !specialized_device){
 +#ifdef __linux__
  	if(generic_device){
  	  specialized_device=
  	    scsi_match(generic_device,scsi_cdrom_prefixes,
@@ -589,6 +701,12 @@ cdrom_drive *cdda_identify_scsi(const ch
  	  if(!generic_device)
  	    goto cdda_identify_scsi_fail;
+ 	}
 +#else
 +    if(!generic_device)
 +      generic_device = strdup(specialized_device);
 +    else
 +      specialized_device = strdup(generic_device);
 +#endif
+       }
+     }
@@ -639,6 +757,7 @@ cdrom_drive *cdda_identify_scsi(const ch
      type=(int)(i_st.st_rdev>>8);
      if(!use_sgio){
 +#ifdef __linux__
-     if(type==SCSI_CDROM_MAJOR){
+       if(type==SCSI_CDROM_MAJOR){
-       if (!S_ISBLK(i_st.st_mode)) {
+ 	if (!S_ISBLK(i_st.st_mode)) {
- 	idmessage(messagedest,messages,"\t\tSCSI CDROM device %s not a "
+ 	  idmessage(messagedest,messages,"\t\tSCSI CDROM device %s not a "
-@@ -567,8 +683,10 @@ cdrom_drive *cdda_identify_scsi(const ch
+@@ -650,10 +769,12 @@ cdrom_drive *cdda_identify_scsi(const ch
- 		"major number",ioctl_device);
+ 		  "major number",specialized_device);
-       goto cdda_identify_scsi_fail;
+ 	goto cdda_identify_scsi_fail;
+       }
 +#endif
+     }
+   }
    if(g_fd != -1){
 +#ifdef __linux__
-   if((int)(g_st.st_rdev>>8)==SCSI_GENERIC_MAJOR){
+     if((int)(g_st.st_rdev>>8)==SCSI_GENERIC_MAJOR){
-     if (!S_ISCHR(g_st.st_mode)) {
+       if (!S_ISCHR(g_st.st_mode)) {
-       idmessage(messagedest,messages,"\t\tGeneric SCSI device %s not a "
+ 	idmessage(messagedest,messages,"\t\tGeneric SCSI device %s not a "
-@@ -580,6 +698,7 @@ cdrom_drive *cdda_identify_scsi(const ch
+@@ -665,6 +786,7 @@ cdrom_drive *cdda_identify_scsi(const ch
- 	      "major number",generic_device);
+ 		"major number",generic_device);
-     goto cdda_identify_scsi_fail;
+       goto cdda_identify_scsi_fail;
+     }
 +#endif
+   }
    d=calloc(1,sizeof(cdrom_drive));
-@@ -590,6 +709,7 @@ cdrom_drive *cdda_identify_scsi(const ch
+@@ -685,6 +807,7 @@ cdrom_drive *cdda_identify_scsi(const ch
-   d->bigendianp=-1; /* We don't know yet... */
+     d->private->sg_buffer=(unsigned char *)(d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE));
-   d->nsectors=-1;
+     g_fd=d->cdda_fd=dup(d->ioctl_fd);
    }else{
 +#ifdef __linux__
-   version=verify_SG_version(d,messagedest,messages);
+     version=verify_SG_version(d,messagedest,messages);
-   switch(version){
+     switch(version){
-   case -1:case 0:case 1:
+     case -1:case 0:case 1:
-@@ -599,6 +719,9 @@ cdrom_drive *cdda_identify_scsi(const ch
+@@ -694,6 +817,9 @@ cdrom_drive *cdda_identify_scsi(const ch
-     d->interface=GENERIC_SCSI;
+       d->interface=GENERIC_SCSI;
-     break;
+       break;
+     }
 +#else
 +  d->interface=GENERIC_SCSI;
 +#endif
-   /* malloc our big buffer for scsi commands */
+     /* malloc our big buffer for scsi commands */
-   d->sg=malloc(MAX_BIG_BUFF_SIZE);
+     d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE);
-@@ -617,7 +740,16 @@ cdrom_drive *cdda_identify_scsi(const ch
+@@ -740,6 +866,15 @@ cdrom_drive *cdda_identify_scsi(const ch
+   }
    /* It would seem some TOSHIBA CDROMs gets things wrong */
 -  if (!strncmp (p + 8, "TOSHIBA", 7) &&
 +#ifndef TYPE_DISK
 +#define TYPE_DISK	0	/* direct */
 +#endif
 +#ifndef TYPE_WORM
 +#define TYPE_WORM	4	/* write once, read many */
 +#endif
 +#ifndef TYPE_ROM
 +#define TYPE_ROM	5	/* CD-ROM */
 +#endif
-+  if (p && !strncmp (p + 8, "TOSHIBA", 7) &&
+   if (p &&
        !strncmp (p + 8, "TOSHIBA", 7) &&
        !strncmp (p + 16, "CD-ROM", 6) &&
-       p[0] == TYPE_DISK) {
+@@ -780,6 +915,88 @@ cdda_identify_scsi_fail:
      p[0] = TYPE_ROM;
@@ -653,6 +785,88 @@ cdda_identify_scsi_fail:
    if(g_fd!=-1)close(g_fd);
    return(NULL);
+ }
 +#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +cdrom_drive *cdda_identify_scsi(const char *device,
 +    const char *dummy,
 +    int messagedest,
 +    char **messages)
 +{
 +	char *devname;
 +	cdrom_drive *d = NULL;
++
 +	if (device == NULL) {
 +		idperror(messagedest, messages, "\t\tNo device specified", NULL);
 @@ -414,18 +425,18 @@ $NetBSD: patch-cf,v 1.10 2009/05/19 00:3
 +	if (d) {
 +		if (d->ccb)
 +			cam_freeccb(d->ccb);
 +		if (d->dev)
 +			cam_close_device(d->dev);
 +		free(d);
 +	}
 +	return NULL;
 +}
 +#endif
  #ifdef CDDA_TEST
-@@ -702,3 +916,4 @@ cdrom_drive *cdda_identify_test(const ch
+@@ -829,3 +1046,4 @@ cdrom_drive *cdda_identify_test(const ch
+ }
  #endif
 +#endif  /* __APPLE__ && __MACH__ */