 @@ -1,14 +1,14 @@
-$NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
+$NetBSD: patch-ac,v 1.9 2009/08/14 15:51:06 drochner Exp $
 --- configure.orig	2006-08-16 20:02:25.000000000 +0200
 +++ configure
 @@ -1,25 +1,82 @@
  #! /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
 @@ -3483,27 +3483,27 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
++
  # 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
+@@ -2435,26 +2986,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_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
 @@ -3520,68 +3520,76 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 -  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
 +  ;;
 +*-*-linux*)
 +  EXTRA_OBJS="cooked_interface.o scsi_interface.o"
 +  EXTRA_LIBS=-lrt
 +  ;;
 +*-*-netbsd*)
 +  EXTRA_OBJS=scsi_interface.o
 +  EXTRA_LIBS=
 +  ;;
 +*)
 +  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
+@@ -2463,6 +3035,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'
+@@ -2475,15 +3053,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
+@@ -2510,35 +3088,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
 @@ -3613,27 +3621,27 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
  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
+@@ -2548,34 +3126,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
 @@ -3663,38 +3671,38 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
  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
+@@ -2593,8 +3171,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
+@@ -2617,35 +3195,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
 @@ -3726,27 +3734,27 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
  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
+@@ -2655,34 +3233,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
 @@ -3776,44 +3784,44 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
  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
+@@ -2691,11 +3269,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
+@@ -2705,25 +3285,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; }
 @@ -3952,27 +3960,27 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 + 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 ()
+@@ -2745,35 +3444,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
 @@ -4005,35 +4013,35 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 -  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
+@@ -2829,6 +3525,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 ()
+@@ -2848,36 +3545,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"
 @@ -4077,44 +4085,44 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 +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
+@@ -2900,11 +3611,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
+@@ -2917,41 +3628,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
 @@ -4161,27 +4169,27 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 +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
+@@ -2959,73 +3671,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
 @@ -4242,36 +4250,36 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 +$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
+@@ -3038,7 +3692,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
+@@ -3046,27 +3700,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
 @@ -4292,36 +4300,36 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 -  { (eval 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
+@@ -3079,7 +3729,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
+@@ -3087,46 +3737,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
 @@ -4372,36 +4380,36 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
++
 +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
+@@ -3136,7 +3783,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
+@@ -3144,27 +3791,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
 @@ -4422,36 +4430,36 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 -  { (eval 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
+@@ -3177,7 +3820,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
+@@ -3185,50 +3828,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
 @@ -4510,36 +4518,36 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 -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
+@@ -3242,7 +3884,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
+@@ -3250,52 +3892,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
 @@ -4598,38 +4606,38 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 +   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
+@@ -3303,8 +3941,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 ()
+@@ -3313,133 +3951,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 ();
 @@ -4798,36 +4806,36 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 +$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
+@@ -3452,7 +4051,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
+@@ -3460,27 +4059,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
 @@ -4848,36 +4856,36 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 -  { (eval 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
+@@ -3493,7 +4088,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
+@@ -3501,46 +4096,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
 @@ -4928,36 +4936,36 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
++
 +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
+@@ -3550,7 +4142,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
+@@ -3558,27 +4150,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
 @@ -4978,36 +4986,36 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 -  { (eval 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
+@@ -3591,7 +4179,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
+@@ -3599,50 +4187,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
 @@ -5066,36 +5074,36 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 -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
+@@ -3656,7 +4243,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
+@@ -3664,52 +4251,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
 @@ -5154,38 +5162,38 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 +   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
+@@ -3717,8 +4300,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 ()
+@@ -3727,133 +4310,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 ();
 @@ -5354,36 +5362,36 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 +$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
+@@ -3866,7 +4410,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
+@@ -3874,27 +4418,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
 @@ -5404,36 +5412,36 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 -  { (eval 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
+@@ -3907,7 +4447,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
+@@ -3915,46 +4455,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
 @@ -5484,36 +5492,36 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
++
 +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
+@@ -3964,7 +4501,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
+@@ -3972,27 +4509,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
 @@ -5534,36 +5542,36 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 -  { (eval 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
+@@ -4005,7 +4538,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
+@@ -4013,50 +4546,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
 @@ -5622,36 +5630,36 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 -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
+@@ -4070,7 +4602,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
+@@ -4078,52 +4610,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
 @@ -5710,38 +5718,38 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 +   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
+@@ -4131,8 +4659,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 ()
+@@ -4141,133 +4669,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 ();
 @@ -5910,36 +5918,36 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 +$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
+@@ -4280,7 +4769,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
+@@ -4288,27 +4777,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
 @@ -5960,36 +5968,36 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 -  { (eval 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
+@@ -4321,7 +4806,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
+@@ -4329,46 +4814,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
 @@ -6040,36 +6048,36 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
++
 +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
+@@ -4378,7 +4860,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
+@@ -4386,27 +4868,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
 @@ -6090,36 +6098,36 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 -  { (eval 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
+@@ -4419,7 +4897,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
+@@ -4427,50 +4905,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
 @@ -6178,36 +6186,36 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 -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
+@@ -4484,7 +4961,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
+@@ -4492,52 +4969,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
 @@ -6266,38 +6274,38 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 +   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
+@@ -4545,8 +5018,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 ()
+@@ -4555,61 +5028,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 ();
 @@ -6387,45 +6395,45 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 -  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
+@@ -4627,12 +5119,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
+@@ -4642,57 +5135,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
 @@ -6531,27 +6539,27 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 -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
+@@ -4702,79 +5233,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
 @@ -6691,27 +6699,27 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 +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
+@@ -4785,41 +5355,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
 @@ -6754,27 +6762,27 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
++
 +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
+@@ -4828,81 +5395,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
 @@ -6882,27 +6890,27 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 +$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
+@@ -4912,19 +5476,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`
 @@ -6915,27 +6923,27 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 +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
+@@ -4935,41 +5501,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
 @@ -6978,27 +6986,27 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
++
 +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
+@@ -4978,81 +5541,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
 @@ -7106,27 +7114,27 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 +$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
   UCDROM_H="-DUCDROM_H='1' "
  fi
-@@ -5060,39 +5612,359 @@ fi
+@@ -5060,39 +5620,359 @@ fi
  done
 -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
 +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
 @@ -7487,73 +7495,73 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
    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 ()
+@@ -5108,10 +5988,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 ()
+@@ -5120,16 +6000,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 ()
+@@ -5148,7 +6029,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 ()
+@@ -5156,42 +6039,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
 @@ -7596,42 +7604,42 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
  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
+@@ -5204,7 +6084,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
+@@ -5223,39 +6109,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}*)
 @@ -7687,27 +7695,27 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 +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
+@@ -5264,63 +6170,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/;
 @@ -7784,43 +7792,43 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 -	 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
+@@ -5329,11 +6226,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
+@@ -5346,22 +6244,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
 @@ -7885,27 +7893,27 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
++
 +# 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
+@@ -5371,33 +6325,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 ;;
 @@ -7960,27 +7968,27 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 -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
+@@ -5405,159 +6386,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; }
 @@ -8198,27 +8206,27 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 +    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
+@@ -5566,7 +6510,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='
 @@ -8228,27 +8236,27 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 +      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
+@@ -5575,31 +6540,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
 @@ -8264,27 +8272,27 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 -## 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
+@@ -5607,124 +6555,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
 @@ -8433,27 +8441,27 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 -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
+@@ -5738,32 +6668,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
 @@ -8495,27 +8503,27 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
 +    "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
+@@ -5773,344 +6719,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
 @@ -9239,22 +9247,22 @@ $NetBSD: patch-ac,v 1.8 2009/08/09 16:00
  { (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
+@@ -6132,4 +7198,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

 @@ -1,23 +1,23 @@
-$NetBSD: distinfo,v 1.23 2009/08/09 16:00:53 drochner Exp $
+$NetBSD: distinfo,v 1.24 2009/08/14 15:51:05 drochner Exp $
 SHA1 (cdparanoia-III-10.2.src.tgz) = 1901e20d3a370ca6afa4c76a9ef30d3f03044320
 RMD160 (cdparanoia-III-10.2.src.tgz) = d6c4ea9cc4aa4d5bcca4985e668ea6142d53cc55
 Size (cdparanoia-III-10.2.src.tgz) = 183236 bytes
-SHA1 (patch-aa) = e47579c7c20d6170d7ef9c9952914309653fbeb1
+SHA1 (patch-aa) = c8e66327a8566afff37313941db2b3175beb57fa
 SHA1 (patch-ab) = af07649ac4e0d4a5c2798e4cfc903e6959adea44
-SHA1 (patch-ac) = 809a306e3ee07493167ee652efd8899fd38af15f
+SHA1 (patch-ac) = f6f28caf71c68462955fa308ae01b6e4888c1724
 SHA1 (patch-ad) = 9a1ea1b98b5f3810e1ccae57beb8c68b5e189716
 SHA1 (patch-ae) = dda320ca0817b06cb25be86b2a891776550603ae
 SHA1 (patch-ba) = 0f4f8ddecd9f5f273f7a1687bbb1477fd64500c1
-SHA1 (patch-ca) = 39b06a65f1feed4170c0f7305f7a56f104c4a043
+SHA1 (patch-ca) = 9860c2227f9d359e808c0ee0989020a9a3163a48
 SHA1 (patch-cb) = b38b9119273aef002e1fde8f84888b303d7833d9
 SHA1 (patch-cc) = a2f78daf62ecae73ab3cc264f39b367dfa249129
 SHA1 (patch-cd) = 7141563e10b0d23dbd4ff824224a10908741be5b
-SHA1 (patch-ce) = 75b152acaf730eafa76dffc44e2bec95c0ae6397
+SHA1 (patch-ce) = b343191fa2e337e2c3c091c585451c726c1f745b
 SHA1 (patch-cf) = 73cdff1ab6b9857cd3299f3eb152c399a7e38227
 SHA1 (patch-cg) = 9a979bcac06da564e6d86d0ffc04848e529367cf
-SHA1 (patch-ch) = 1e17f98007b7e566dd88e30bea27247a9be6cc28
+SHA1 (patch-ch) = e7ec16fe9c7ff805104d68678a2576370cc4c0e7
-SHA1 (patch-ci) = d8a85b0e5858650050a05fdca612bc0fadd42065
+SHA1 (patch-ci) = 614b428a3bf330ccb5850149549fb98e8e1b90c0
 SHA1 (patch-cj) = e2420e2ccadd2d6ea30d6bf48af9c141dc395afc
 SHA1 (patch-ck) = 0232f8f42d98b49043f55cd6aaf1f50ab38fadfb
 SHA1 (patch-cn) = b79db0b24a042a5801b47e6db5e20cbf07a53475

 @@ -1,14 +1,14 @@
-$NetBSD: patch-ci,v 1.5 2009/08/09 16:00:53 drochner Exp $
+$NetBSD: patch-ci,v 1.6 2009/08/14 15:51:06 drochner Exp $
 --- interface/interface.c.orig	2008-09-11 12:43:52.000000000 +0200
 +++ interface/interface.c
 @@ -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);
 @@ -23,34 +23,45 @@ $NetBSD: patch-ci,v 1.5 2009/08/09 16:00
 +	  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);
+   }
-@@ -55,6 +72,12 @@ int cdda_open(cdrom_drive *d){
+@@ -55,22 +72,31 @@ 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:
-@@ -71,6 +94,7 @@ int cdda_open(cdrom_drive *d){
+     if((ret=scsi_init_drive(d)))
        return(ret);
      break;
 +#ifndef __NetBSD__
    case COOKED_IOCTL:
      if((ret=cooked_init_drive(d)))
        return(ret);
      break;
 +#endif
  #ifdef CDDA_TEST
    case TEST_INTERFACE:
      if((ret=test_init_drive(d)))
        return(ret);
      break;
  #endif
 +#endif
    default:
      cderror(d,"100: Interface not supported\n");
      return(-100);

 @@ -1,116 +1,37 @@
-$NetBSD: patch-ce,v 1.6 2009/08/09 16:00:53 drochner Exp $
+$NetBSD: patch-ce,v 1.7 2009/08/14 15:51:06 drochner Exp $
 --- interface/cooked_interface.c.orig	2008-08-26 11:55:22.000000000 +0200
 +++ interface/cooked_interface.c
 @@ -1,6 +1,8 @@
  /******************************************************************
   * 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
+  *
-@@ -24,9 +26,11 @@ static int timed_ioctl(cdrom_drive *d, i
+@@ -24,6 +26,7 @@ static int timed_ioctl(cdrom_drive *d, i
    return ret2;
+ }
 +#if !defined(__FreeBSD__) && !defined(__DragonFly__)
  static int cooked_readtoc (cdrom_drive *d){
    int i;
    int tracks;
-+#ifdef __linux__
+@@ -156,6 +159,141 @@ static long cooked_read (cdrom_drive *d,
    struct cdrom_tochdr hdr;
    struct cdrom_tocentry entry;
@@ -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;
 +  memset(entries, 0, sizeof entries);
 +  /* get all TOC entries at once */
 +#ifndef CDIOREADTOCENTRIES
 +#define CDIOREADTOCENTRIES CDIOREADTOCENTRYS
 +#endif
 +  if(ioctl(d->ioctl_fd, CDIOREADTOCENTRIES, &hdr))
 +    switch(errno){
 +    case EPERM:
 +      cderror(d,"102: Permision denied on cdrom (ioctl) device\n");
 +      return(-102);
 +    default:
 +      cderror(d,"004: Unable to read table of contents header\n");
 +      return(-4);
 +    }
 +  for(i = 0; i < MAXTRK + 1; i++) {
 +    d->disc_toc[i].bFlags = (entries[i].addr_type << 4) | (entries[i].control & 0x0f);
 +    d->disc_toc[i].bTrack = entries[i].track;
 +    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 */
@@ -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
@@ -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,ret=0;
    struct cdrom_read_audio arg;
    char *buffer=(char *)p;
@@ -155,7 +204,147 @@ static long cooked_read (cdrom_drive *d,
   done:
    if(p==NULL && buffer)free(buffer);
    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;
++
 +	if (ioctl(d->ioctl_fd, CDIOREADTOCHEADER, &hdr) == -1) {
 +		int ret;
++
 +		if (errno == EPERM) {
 @@ -227,47 +148,34 @@ $NetBSD: patch-ce,v 1.6 2009/08/09 16:00
 +			++retry_count;
++
 +			if (retry_count > MAX_RETRIES) {
 +				cderror(d, "007: Unknown, unrecoverable error reading data\n");
 +				return -7;
 +			}
 +		} else
 +			break;
 +	}
++
 +	return sectors;
 +}
 +#endif
  /* hook */
  static int Dummy (cdrom_drive *d,int Switch){
-@@ -219,8 +408,11 @@ static void check_exceptions(cdrom_drive
+@@ -221,6 +359,7 @@ 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 */
-@@ -271,6 +463,9 @@ int cooked_init_drive (cdrom_drive *d){
+@@ -271,6 +410,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->read_toc = cooked_readtoc;
@@ -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,14 +1,14 @@
-$NetBSD: patch-ch,v 1.4 2009/08/09 16:00:53 drochner Exp $
+$NetBSD: patch-ch,v 1.5 2009/08/14 15:51:06 drochner Exp $
 --- interface/cdda_interface.h.orig	2008-09-11 12:43:52.000000000 +0200
 +++ interface/cdda_interface.h
 @@ -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>
 @@ -54,13 +54,22 @@ $NetBSD: patch-ch,v 1.4 2009/08/09 16:00
 +#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;
@@ -84,7 +113,7 @@ typedef struct cdrom_drive{
    int is_atapi;
    int is_mmc;
 -  cdda_private_data_t *private;
 +  cdda_private_data_t *private_data;
    void         *reserved;
    unsigned char inqbytes[4];

 @@ -1,30 +1,32 @@
-# $NetBSD: Makefile,v 1.28 2009/08/09 16:00:53 drochner Exp $
+# $NetBSD: Makefile,v 1.29 2009/08/14 15:51:05 drochner Exp $
+#
 DISTNAME=	cdparanoia-III-10.2
 PKGNAME=	cdparanoia-3.0.10.2
 PKGREVISION=	1
 CATEGORIES=	audio
 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
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/cdparanoia
 MAKE_ENV+=	GCC=yes
 CFLAGS+=	-Dprivate_data=private
 LDFLAGS.FreeBSD+=	-lcam
 LDFLAGS.DragonFly+=	-lcam
 .include "../../mk/bsd.pkg.mk"

 @@ -1,19 +1,23 @@
-$NetBSD: patch-ca,v 1.8 2009/08/09 16:00:53 drochner Exp $
+$NetBSD: patch-ca,v 1.9 2009/08/14 15:51:06 drochner Exp $
 --- interface/Makefile.in.orig	2008-08-21 18:08:54.000000000 +0200
 +++ interface/Makefile.in
-@@ -18,12 +18,10 @@ RANLIB=@RANLIB@
+@@ -15,15 +15,13 @@ LD=@CC@
- LIBS = -lm -lrt
+ LDFLAGS=@LDFLAGS@ $(FLAGS)
  AR=@AR@
  RANLIB=@RANLIB@
 -LIBS = -lm -lrt
 +LIBS = -lm @EXTRA_LIBS@
  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:
 @@ -27,27 +31,27 @@ $NetBSD: patch-ca,v 1.8 2009/08/09 16:00
 -	[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so libcdda_interface.so.0
 +	$(MAKE) libcdda_interface.la VERSION=$(VERSION) CFLAGS="$(OPT)"
 -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)
++	    -version-info 1:0 -rpath $(PREFIX)/lib $(LDFLAGS) $(LIBS)
++
 +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) $(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