rbb         99/08/18 06:33:29

  Modified:    mpm/src/lib/apr configure configure.in
               mpm/src/lib/apr/file_io/unix open.c readwrite.c
               mpm/src/lib/apr/include apr_config.h.in apr_file_io.h
               mpm/src/lib/apr/lib apr_pools.c apr_tables.c
               mpm/src/lib/apr/network_io/unix networkio.h poll.c
  Log:
  Cleanup some warnings on BSD.  Also fixes the other two problems Ben found
  last night.  We only include poll if the system has it.  And, a new #define,
  APR_OS_DEFAULT, which makes open use the default permissions, instead of using
  -1 with an unsigned number.
  
  Revision  Changes    Path
  1.2       +378 -422  apache-2.0/mpm/src/lib/apr/configure
  
  Index: configure
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/lib/apr/configure,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- configure 1999/08/17 15:59:35     1.1
  +++ configure 1999/08/18 13:33:22     1.2
  @@ -10,7 +10,7 @@
   
   
   # Guess values for system-dependent variables and create Makefiles.
  -# Generated automatically using autoconf version 2.13 
  +# Generated automatically using autoconf version 2.12 
   # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
   #
   # This configure script is free software; the Free Software Foundation
  @@ -60,7 +60,6 @@
   # Initialize some other variables.
   subdirs=
   MFLAGS= MAKEFLAGS=
  -SHELL=${CONFIG_SHELL-/bin/sh}
   # Maximum number of lines to put in a shell here document.
   ac_max_here_lines=12
   
  @@ -344,7 +343,7 @@
       verbose=yes ;;
   
     -version | --version | --versio | --versi | --vers)
  -    echo "configure generated by autoconf version 2.13"
  +    echo "configure generated by autoconf version 2.12"
       exit 0 ;;
   
     -with-* | --with-*)
  @@ -514,11 +513,9 @@
   # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
   ac_cpp='$CPP $CPPFLAGS'
   ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
  -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS 
conftest.$ac_ext $LIBS 1>&5'
  +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext 
$LIBS 1>&5'
   cross_compiling=$ac_cv_prog_cc_cross
   
  -ac_exeext=
  -ac_objext=o
   if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
     # Stardent Vistra SVR4 grep lacks -e, says [EMAIL PROTECTED]
     if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
  @@ -548,16 +545,15 @@
   # Extract the first word of "gcc", so it can be a program name with args.
   set dummy gcc; ac_word=$2
   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  -echo "configure:552: checking for $ac_word" >&5
  +echo "configure:549: checking for $ac_word" >&5
   if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     if test -n "$CC"; then
     ac_cv_prog_CC="$CC" # Let the user override the test.
   else
  -  IFS="${IFS=        }"; ac_save_ifs="$IFS"; IFS=":"
  -  ac_dummy="$PATH"
  -  for ac_dir in $ac_dummy; do
  +  IFS="${IFS=        }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
  +  for ac_dir in $PATH; do
       test -z "$ac_dir" && ac_dir=.
       if test -f $ac_dir/$ac_word; then
         ac_cv_prog_CC="gcc"
  @@ -578,17 +574,16 @@
     # Extract the first word of "cc", so it can be a program name with args.
   set dummy cc; ac_word=$2
   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  -echo "configure:582: checking for $ac_word" >&5
  +echo "configure:578: checking for $ac_word" >&5
   if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     if test -n "$CC"; then
     ac_cv_prog_CC="$CC" # Let the user override the test.
   else
  -  IFS="${IFS=        }"; ac_save_ifs="$IFS"; IFS=":"
  +  IFS="${IFS=        }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
     ac_prog_rejected=no
  -  ac_dummy="$PATH"
  -  for ac_dir in $ac_dummy; do
  +  for ac_dir in $PATH; do
       test -z "$ac_dir" && ac_dir=.
       if test -f $ac_dir/$ac_word; then
         if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
  @@ -623,61 +618,25 @@
     echo "$ac_t""no" 1>&6
   fi
   
  -  if test -z "$CC"; then
  -    case "`uname -s`" in
  -    *win32* | *WIN32*)
  -      # Extract the first word of "cl", so it can be a program name with 
args.
  -set dummy cl; ac_word=$2
  -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  -echo "configure:633: checking for $ac_word" >&5
  -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
  -  echo $ac_n "(cached) $ac_c" 1>&6
  -else
  -  if test -n "$CC"; then
  -  ac_cv_prog_CC="$CC" # Let the user override the test.
  -else
  -  IFS="${IFS=        }"; ac_save_ifs="$IFS"; IFS=":"
  -  ac_dummy="$PATH"
  -  for ac_dir in $ac_dummy; do
  -    test -z "$ac_dir" && ac_dir=.
  -    if test -f $ac_dir/$ac_word; then
  -      ac_cv_prog_CC="cl"
  -      break
  -    fi
  -  done
  -  IFS="$ac_save_ifs"
  -fi
  -fi
  -CC="$ac_cv_prog_CC"
  -if test -n "$CC"; then
  -  echo "$ac_t""$CC" 1>&6
  -else
  -  echo "$ac_t""no" 1>&6
  -fi
  - ;;
  -    esac
  -  fi
     test -z "$CC" && { echo "configure: error: no acceptable cc found in 
\$PATH" 1>&2; exit 1; }
   fi
   
   echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) 
works""... $ac_c" 1>&6
  -echo "configure:665: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) 
works" >&5
  +echo "configure:626: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) 
works" >&5
   
   ac_ext=c
   # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
   ac_cpp='$CPP $CPPFLAGS'
   ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
  -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS 
conftest.$ac_ext $LIBS 1>&5'
  +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext 
$LIBS 1>&5'
   cross_compiling=$ac_cv_prog_cc_cross
   
  -cat > conftest.$ac_ext << EOF
  -
  -#line 676 "configure"
  +cat > conftest.$ac_ext <<EOF
  +#line 636 "configure"
   #include "confdefs.h"
  -
   main(){return(0);}
   EOF
  -if { (eval echo configure:681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext}; then
  +if { (eval echo configure:640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest; then
     ac_cv_prog_cc_works=yes
     # If we can't run a trivial program, we are probably using a cross 
compiler.
     if (./conftest; exit) 2>/dev/null; then
  @@ -691,24 +650,18 @@
     ac_cv_prog_cc_works=no
   fi
   rm -fr conftest*
  -ac_ext=c
  -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  -ac_cpp='$CPP $CPPFLAGS'
  -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
  -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS 
conftest.$ac_ext $LIBS 1>&5'
  -cross_compiling=$ac_cv_prog_cc_cross
   
   echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
   if test $ac_cv_prog_cc_works = no; then
     { echo "configure: error: installation or configuration problem: C 
compiler cannot create executables." 1>&2; exit 1; }
   fi
   echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a 
cross-compiler""... $ac_c" 1>&6
  -echo "configure:707: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) 
is a cross-compiler" >&5
  +echo "configure:660: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) 
is a cross-compiler" >&5
   echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
   cross_compiling=$ac_cv_prog_cc_cross
   
   echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
  -echo "configure:712: checking whether we are using GNU C" >&5
  +echo "configure:665: checking whether we are using GNU C" >&5
   if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -717,7 +670,7 @@
     yes;
   #endif
   EOF
  -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:721: 
\"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
  +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:674: 
\"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
     ac_cv_prog_gcc=yes
   else
     ac_cv_prog_gcc=no
  @@ -728,15 +681,11 @@
   
   if test $ac_cv_prog_gcc = yes; then
     GCC=yes
  -else
  -  GCC=
  -fi
  -
  -ac_test_CFLAGS="${CFLAGS+set}"
  -ac_save_CFLAGS="$CFLAGS"
  -CFLAGS=
  -echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
  -echo "configure:740: checking whether ${CC-cc} accepts -g" >&5
  +  ac_test_CFLAGS="${CFLAGS+set}"
  +  ac_save_CFLAGS="$CFLAGS"
  +  CFLAGS=
  +  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
  +echo "configure:689: checking whether ${CC-cc} accepts -g" >&5
   if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -751,35 +700,30 @@
   fi
   
   echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
  -if test "$ac_test_CFLAGS" = set; then
  -  CFLAGS="$ac_save_CFLAGS"
  -elif test $ac_cv_prog_cc_g = yes; then
  -  if test "$GCC" = yes; then
  +  if test "$ac_test_CFLAGS" = set; then
  +    CFLAGS="$ac_save_CFLAGS"
  +  elif test $ac_cv_prog_cc_g = yes; then
       CFLAGS="-g -O2"
     else
  -    CFLAGS="-g"
  -  fi
  -else
  -  if test "$GCC" = yes; then
       CFLAGS="-O2"
  -  else
  -    CFLAGS=
     fi
  +else
  +  GCC=
  +  test "${CFLAGS+set}" = set || CFLAGS="-g"
   fi
   
   # Extract the first word of "ranlib", so it can be a program name with args.
   set dummy ranlib; ac_word=$2
   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  -echo "configure:774: checking for $ac_word" >&5
  +echo "configure:719: checking for $ac_word" >&5
   if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     if test -n "$RANLIB"; then
     ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
   else
  -  IFS="${IFS=        }"; ac_save_ifs="$IFS"; IFS=":"
  -  ac_dummy="$PATH"
  -  for ac_dir in $ac_dummy; do
  +  IFS="${IFS=        }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
  +  for ac_dir in $PATH; do
       test -z "$ac_dir" && ac_dir=.
       if test -f $ac_dir/$ac_word; then
         ac_cv_prog_RANLIB="ranlib"
  @@ -798,7 +742,7 @@
   fi
   
   echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
  -echo "configure:802: checking whether ${MAKE-make} sets \${MAKE}" >&5
  +echo "configure:746: checking whether ${MAKE-make} sets \${MAKE}" >&5
   set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
   if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; 
then
     echo $ac_n "(cached) $ac_c" 1>&6
  @@ -827,16 +771,15 @@
   # Extract the first word of "rm", so it can be a program name with args.
   set dummy rm; ac_word=$2
   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  -echo "configure:831: checking for $ac_word" >&5
  +echo "configure:775: checking for $ac_word" >&5
   if eval "test \"`echo '$''{'ac_cv_prog_RM'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     if test -n "$RM"; then
     ac_cv_prog_RM="$RM" # Let the user override the test.
   else
  -  IFS="${IFS=        }"; ac_save_ifs="$IFS"; IFS=":"
  -  ac_dummy="$PATH"
  -  for ac_dir in $ac_dummy; do
  +  IFS="${IFS=        }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
  +  for ac_dir in $PATH; do
       test -z "$ac_dir" && ac_dir=.
       if test -f $ac_dir/$ac_word; then
         ac_cv_prog_RM="rm"
  @@ -856,16 +799,15 @@
   # Extract the first word of "ar", so it can be a program name with args.
   set dummy ar; ac_word=$2
   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  -echo "configure:860: checking for $ac_word" >&5
  +echo "configure:803: checking for $ac_word" >&5
   if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     if test -n "$AR"; then
     ac_cv_prog_AR="$AR" # Let the user override the test.
   else
  -  IFS="${IFS=        }"; ac_save_ifs="$IFS"; IFS=":"
  -  ac_dummy="$PATH"
  -  for ac_dir in $ac_dummy; do
  +  IFS="${IFS=        }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
  +  for ac_dir in $PATH; do
       test -z "$ac_dir" && ac_dir=.
       if test -f $ac_dir/$ac_word; then
         ac_cv_prog_AR="ar"
  @@ -890,7 +832,7 @@
   
   # This macro needs to be here in case we are on an AIX box.
   echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
  -echo "configure:894: checking how to run the C preprocessor" >&5
  +echo "configure:836: checking how to run the C preprocessor" >&5
   # On Suns, sometimes $CPP names a directory.
   if test -n "$CPP" && test -d "$CPP"; then
     CPP=
  @@ -905,14 +847,14 @@
     # On the NeXT, cc -E runs the code through the compiler's parser,
     # not just through cpp.
     cat > conftest.$ac_ext <<EOF
  -#line 909 "configure"
  +#line 851 "configure"
   #include "confdefs.h"
   #include <assert.h>
   Syntax Error
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:857: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     :
   else
  @@ -922,14 +864,14 @@
     rm -rf conftest*
     CPP="${CC-cc} -E -traditional-cpp"
     cat > conftest.$ac_ext <<EOF
  -#line 926 "configure"
  +#line 868 "configure"
   #include "confdefs.h"
   #include <assert.h>
   Syntax Error
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:932: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     :
   else
  @@ -937,30 +879,11 @@
     echo "configure: failed program was:" >&5
     cat conftest.$ac_ext >&5
     rm -rf conftest*
  -  CPP="${CC-cc} -nologo -E"
  -  cat > conftest.$ac_ext <<EOF
  -#line 943 "configure"
  -#include "confdefs.h"
  -#include <assert.h>
  -Syntax Error
  -EOF
  -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:949: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  -if test -z "$ac_err"; then
  -  :
  -else
  -  echo "$ac_err" >&5
  -  echo "configure: failed program was:" >&5
  -  cat conftest.$ac_ext >&5
  -  rm -rf conftest*
     CPP=/lib/cpp
   fi
   rm -f conftest*
   fi
   rm -f conftest*
  -fi
  -rm -f conftest*
     ac_cv_prog_CPP="$CPP"
   fi
     CPP="$ac_cv_prog_CPP"
  @@ -970,9 +893,9 @@
   echo "$ac_t""$CPP" 1>&6
   
   echo $ac_n "checking for AIX""... $ac_c" 1>&6
  -echo "configure:974: checking for AIX" >&5
  +echo "configure:897: checking for AIX" >&5
   cat > conftest.$ac_ext <<EOF
  -#line 976 "configure"
  +#line 899 "configure"
   #include "confdefs.h"
   #ifdef _AIX
     yes
  @@ -995,7 +918,7 @@
   
   
   echo $ac_n "checking size of char""... $ac_c" 1>&6
  -echo "configure:999: checking size of char" >&5
  +echo "configure:922: checking size of char" >&5
   if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -1003,7 +926,7 @@
     ac_cv_sizeof_char=1
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1007 "configure"
  +#line 930 "configure"
   #include "confdefs.h"
   #include <stdio.h>
   main()
  @@ -1014,7 +937,7 @@
     exit(0);
   }
   EOF
  -if { (eval echo configure:1018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  +if { (eval echo configure:941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest && (./conftest; exit) 2>/dev/null
   then
     ac_cv_sizeof_char=`cat conftestval`
   else
  @@ -1034,7 +957,7 @@
   
   
   echo $ac_n "checking size of int""... $ac_c" 1>&6
  -echo "configure:1038: checking size of int" >&5
  +echo "configure:961: checking size of int" >&5
   if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -1042,7 +965,7 @@
     ac_cv_sizeof_int=4
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1046 "configure"
  +#line 969 "configure"
   #include "confdefs.h"
   #include <stdio.h>
   main()
  @@ -1053,7 +976,7 @@
     exit(0);
   }
   EOF
  -if { (eval echo configure:1057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  +if { (eval echo configure:980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest && (./conftest; exit) 2>/dev/null
   then
     ac_cv_sizeof_int=`cat conftestval`
   else
  @@ -1073,7 +996,7 @@
   
   
   echo $ac_n "checking size of long""... $ac_c" 1>&6
  -echo "configure:1077: checking size of long" >&5
  +echo "configure:1000: checking size of long" >&5
   if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -1081,7 +1004,7 @@
     ac_cv_sizeof_long=4
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1085 "configure"
  +#line 1008 "configure"
   #include "confdefs.h"
   #include <stdio.h>
   main()
  @@ -1092,7 +1015,7 @@
     exit(0);
   }
   EOF
  -if { (eval echo configure:1096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  +if { (eval echo configure:1019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest && (./conftest; exit) 2>/dev/null
   then
     ac_cv_sizeof_long=`cat conftestval`
   else
  @@ -1112,7 +1035,7 @@
   
   
   echo $ac_n "checking size of short""... $ac_c" 1>&6
  -echo "configure:1116: checking size of short" >&5
  +echo "configure:1039: checking size of short" >&5
   if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -1120,7 +1043,7 @@
     ac_cv_sizeof_short=2
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1124 "configure"
  +#line 1047 "configure"
   #include "confdefs.h"
   #include <stdio.h>
   main()
  @@ -1131,7 +1054,7 @@
     exit(0);
   }
   EOF
  -if { (eval echo configure:1135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  +if { (eval echo configure:1058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest && (./conftest; exit) 2>/dev/null
   then
     ac_cv_sizeof_short=`cat conftestval`
   else
  @@ -1151,7 +1074,7 @@
   
   
   echo $ac_n "checking size of long double""... $ac_c" 1>&6
  -echo "configure:1155: checking size of long double" >&5
  +echo "configure:1078: checking size of long double" >&5
   if eval "test \"`echo '$''{'ac_cv_sizeof_long_double'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -1159,7 +1082,7 @@
     ac_cv_sizeof_long_double=12
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1163 "configure"
  +#line 1086 "configure"
   #include "confdefs.h"
   #include <stdio.h>
   main()
  @@ -1170,7 +1093,7 @@
     exit(0);
   }
   EOF
  -if { (eval echo configure:1174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  +if { (eval echo configure:1097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest && (./conftest; exit) 2>/dev/null
   then
     ac_cv_sizeof_long_double=`cat conftestval`
   else
  @@ -1190,7 +1113,7 @@
   
   
   echo $ac_n "checking size of long long""... $ac_c" 1>&6
  -echo "configure:1194: checking size of long long" >&5
  +echo "configure:1117: checking size of long long" >&5
   if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -1198,7 +1121,7 @@
     ac_cv_sizeof_long_long=8
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1202 "configure"
  +#line 1125 "configure"
   #include "confdefs.h"
   #include <stdio.h>
   main()
  @@ -1209,7 +1132,7 @@
     exit(0);
   }
   EOF
  -if { (eval echo configure:1213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  +if { (eval echo configure:1136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest && (./conftest; exit) 2>/dev/null
   then
     ac_cv_sizeof_long_long=`cat conftestval`
   else
  @@ -1230,12 +1153,12 @@
   
   
   echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
  -echo "configure:1234: checking for ANSI C header files" >&5
  +echo "configure:1157: checking for ANSI C header files" >&5
   if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1239 "configure"
  +#line 1162 "configure"
   #include "confdefs.h"
   #include <stdlib.h>
   #include <stdarg.h>
  @@ -1243,8 +1166,8 @@
   #include <float.h>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:1247: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:1170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     ac_cv_header_stdc=yes
  @@ -1260,7 +1183,7 @@
   if test $ac_cv_header_stdc = yes; then
     # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat > conftest.$ac_ext <<EOF
  -#line 1264 "configure"
  +#line 1187 "configure"
   #include "confdefs.h"
   #include <string.h>
   EOF
  @@ -1278,7 +1201,7 @@
   if test $ac_cv_header_stdc = yes; then
     # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat > conftest.$ac_ext <<EOF
  -#line 1282 "configure"
  +#line 1205 "configure"
   #include "confdefs.h"
   #include <stdlib.h>
   EOF
  @@ -1299,7 +1222,7 @@
     :
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1303 "configure"
  +#line 1226 "configure"
   #include "confdefs.h"
   #include <ctype.h>
   #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  @@ -1310,7 +1233,7 @@
   exit (0); }
   
   EOF
  -if { (eval echo configure:1314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  +if { (eval echo configure:1237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest && (./conftest; exit) 2>/dev/null
   then
     :
   else
  @@ -1334,12 +1257,12 @@
   fi
   
   echo $ac_n "checking for off_t""... $ac_c" 1>&6
  -echo "configure:1338: checking for off_t" >&5
  +echo "configure:1261: checking for off_t" >&5
   if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1343 "configure"
  +#line 1266 "configure"
   #include "confdefs.h"
   #include <sys/types.h>
   #if STDC_HEADERS
  @@ -1348,7 +1271,7 @@
   #endif
   EOF
   if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  -  egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
  +  egrep "off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
     rm -rf conftest*
     ac_cv_type_off_t=yes
   else
  @@ -1367,12 +1290,12 @@
   fi
   
   echo $ac_n "checking for pid_t""... $ac_c" 1>&6
  -echo "configure:1371: checking for pid_t" >&5
  +echo "configure:1294: checking for pid_t" >&5
   if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1376 "configure"
  +#line 1299 "configure"
   #include "confdefs.h"
   #include <sys/types.h>
   #if STDC_HEADERS
  @@ -1381,7 +1304,7 @@
   #endif
   EOF
   if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  -  egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
  +  egrep "pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
     rm -rf conftest*
     ac_cv_type_pid_t=yes
   else
  @@ -1400,12 +1323,12 @@
   fi
   
   echo $ac_n "checking for size_t""... $ac_c" 1>&6
  -echo "configure:1404: checking for size_t" >&5
  +echo "configure:1327: checking for size_t" >&5
   if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1409 "configure"
  +#line 1332 "configure"
   #include "confdefs.h"
   #include <sys/types.h>
   #if STDC_HEADERS
  @@ -1414,7 +1337,7 @@
   #endif
   EOF
   if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  -  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
  +  egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
     rm -rf conftest*
     ac_cv_type_size_t=yes
   else
  @@ -1433,12 +1356,12 @@
   fi
   
   echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
  -echo "configure:1437: checking for uid_t in sys/types.h" >&5
  +echo "configure:1360: checking for uid_t in sys/types.h" >&5
   if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1442 "configure"
  +#line 1365 "configure"
   #include "confdefs.h"
   #include <sys/types.h>
   EOF
  @@ -1467,12 +1390,12 @@
   fi
   
   echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
  -echo "configure:1471: checking for ssize_t" >&5
  +echo "configure:1394: checking for ssize_t" >&5
   if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1476 "configure"
  +#line 1399 "configure"
   #include "confdefs.h"
   #include <sys/types.h>
   #if STDC_HEADERS
  @@ -1481,7 +1404,7 @@
   #endif
   EOF
   if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  -  egrep "(^|[^a-zA-Z_0-9])ssize_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
  +  egrep "ssize_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
     rm -rf conftest*
     ac_cv_type_ssize_t=yes
   else
  @@ -1500,21 +1423,21 @@
   fi
   
   echo $ac_n "checking for inline""... $ac_c" 1>&6
  -echo "configure:1504: checking for inline" >&5
  +echo "configure:1427: checking for inline" >&5
   if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     ac_cv_c_inline=no
   for ac_kw in inline __inline__ __inline; do
     cat > conftest.$ac_ext <<EOF
  -#line 1511 "configure"
  +#line 1434 "configure"
   #include "confdefs.h"
   
   int main() {
   } $ac_kw foo() {
   ; return 0; }
   EOF
  -if { (eval echo configure:1518: \"$ac_compile\") 1>&5; (eval $ac_compile) 
2>&5; }; then
  +if { (eval echo configure:1441: \"$ac_compile\") 1>&5; (eval $ac_compile) 
2>&5; }; then
     rm -rf conftest*
     ac_cv_c_inline=$ac_kw; break
   else
  @@ -1547,16 +1470,15 @@
   # Extract the first word of "sh", so it can be a program name with args.
   set dummy sh; ac_word=$2
   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  -echo "configure:1551: checking for $ac_word" >&5
  +echo "configure:1474: checking for $ac_word" >&5
   if eval "test \"`echo '$''{'ac_cv_prog_SH'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     if test -n "$SH"; then
     ac_cv_prog_SH="$SH" # Let the user override the test.
   else
  -  IFS="${IFS=        }"; ac_save_ifs="$IFS"; IFS=":"
  -  ac_dummy="$PATH"
  -  for ac_dir in $ac_dummy; do
  +  IFS="${IFS=        }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
  +  for ac_dir in $PATH; do
       test -z "$ac_dir" && ac_dir=.
       if test -f $ac_dir/$ac_word; then
         ac_cv_prog_SH="sh"
  @@ -1575,12 +1497,12 @@
   
   
   echo $ac_n "checking for LOCK_EX in sys/file.h""... $ac_c" 1>&6
  -echo "configure:1579: checking for LOCK_EX in sys/file.h" >&5
  +echo "configure:1501: checking for LOCK_EX in sys/file.h" >&5
   if eval "test \"`echo '$''{'ac_cv_define_LOCK_EX'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1584 "configure"
  +#line 1506 "configure"
   #include "confdefs.h"
   
   #include <sys/file.h>
  @@ -1607,12 +1529,12 @@
   
   echo "$ac_t""$ac_cv_define_LOCK_EX" 1>&6
   echo $ac_n "checking for F_SETLK in fcntl.h""... $ac_c" 1>&6
  -echo "configure:1611: checking for F_SETLK in fcntl.h" >&5
  +echo "configure:1533: checking for F_SETLK in fcntl.h" >&5
   if eval "test \"`echo '$''{'ac_cv_define_F_SETLK'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1616 "configure"
  +#line 1538 "configure"
   #include "confdefs.h"
   
   #include <fcntl.h>
  @@ -1639,12 +1561,12 @@
   
   echo "$ac_t""$ac_cv_define_F_SETLK" 1>&6
   echo $ac_n "checking for PTHREAD_PROCESS_SHARED in pthread.h""... $ac_c" 1>&6
  -echo "configure:1643: checking for PTHREAD_PROCESS_SHARED in pthread.h" >&5
  +echo "configure:1565: checking for PTHREAD_PROCESS_SHARED in pthread.h" >&5
   if eval "test \"`echo '$''{'ac_cv_define_PTHREAD_PROCESS_SHARED'+set}'`\" = 
set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1648 "configure"
  +#line 1570 "configure"
   #include "confdefs.h"
   
   #include <pthread.h>
  @@ -1840,12 +1762,12 @@
   for ac_func in pthread_mutex_init
   do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
  -echo "configure:1844: checking for $ac_func" >&5
  +echo "configure:1766: checking for $ac_func" >&5
   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1849 "configure"
  +#line 1771 "configure"
   #include "confdefs.h"
   /* System header to define __stub macros and hopefully few prototypes,
       which can conflict with char $ac_func(); below.  */
  @@ -1868,7 +1790,7 @@
   
   ; return 0; }
   EOF
  -if { (eval echo configure:1872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext}; then
  +if { (eval echo configure:1794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest; then
     rm -rf conftest*
     eval "ac_cv_func_$ac_func=yes"
   else
  @@ -1910,7 +1832,7 @@
   esac
   
   echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
  -echo "configure:1914: checking for dlopen in -ldl" >&5
  +echo "configure:1836: checking for dlopen in -ldl" >&5
   ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
  @@ -1918,7 +1840,7 @@
     ac_save_LIBS="$LIBS"
   LIBS="-ldl  $LIBS"
   cat > conftest.$ac_ext <<EOF
  -#line 1922 "configure"
  +#line 1844 "configure"
   #include "confdefs.h"
   /* Override any gcc2 internal prototype to avoid an error.  */
   /* We use char because int might match the return type of a gcc2
  @@ -1929,7 +1851,7 @@
   dlopen()
   ; return 0; }
   EOF
  -if { (eval echo configure:1933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext}; then
  +if { (eval echo configure:1855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest; then
     rm -rf conftest*
     eval "ac_cv_lib_$ac_lib_var=yes"
   else
  @@ -1957,7 +1879,7 @@
   fi
   
   echo $ac_n "checking for pthread_mutex_init in -lpthread""... $ac_c" 1>&6
  -echo "configure:1961: checking for pthread_mutex_init in -lpthread" >&5
  +echo "configure:1883: checking for pthread_mutex_init in -lpthread" >&5
   ac_lib_var=`echo pthread'_'pthread_mutex_init | sed 'y%./+-%__p_%'`
   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
  @@ -1965,7 +1887,7 @@
     ac_save_LIBS="$LIBS"
   LIBS="-lpthread  $LIBS"
   cat > conftest.$ac_ext <<EOF
  -#line 1969 "configure"
  +#line 1891 "configure"
   #include "confdefs.h"
   /* Override any gcc2 internal prototype to avoid an error.  */
   /* We use char because int might match the return type of a gcc2
  @@ -1976,7 +1898,7 @@
   pthread_mutex_init()
   ; return 0; }
   EOF
  -if { (eval echo configure:1980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext}; then
  +if { (eval echo configure:1902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest; then
     rm -rf conftest*
     eval "ac_cv_lib_$ac_lib_var=yes"
   else
  @@ -2033,12 +1955,12 @@
   fi
   
   echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
  -echo "configure:2037: checking for ANSI C header files" >&5
  +echo "configure:1959: checking for ANSI C header files" >&5
   if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2042 "configure"
  +#line 1964 "configure"
   #include "confdefs.h"
   #include <stdlib.h>
   #include <stdarg.h>
  @@ -2046,8 +1968,8 @@
   #include <float.h>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:1972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     ac_cv_header_stdc=yes
  @@ -2063,7 +1985,7 @@
   if test $ac_cv_header_stdc = yes; then
     # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat > conftest.$ac_ext <<EOF
  -#line 2067 "configure"
  +#line 1989 "configure"
   #include "confdefs.h"
   #include <string.h>
   EOF
  @@ -2081,7 +2003,7 @@
   if test $ac_cv_header_stdc = yes; then
     # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat > conftest.$ac_ext <<EOF
  -#line 2085 "configure"
  +#line 2007 "configure"
   #include "confdefs.h"
   #include <stdlib.h>
   EOF
  @@ -2102,7 +2024,7 @@
     :
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2106 "configure"
  +#line 2028 "configure"
   #include "confdefs.h"
   #include <ctype.h>
   #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  @@ -2113,7 +2035,7 @@
   exit (0); }
   
   EOF
  -if { (eval echo configure:2117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  +if { (eval echo configure:2039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest && (./conftest; exit) 2>/dev/null
   then
     :
   else
  @@ -2141,18 +2063,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2145: checking for $ac_hdr" >&5
  +echo "configure:2067: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2150 "configure"
  +#line 2072 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:2077: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2181,18 +2103,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2185: checking for $ac_hdr" >&5
  +echo "configure:2107: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2190 "configure"
  +#line 2112 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:2117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2221,18 +2143,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2225: checking for $ac_hdr" >&5
  +echo "configure:2147: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2230 "configure"
  +#line 2152 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2235: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:2157: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2261,18 +2183,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2265: checking for $ac_hdr" >&5
  +echo "configure:2187: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2270 "configure"
  +#line 2192 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2275: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:2197: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2301,18 +2223,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2305: checking for $ac_hdr" >&5
  +echo "configure:2227: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2310 "configure"
  +#line 2232 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:2237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2341,18 +2263,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2345: checking for $ac_hdr" >&5
  +echo "configure:2267: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2350 "configure"
  +#line 2272 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:2277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2381,18 +2303,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2385: checking for $ac_hdr" >&5
  +echo "configure:2307: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2390 "configure"
  +#line 2312 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:2317: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2421,18 +2343,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2425: checking for $ac_hdr" >&5
  +echo "configure:2347: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2430 "configure"
  +#line 2352 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2435: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:2357: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2461,18 +2383,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2465: checking for $ac_hdr" >&5
  +echo "configure:2387: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2470 "configure"
  +#line 2392 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2475: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:2397: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2501,18 +2423,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2505: checking for $ac_hdr" >&5
  +echo "configure:2427: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2510 "configure"
  +#line 2432 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2515: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:2437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2541,18 +2463,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2545: checking for $ac_hdr" >&5
  +echo "configure:2467: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2550 "configure"
  +#line 2472 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:2477: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2581,18 +2503,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2585: checking for $ac_hdr" >&5
  +echo "configure:2507: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2590 "configure"
  +#line 2512 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:2517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2621,18 +2543,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2625: checking for $ac_hdr" >&5
  +echo "configure:2547: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2630 "configure"
  +#line 2552 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2635: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:2557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2661,18 +2583,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2665: checking for $ac_hdr" >&5
  +echo "configure:2587: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2670 "configure"
  +#line 2592 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2675: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:2597: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2701,18 +2623,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2705: checking for $ac_hdr" >&5
  +echo "configure:2627: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2710 "configure"
  +#line 2632 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:2637: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2741,18 +2663,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2745: checking for $ac_hdr" >&5
  +echo "configure:2667: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2750 "configure"
  +#line 2672 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:2677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2781,18 +2703,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2785: checking for $ac_hdr" >&5
  +echo "configure:2707: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2790 "configure"
  +#line 2712 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2795: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:2717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2821,18 +2743,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2825: checking for $ac_hdr" >&5
  +echo "configure:2747: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2830 "configure"
  +#line 2752 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2835: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:2757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2861,18 +2783,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2865: checking for $ac_hdr" >&5
  +echo "configure:2787: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2870 "configure"
  +#line 2792 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:2797: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2901,18 +2823,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2905: checking for $ac_hdr" >&5
  +echo "configure:2827: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2910 "configure"
  +#line 2832 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:2837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2941,18 +2863,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2945: checking for $ac_hdr" >&5
  +echo "configure:2867: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2950 "configure"
  +#line 2872 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:2877: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2981,18 +2903,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2985: checking for $ac_hdr" >&5
  +echo "configure:2907: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2990 "configure"
  +#line 2912 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2995: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:2917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3021,18 +2943,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3025: checking for $ac_hdr" >&5
  +echo "configure:2947: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 3030 "configure"
  +#line 2952 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3035: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:2957: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3061,18 +2983,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3065: checking for $ac_hdr" >&5
  +echo "configure:2987: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 3070 "configure"
  +#line 2992 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:2997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3101,18 +3023,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3105: checking for $ac_hdr" >&5
  +echo "configure:3027: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 3110 "configure"
  +#line 3032 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:3037: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3141,18 +3063,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3145: checking for $ac_hdr" >&5
  +echo "configure:3067: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 3150 "configure"
  +#line 3072 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:3077: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3181,18 +3103,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3185: checking for $ac_hdr" >&5
  +echo "configure:3107: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 3190 "configure"
  +#line 3112 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:3117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3221,18 +3143,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3225: checking for $ac_hdr" >&5
  +echo "configure:3147: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 3230 "configure"
  +#line 3152 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3235: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:3157: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3261,18 +3183,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3265: checking for $ac_hdr" >&5
  +echo "configure:3187: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 3270 "configure"
  +#line 3192 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3275: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:3197: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3301,18 +3223,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3305: checking for $ac_hdr" >&5
  +echo "configure:3227: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 3310 "configure"
  +#line 3232 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:3237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3341,18 +3263,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3345: checking for $ac_hdr" >&5
  +echo "configure:3267: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 3350 "configure"
  +#line 3272 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:3277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3381,18 +3303,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3385: checking for $ac_hdr" >&5
  +echo "configure:3307: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 3390 "configure"
  +#line 3312 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:3317: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3421,18 +3343,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3425: checking for $ac_hdr" >&5
  +echo "configure:3347: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 3430 "configure"
  +#line 3352 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3435: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:3357: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3457,22 +3379,62 @@
   fi
   done
   
  +for ac_hdr in poll.h
  +do
  +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  +echo "configure:3387: checking for $ac_hdr" >&5
  +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  +  echo $ac_n "(cached) $ac_c" 1>&6
  +else
  +  cat > conftest.$ac_ext <<EOF
  +#line 3392 "configure"
  +#include "confdefs.h"
  +#include <$ac_hdr>
  +EOF
  +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  +{ (eval echo configure:3397: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
  +if test -z "$ac_err"; then
  +  rm -rf conftest*
  +  eval "ac_cv_header_$ac_safe=yes"
  +else
  +  echo "$ac_err" >&5
  +  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*
  +fi
  +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
  +  echo "$ac_t""yes" 1>&6
  +    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 
'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
  +  cat >> confdefs.h <<EOF
  +#define $ac_tr_hdr 1
  +EOF
  + 
  +else
  +  echo "$ac_t""no" 1>&6
  +fi
  +done
  +
   for ac_hdr in unix.h
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3465: checking for $ac_hdr" >&5
  +echo "configure:3427: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 3470 "configure"
  +#line 3432 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3475: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:3437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3501,18 +3463,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3505: checking for $ac_hdr" >&5
  +echo "configure:3467: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 3510 "configure"
  +#line 3472 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3515: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:3477: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3542,18 +3504,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3546: checking for $ac_hdr" >&5
  +echo "configure:3508: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 3551 "configure"
  +#line 3513 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3556: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:3518: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3582,18 +3544,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3586: checking for $ac_hdr" >&5
  +echo "configure:3548: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 3591 "configure"
  +#line 3553 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:3558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3623,18 +3585,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3627: checking for $ac_hdr" >&5
  +echo "configure:3589: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 3632 "configure"
  +#line 3594 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3637: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:3599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3663,18 +3625,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3667: checking for $ac_hdr" >&5
  +echo "configure:3629: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 3672 "configure"
  +#line 3634 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:3639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3703,18 +3665,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3707: checking for $ac_hdr" >&5
  +echo "configure:3669: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 3712 "configure"
  +#line 3674 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:3679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3743,18 +3705,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3747: checking for $ac_hdr" >&5
  +echo "configure:3709: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 3752 "configure"
  +#line 3714 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:3719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3783,18 +3745,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3787: checking for $ac_hdr" >&5
  +echo "configure:3749: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 3792 "configure"
  +#line 3754 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3797: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:3759: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3823,18 +3785,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3827: checking for $ac_hdr" >&5
  +echo "configure:3789: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 3832 "configure"
  +#line 3794 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:3799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3863,18 +3825,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3867: checking for $ac_hdr" >&5
  +echo "configure:3829: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 3872 "configure"
  +#line 3834 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3877: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:3839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3903,18 +3865,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3907: checking for $ac_hdr" >&5
  +echo "configure:3869: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 3912 "configure"
  +#line 3874 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:3879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3943,18 +3905,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3947: checking for $ac_hdr" >&5
  +echo "configure:3909: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 3952 "configure"
  +#line 3914 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3957: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:3919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3983,18 +3945,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3987: checking for $ac_hdr" >&5
  +echo "configure:3949: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 3992 "configure"
  +#line 3954 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:3959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -4024,18 +3986,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:4028: checking for $ac_hdr" >&5
  +echo "configure:3990: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 4033 "configure"
  +#line 3995 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:4038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:4000: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -4062,12 +4024,12 @@
   
   
   echo $ac_n "checking for working const""... $ac_c" 1>&6
  -echo "configure:4066: checking for working const" >&5
  +echo "configure:4028: checking for working const" >&5
   if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 4071 "configure"
  +#line 4033 "configure"
   #include "confdefs.h"
   
   int main() {
  @@ -4116,7 +4078,7 @@
   
   ; return 0; }
   EOF
  -if { (eval echo configure:4120: \"$ac_compile\") 1>&5; (eval $ac_compile) 
2>&5; }; then
  +if { (eval echo configure:4082: \"$ac_compile\") 1>&5; (eval $ac_compile) 
2>&5; }; then
     rm -rf conftest*
     ac_cv_c_const=yes
   else
  @@ -4137,12 +4099,12 @@
   fi
   
   echo $ac_n "checking for size_t""... $ac_c" 1>&6
  -echo "configure:4141: checking for size_t" >&5
  +echo "configure:4103: checking for size_t" >&5
   if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 4146 "configure"
  +#line 4108 "configure"
   #include "confdefs.h"
   #include <sys/types.h>
   #if STDC_HEADERS
  @@ -4151,7 +4113,7 @@
   #endif
   EOF
   if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  -  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
  +  egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
     rm -rf conftest*
     ac_cv_type_size_t=yes
   else
  @@ -4173,18 +4135,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:4177: checking for $ac_hdr" >&5
  +echo "configure:4139: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 4182 "configure"
  +#line 4144 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:4187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +{ (eval echo configure:4149: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -4212,12 +4174,12 @@
   for ac_func in getpagesize
   do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
  -echo "configure:4216: checking for $ac_func" >&5
  +echo "configure:4178: checking for $ac_func" >&5
   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 4221 "configure"
  +#line 4183 "configure"
   #include "confdefs.h"
   /* System header to define __stub macros and hopefully few prototypes,
       which can conflict with char $ac_func(); below.  */
  @@ -4240,7 +4202,7 @@
   
   ; return 0; }
   EOF
  -if { (eval echo configure:4244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext}; then
  +if { (eval echo configure:4206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest; then
     rm -rf conftest*
     eval "ac_cv_func_$ac_func=yes"
   else
  @@ -4265,7 +4227,7 @@
   done
   
   echo $ac_n "checking for working mmap""... $ac_c" 1>&6
  -echo "configure:4269: checking for working mmap" >&5
  +echo "configure:4231: checking for working mmap" >&5
   if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; 
then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -4273,7 +4235,7 @@
     ac_cv_func_mmap_fixed_mapped=no
   else
     cat > conftest.$ac_ext <<EOF
  -#line 4277 "configure"
  +#line 4239 "configure"
   #include "confdefs.h"
   
   /* Thanks to Mike Haertel and Jim Avera for this test.
  @@ -4413,7 +4375,7 @@
   }
   
   EOF
  -if { (eval echo configure:4417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  +if { (eval echo configure:4379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest && (./conftest; exit) 2>/dev/null
   then
     ac_cv_func_mmap_fixed_mapped=yes
   else
  @@ -4436,7 +4398,7 @@
   fi
   
   echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
  -echo "configure:4440: checking whether setpgrp takes no argument" >&5
  +echo "configure:4402: checking whether setpgrp takes no argument" >&5
   if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -4444,13 +4406,9 @@
     { echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; 
exit 1; }
   else
     cat > conftest.$ac_ext <<EOF
  -#line 4448 "configure"
  +#line 4410 "configure"
   #include "confdefs.h"
   
  -#ifdef HAVE_UNISTD_H
  -#include <unistd.h>
  -#endif
  -
   /*
    * If this system has a BSD-style setpgrp, which takes arguments, exit
    * successfully.
  @@ -4464,7 +4422,7 @@
   }
   
   EOF
  -if { (eval echo configure:4468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  +if { (eval echo configure:4426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest && (./conftest; exit) 2>/dev/null
   then
     ac_cv_func_setpgrp_void=no
   else
  @@ -4489,9 +4447,9 @@
   
   
   echo $ac_n "checking looking for union semun in sys/sem.h""... $ac_c" 1>&6
  -echo "configure:4493: checking looking for union semun in sys/sem.h" >&5
  +echo "configure:4451: checking looking for union semun in sys/sem.h" >&5
   cat > conftest.$ac_ext <<EOF
  -#line 4495 "configure"
  +#line 4453 "configure"
   #include "confdefs.h"
   
   #include <sys/types.h>
  @@ -4505,7 +4463,7 @@
   
   ; return 0; }
   EOF
  -if { (eval echo configure:4509: \"$ac_compile\") 1>&5; (eval $ac_compile) 
2>&5; }; then
  +if { (eval echo configure:4467: \"$ac_compile\") 1>&5; (eval $ac_compile) 
2>&5; }; then
     rm -rf conftest*
     cat >> confdefs.h <<\EOF
   #define HAVE_STRUCT_UNION_SEMUN 1
  @@ -4524,12 +4482,12 @@
   for ac_func in strcasecmp stricmp poll setsid
   do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
  -echo "configure:4528: checking for $ac_func" >&5
  +echo "configure:4486: checking for $ac_func" >&5
   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 4533 "configure"
  +#line 4491 "configure"
   #include "confdefs.h"
   /* System header to define __stub macros and hopefully few prototypes,
       which can conflict with char $ac_func(); below.  */
  @@ -4552,7 +4510,7 @@
   
   ; return 0; }
   EOF
  -if { (eval echo configure:4556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext}; then
  +if { (eval echo configure:4514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest; then
     rm -rf conftest*
     eval "ac_cv_func_$ac_func=yes"
   else
  @@ -4579,12 +4537,12 @@
   for ac_func in sigaction writev
   do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
  -echo "configure:4583: checking for $ac_func" >&5
  +echo "configure:4541: checking for $ac_func" >&5
   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 4588 "configure"
  +#line 4546 "configure"
   #include "confdefs.h"
   /* System header to define __stub macros and hopefully few prototypes,
       which can conflict with char $ac_func(); below.  */
  @@ -4607,7 +4565,7 @@
   
   ; return 0; }
   EOF
  -if { (eval echo configure:4611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext}; then
  +if { (eval echo configure:4569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest; then
     rm -rf conftest*
     eval "ac_cv_func_$ac_func=yes"
   else
  @@ -4663,7 +4621,7 @@
   # 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.
   (set) 2>&1 |
  -  case `(ac_space=' '; set | grep ac_space) 2>&1` in
  +  case `(ac_space=' '; set) 2>&1` in
     *ac_space=\ *)
       # `set' does not quote correctly, so add quotes (double-quote 
substitution
       # turns \\\\ into \\, and sed turns \\ into \).
  @@ -4730,7 +4688,7 @@
       echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create 
--no-recursion"
       exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create 
--no-recursion ;;
     -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
  -    echo "$CONFIG_STATUS generated by autoconf version 2.13"
  +    echo "$CONFIG_STATUS generated by autoconf version 2.12"
       exit 0 ;;
     -help | --help | --hel | --he | --h)
       echo "\$ac_cs_usage"; exit 0 ;;
  @@ -4753,11 +4711,9 @@
    s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
   $ac_vpsub
   $extrasub
  [EMAIL PROTECTED]@%$SHELL%g
   [EMAIL PROTECTED]@%$CFLAGS%g
   [EMAIL PROTECTED]@%$CPPFLAGS%g
   [EMAIL PROTECTED]@%$CXXFLAGS%g
  [EMAIL PROTECTED]@%$FFLAGS%g
   [EMAIL PROTECTED]@%$DEFS%g
   [EMAIL PROTECTED]@%$LDFLAGS%g
   [EMAIL PROTECTED]@%$LIBS%g
  
  
  
  1.2       +1 -0      apache-2.0/mpm/src/lib/apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/lib/apr/configure.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- configure.in      1999/08/17 15:59:35     1.1
  +++ configure.in      1999/08/18 13:33:23     1.2
  @@ -144,6 +144,7 @@
   AC_CHECK_HEADERS(tpfeq.h)
   AC_CHECK_HEADERS(tpfio.h)
   AC_CHECK_HEADERS(unistd.h)
  +AC_CHECK_HEADERS(poll.h)
   AC_CHECK_HEADERS(unix.h)
   AC_CHECK_HEADERS(winsock.h)
   
  
  
  
  1.2       +3 -3      apache-2.0/mpm/src/lib/apr/file_io/unix/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/lib/apr/file_io/unix/open.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- open.c    1999/08/17 15:59:36     1.1
  +++ open.c    1999/08/18 13:33:24     1.2
  @@ -100,8 +100,8 @@
    *          APR_EXCL             return error if APR_CREATE and file exists
    * arg 4) Access permissions for file.
    * arg 5) The opened file descriptor.
  - * NOTE:  If mode is -1, the system open command will be called without any
  - *        mode parameters.
  + * NOTE:  If mode is APR_OS_DEFAULT, the system open command will be 
  + *        called without any mode parameters.
    */
   ap_status_t ap_open(ap_context_t *cont, char *fname, ap_int32_t flag,  
ap_fileperms_t perm, struct file_t **new)
   {
  @@ -152,7 +152,7 @@
           oflags |= O_TRUNC;
       }
    
  -    if (mode == -1) {
  +    if (perm == APR_OS_DEFAULT) {
           (*new)->filedes = open(fname, oflags);
       }
       else {
  
  
  
  1.2       +9 -0      apache-2.0/mpm/src/lib/apr/file_io/unix/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/lib/apr/file_io/unix/readwrite.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- readwrite.c       1999/08/17 15:59:36     1.1
  +++ readwrite.c       1999/08/18 13:33:25     1.2
  @@ -58,9 +58,18 @@
   #include "apr_general.h"
   #include "apr_lib.h"
   #include "apr_errno.h"
  +#ifdef HAVE_ERRNO_H
   #include <errno.h>
  +#endif
  +#ifdef HAVE_UNISTD_H
   #include <unistd.h>
  +#endif
  +#ifdef HAVE_STDLIB_H
  +#include <stdlib.h>
  +#endif
  +#ifdef HAVE_SYS_UIO_H
   #include <sys/uio.h>
  +#endif
   
   /* ***APRDOC********************************************************
    * ap_status_t ap_read(ap_file_t *, void *, ap_ssize_t *)
  
  
  
  1.2       +3 -0      apache-2.0/mpm/src/lib/apr/include/apr_config.h.in
  
  Index: apr_config.h.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/lib/apr/include/apr_config.h.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_config.h.in   1999/08/17 15:59:37     1.1
  +++ apr_config.h.in   1999/08/18 13:33:26     1.2
  @@ -151,6 +151,9 @@
   /* Define if you have the <osreldate.h> header file.  */
   #undef HAVE_OSRELDATE_H
   
  +/* Define if you have the <poll.h> header file.  */
  +#undef HAVE_POLL_H
  +
   /* Define if you have the <process.h> header file.  */
   #undef HAVE_PROCESS_H
   
  
  
  
  1.2       +2 -0      apache-2.0/mpm/src/lib/apr/include/apr_file_io.h
  
  Index: apr_file_io.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/lib/apr/include/apr_file_io.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_file_io.h     1999/08/17 15:59:37     1.1
  +++ apr_file_io.h     1999/08/18 13:33:27     1.2
  @@ -96,6 +96,8 @@
   #define APR_WWRITE    0x002
   #define APR_WEXECUTE  0x001
   
  +#define APR_OS_DEFAULT 0xFFF
  +
   /* should be same as whence type in lseek, POSIZ defines this as int */
   typedef ap_int32_t       ap_seek_where_t;
   
  
  
  
  1.2       +4 -0      apache-2.0/mpm/src/lib/apr/lib/apr_pools.c
  
  Index: apr_pools.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/lib/apr/lib/apr_pools.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_pools.c       1999/08/17 15:59:37     1.1
  +++ apr_pools.c       1999/08/18 13:33:27     1.2
  @@ -72,8 +72,12 @@
   #include "apr_pools.h"
   #include "apr_lib.h"
   #include "misc.h"
  +#ifdef HAVE_STDLIB_H
   #include <stdlib.h>
  +#endif
  +#ifdef HAVE_MALLOC_H
   #include <malloc.h>
  +#endif
   
   /*
    * Debugging support: Define this to enable code which helps detect re-use
  
  
  
  1.2       +4 -0      apache-2.0/mpm/src/lib/apr/lib/apr_tables.c
  
  Index: apr_tables.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/lib/apr/lib/apr_tables.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_tables.c      1999/08/17 15:59:40     1.1
  +++ apr_tables.c      1999/08/18 13:33:27     1.2
  @@ -72,8 +72,12 @@
   #include "apr_pools.h"
   #include "apr_lib.h"
   #include "misc.h"
  +#ifdef HAVE_STDLIB_H
   #include <stdlib.h>
  +#endif
  +#ifdef HAVE_MALLOC_H
   #include <malloc.h>
  +#endif
   
   /*****************************************************************
    * This file contains array and table functions only.
  
  
  
  1.2       +2 -0      apache-2.0/mpm/src/lib/apr/network_io/unix/networkio.h
  
  Index: networkio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/lib/apr/network_io/unix/networkio.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- networkio.h       1999/08/17 15:59:43     1.1
  +++ networkio.h       1999/08/18 13:33:28     1.2
  @@ -58,7 +58,9 @@
   
   #include "apr_network_io.h"
   #include "apr_general.h"
  +#ifdef HAVE_POLL_H
   #include <poll.h>
  +#endif
   
   struct socket_t {
       ap_context_t *cntxt;
  
  
  
  1.2       +2 -1      apache-2.0/mpm/src/lib/apr/network_io/unix/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/lib/apr/network_io/unix/poll.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- poll.c    1999/08/17 15:59:43     1.1
  +++ poll.c    1999/08/18 13:33:28     1.2
  @@ -57,8 +57,9 @@
   #include "apr_network_io.h"
   #include "apr_general.h"
   #include "apr_lib.h"
  +#ifdef HAVE_ERRNO_H
   #include <errno.h>
  -#include <sys/poll.h>
  +#endif
   
   #ifdef HAVE_POLL    /* We can just use poll to do our socket polling. */
   
  
  
  

Reply via email to