rbb         99/08/18 13:20:30

  Modified:    mpm/src/lib/apr configure
               mpm/src/lib/apr/file_io/unix Makefile.in
               mpm/src/lib/apr/lib Makefile.in
               mpm/src/lib/apr/misc/unix Makefile.in
               mpm/src/lib/apr/network_io/unix Makefile.in
               mpm/src/lib/apr/test Makefile.in logresolve.c rotatelogs.c
                        suexec.c
               mpm/src/lib/apr/threadproc/unix Makefile.in
               mpm/src/lib/apr/time/unix Makefile.in
  Removed:     mpm/src/lib/apr/test a.out ab client htdigest new server
                        testargs testfile testproc testsig testsock
                        testthread testtime
  Log:
  Run make depend after moving the four header files.  Remove the test programs
  from cvs.  Fix some small problems in some of the test programs.
  
  Revision  Changes    Path
  1.3       +426 -342  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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- configure 1999/08/18 13:33:22     1.2
  +++ configure 1999/08/18 20:18:40     1.3
  @@ -10,7 +10,7 @@
   
   
   # Guess values for system-dependent variables and create Makefiles.
  -# Generated automatically using autoconf version 2.12 
  +# Generated automatically using autoconf version 2.13 
   # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
   #
   # This configure script is free software; the Free Software Foundation
  @@ -60,6 +60,7 @@
   # 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
   
  @@ -343,7 +344,7 @@
       verbose=yes ;;
   
     -version | --version | --versio | --versi | --vers)
  -    echo "configure generated by autoconf version 2.12"
  +    echo "configure generated by autoconf version 2.13"
       exit 0 ;;
   
     -with-* | --with-*)
  @@ -513,9 +514,11 @@
   # 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 $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext 
$LIBS 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
   
  +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
  @@ -545,15 +548,16 @@
   # 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:549: checking for $ac_word" >&5
  +echo "configure:552: 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}:"
  -  for ac_dir in $PATH; do
  +  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="gcc"
  @@ -574,16 +578,17 @@
     # 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:578: checking for $ac_word" >&5
  +echo "configure:582: 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="${IFS=        }"; ac_save_ifs="$IFS"; IFS=":"
     ac_prog_rejected=no
  -  for ac_dir in $PATH; do
  +  ac_dummy="$PATH"
  +  for ac_dir in $ac_dummy; 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
  @@ -618,25 +623,61 @@
     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:626: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) 
works" >&5
  +echo "configure:665: 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 $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext 
$LIBS 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
   
  -cat > conftest.$ac_ext <<EOF
  -#line 636 "configure"
  +cat > conftest.$ac_ext << EOF
  +
  +#line 676 "configure"
   #include "confdefs.h"
  +
   main(){return(0);}
   EOF
  -if { (eval echo configure:640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest; then
  +if { (eval echo configure:681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext}; 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
  @@ -650,18 +691,24 @@
     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:660: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) 
is a cross-compiler" >&5
  +echo "configure:707: 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:665: checking whether we are using GNU C" >&5
  +echo "configure:712: 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
  @@ -670,7 +717,7 @@
     yes;
   #endif
   EOF
  -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
  +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
     ac_cv_prog_gcc=yes
   else
     ac_cv_prog_gcc=no
  @@ -681,11 +728,15 @@
   
   if test $ac_cv_prog_gcc = yes; then
     GCC=yes
  -  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
  +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
   if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -700,30 +751,35 @@
   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 "$ac_test_CFLAGS" = set; then
  +  CFLAGS="$ac_save_CFLAGS"
  +elif test $ac_cv_prog_cc_g = yes; then
  +  if test "$GCC" = yes; then
       CFLAGS="-g -O2"
     else
  -    CFLAGS="-O2"
  +    CFLAGS="-g"
     fi
   else
  -  GCC=
  -  test "${CFLAGS+set}" = set || CFLAGS="-g"
  +  if test "$GCC" = yes; then
  +    CFLAGS="-O2"
  +  else
  +    CFLAGS=
  +  fi
   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:719: checking for $ac_word" >&5
  +echo "configure:774: 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="${IFS}:"
  -  for ac_dir in $PATH; do
  +  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_RANLIB="ranlib"
  @@ -742,7 +798,7 @@
   fi
   
   echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
  -echo "configure:746: checking whether ${MAKE-make} sets \${MAKE}" >&5
  +echo "configure:802: 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
  @@ -771,15 +827,16 @@
   # 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:775: checking for $ac_word" >&5
  +echo "configure:831: 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="${IFS}:"
  -  for ac_dir in $PATH; do
  +  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_RM="rm"
  @@ -799,15 +856,16 @@
   # 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:803: checking for $ac_word" >&5
  +echo "configure:860: 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="${IFS}:"
  -  for ac_dir in $PATH; do
  +  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_AR="ar"
  @@ -832,7 +890,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:836: checking how to run the C preprocessor" >&5
  +echo "configure:894: checking how to run the C preprocessor" >&5
   # On Suns, sometimes $CPP names a directory.
   if test -n "$CPP" && test -d "$CPP"; then
     CPP=
  @@ -847,14 +905,14 @@
     # On the NeXT, cc -E runs the code through the compiler's parser,
     # not just through cpp.
     cat > conftest.$ac_ext <<EOF
  -#line 851 "configure"
  +#line 909 "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:857: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     :
   else
  @@ -864,14 +922,14 @@
     rm -rf conftest*
     CPP="${CC-cc} -E -traditional-cpp"
     cat > conftest.$ac_ext <<EOF
  -#line 868 "configure"
  +#line 926 "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:874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     :
   else
  @@ -879,11 +937,30 @@
     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"
  @@ -893,9 +970,9 @@
   echo "$ac_t""$CPP" 1>&6
   
   echo $ac_n "checking for AIX""... $ac_c" 1>&6
  -echo "configure:897: checking for AIX" >&5
  +echo "configure:974: checking for AIX" >&5
   cat > conftest.$ac_ext <<EOF
  -#line 899 "configure"
  +#line 976 "configure"
   #include "confdefs.h"
   #ifdef _AIX
     yes
  @@ -918,7 +995,7 @@
   
   
   echo $ac_n "checking size of char""... $ac_c" 1>&6
  -echo "configure:922: checking size of char" >&5
  +echo "configure:999: 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
  @@ -926,7 +1003,7 @@
     ac_cv_sizeof_char=1
   else
     cat > conftest.$ac_ext <<EOF
  -#line 930 "configure"
  +#line 1007 "configure"
   #include "confdefs.h"
   #include <stdio.h>
   main()
  @@ -937,7 +1014,7 @@
     exit(0);
   }
   EOF
  -if { (eval echo configure:941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest && (./conftest; exit) 2>/dev/null
  +if { (eval echo configure:1018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
   then
     ac_cv_sizeof_char=`cat conftestval`
   else
  @@ -957,7 +1034,7 @@
   
   
   echo $ac_n "checking size of int""... $ac_c" 1>&6
  -echo "configure:961: checking size of int" >&5
  +echo "configure:1038: 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
  @@ -965,7 +1042,7 @@
     ac_cv_sizeof_int=4
   else
     cat > conftest.$ac_ext <<EOF
  -#line 969 "configure"
  +#line 1046 "configure"
   #include "confdefs.h"
   #include <stdio.h>
   main()
  @@ -976,7 +1053,7 @@
     exit(0);
   }
   EOF
  -if { (eval echo configure:980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest && (./conftest; exit) 2>/dev/null
  +if { (eval echo configure:1057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
   then
     ac_cv_sizeof_int=`cat conftestval`
   else
  @@ -996,7 +1073,7 @@
   
   
   echo $ac_n "checking size of long""... $ac_c" 1>&6
  -echo "configure:1000: checking size of long" >&5
  +echo "configure:1077: 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
  @@ -1004,7 +1081,7 @@
     ac_cv_sizeof_long=4
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1008 "configure"
  +#line 1085 "configure"
   #include "confdefs.h"
   #include <stdio.h>
   main()
  @@ -1015,7 +1092,7 @@
     exit(0);
   }
   EOF
  -if { (eval echo configure:1019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest && (./conftest; exit) 2>/dev/null
  +if { (eval echo configure:1096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
   then
     ac_cv_sizeof_long=`cat conftestval`
   else
  @@ -1035,7 +1112,7 @@
   
   
   echo $ac_n "checking size of short""... $ac_c" 1>&6
  -echo "configure:1039: checking size of short" >&5
  +echo "configure:1116: 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
  @@ -1043,7 +1120,7 @@
     ac_cv_sizeof_short=2
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1047 "configure"
  +#line 1124 "configure"
   #include "confdefs.h"
   #include <stdio.h>
   main()
  @@ -1054,7 +1131,7 @@
     exit(0);
   }
   EOF
  -if { (eval echo configure:1058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest && (./conftest; exit) 2>/dev/null
  +if { (eval echo configure:1135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
   then
     ac_cv_sizeof_short=`cat conftestval`
   else
  @@ -1074,7 +1151,7 @@
   
   
   echo $ac_n "checking size of long double""... $ac_c" 1>&6
  -echo "configure:1078: checking size of long double" >&5
  +echo "configure:1155: 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
  @@ -1082,7 +1159,7 @@
     ac_cv_sizeof_long_double=12
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1086 "configure"
  +#line 1163 "configure"
   #include "confdefs.h"
   #include <stdio.h>
   main()
  @@ -1093,7 +1170,7 @@
     exit(0);
   }
   EOF
  -if { (eval echo configure:1097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest && (./conftest; exit) 2>/dev/null
  +if { (eval echo configure:1174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
   then
     ac_cv_sizeof_long_double=`cat conftestval`
   else
  @@ -1113,7 +1190,7 @@
   
   
   echo $ac_n "checking size of long long""... $ac_c" 1>&6
  -echo "configure:1117: checking size of long long" >&5
  +echo "configure:1194: 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
  @@ -1121,7 +1198,7 @@
     ac_cv_sizeof_long_long=8
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1125 "configure"
  +#line 1202 "configure"
   #include "confdefs.h"
   #include <stdio.h>
   main()
  @@ -1132,7 +1209,7 @@
     exit(0);
   }
   EOF
  -if { (eval echo configure:1136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest && (./conftest; exit) 2>/dev/null
  +if { (eval echo configure:1213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
   then
     ac_cv_sizeof_long_long=`cat conftestval`
   else
  @@ -1153,12 +1230,12 @@
   
   
   echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
  -echo "configure:1157: checking for ANSI C header files" >&5
  +echo "configure:1234: 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 1162 "configure"
  +#line 1239 "configure"
   #include "confdefs.h"
   #include <stdlib.h>
   #include <stdarg.h>
  @@ -1166,8 +1243,8 @@
   #include <float.h>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:1170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     ac_cv_header_stdc=yes
  @@ -1183,7 +1260,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 1187 "configure"
  +#line 1264 "configure"
   #include "confdefs.h"
   #include <string.h>
   EOF
  @@ -1201,7 +1278,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 1205 "configure"
  +#line 1282 "configure"
   #include "confdefs.h"
   #include <stdlib.h>
   EOF
  @@ -1222,7 +1299,7 @@
     :
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1226 "configure"
  +#line 1303 "configure"
   #include "confdefs.h"
   #include <ctype.h>
   #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  @@ -1233,7 +1310,7 @@
   exit (0); }
   
   EOF
  -if { (eval echo configure:1237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest && (./conftest; exit) 2>/dev/null
  +if { (eval echo configure:1314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
   then
     :
   else
  @@ -1257,12 +1334,12 @@
   fi
   
   echo $ac_n "checking for off_t""... $ac_c" 1>&6
  -echo "configure:1261: checking for off_t" >&5
  +echo "configure:1338: 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 1266 "configure"
  +#line 1343 "configure"
   #include "confdefs.h"
   #include <sys/types.h>
   #if STDC_HEADERS
  @@ -1271,7 +1348,7 @@
   #endif
   EOF
   if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  -  egrep "off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
  +  egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
     rm -rf conftest*
     ac_cv_type_off_t=yes
   else
  @@ -1290,12 +1367,12 @@
   fi
   
   echo $ac_n "checking for pid_t""... $ac_c" 1>&6
  -echo "configure:1294: checking for pid_t" >&5
  +echo "configure:1371: 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 1299 "configure"
  +#line 1376 "configure"
   #include "confdefs.h"
   #include <sys/types.h>
   #if STDC_HEADERS
  @@ -1304,7 +1381,7 @@
   #endif
   EOF
   if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  -  egrep "pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
  +  egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
     rm -rf conftest*
     ac_cv_type_pid_t=yes
   else
  @@ -1323,12 +1400,12 @@
   fi
   
   echo $ac_n "checking for size_t""... $ac_c" 1>&6
  -echo "configure:1327: checking for size_t" >&5
  +echo "configure:1404: 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 1332 "configure"
  +#line 1409 "configure"
   #include "confdefs.h"
   #include <sys/types.h>
   #if STDC_HEADERS
  @@ -1337,7 +1414,7 @@
   #endif
   EOF
   if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  -  egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
  +  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
     rm -rf conftest*
     ac_cv_type_size_t=yes
   else
  @@ -1356,12 +1433,12 @@
   fi
   
   echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
  -echo "configure:1360: checking for uid_t in sys/types.h" >&5
  +echo "configure:1437: 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 1365 "configure"
  +#line 1442 "configure"
   #include "confdefs.h"
   #include <sys/types.h>
   EOF
  @@ -1390,12 +1467,12 @@
   fi
   
   echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
  -echo "configure:1394: checking for ssize_t" >&5
  +echo "configure:1471: 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 1399 "configure"
  +#line 1476 "configure"
   #include "confdefs.h"
   #include <sys/types.h>
   #if STDC_HEADERS
  @@ -1404,7 +1481,7 @@
   #endif
   EOF
   if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  -  egrep "ssize_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
  +  egrep "(^|[^a-zA-Z_0-9])ssize_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
     rm -rf conftest*
     ac_cv_type_ssize_t=yes
   else
  @@ -1423,21 +1500,21 @@
   fi
   
   echo $ac_n "checking for inline""... $ac_c" 1>&6
  -echo "configure:1427: checking for inline" >&5
  +echo "configure:1504: 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 1434 "configure"
  +#line 1511 "configure"
   #include "confdefs.h"
   
   int main() {
   } $ac_kw foo() {
   ; return 0; }
   EOF
  -if { (eval echo configure:1441: \"$ac_compile\") 1>&5; (eval $ac_compile) 
2>&5; }; then
  +if { (eval echo configure:1518: \"$ac_compile\") 1>&5; (eval $ac_compile) 
2>&5; }; then
     rm -rf conftest*
     ac_cv_c_inline=$ac_kw; break
   else
  @@ -1470,15 +1547,16 @@
   # 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:1474: checking for $ac_word" >&5
  +echo "configure:1551: 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="${IFS}:"
  -  for ac_dir in $PATH; do
  +  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_SH="sh"
  @@ -1497,12 +1575,12 @@
   
   
   echo $ac_n "checking for LOCK_EX in sys/file.h""... $ac_c" 1>&6
  -echo "configure:1501: checking for LOCK_EX in sys/file.h" >&5
  +echo "configure:1579: 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 1506 "configure"
  +#line 1584 "configure"
   #include "confdefs.h"
   
   #include <sys/file.h>
  @@ -1529,12 +1607,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:1533: checking for F_SETLK in fcntl.h" >&5
  +echo "configure:1611: 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 1538 "configure"
  +#line 1616 "configure"
   #include "confdefs.h"
   
   #include <fcntl.h>
  @@ -1561,12 +1639,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:1565: checking for PTHREAD_PROCESS_SHARED in pthread.h" >&5
  +echo "configure:1643: 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 1570 "configure"
  +#line 1648 "configure"
   #include "confdefs.h"
   
   #include <pthread.h>
  @@ -1762,12 +1840,12 @@
   for ac_func in pthread_mutex_init
   do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
  -echo "configure:1766: checking for $ac_func" >&5
  +echo "configure:1844: 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 1771 "configure"
  +#line 1849 "configure"
   #include "confdefs.h"
   /* System header to define __stub macros and hopefully few prototypes,
       which can conflict with char $ac_func(); below.  */
  @@ -1790,7 +1868,7 @@
   
   ; return 0; }
   EOF
  -if { (eval echo configure:1794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest; then
  +if { (eval echo configure:1872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext}; then
     rm -rf conftest*
     eval "ac_cv_func_$ac_func=yes"
   else
  @@ -1832,7 +1910,7 @@
   esac
   
   echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
  -echo "configure:1836: checking for dlopen in -ldl" >&5
  +echo "configure:1914: 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
  @@ -1840,7 +1918,7 @@
     ac_save_LIBS="$LIBS"
   LIBS="-ldl  $LIBS"
   cat > conftest.$ac_ext <<EOF
  -#line 1844 "configure"
  +#line 1922 "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
  @@ -1851,7 +1929,7 @@
   dlopen()
   ; return 0; }
   EOF
  -if { (eval echo configure:1855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest; then
  +if { (eval echo configure:1933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext}; then
     rm -rf conftest*
     eval "ac_cv_lib_$ac_lib_var=yes"
   else
  @@ -1879,7 +1957,7 @@
   fi
   
   echo $ac_n "checking for pthread_mutex_init in -lpthread""... $ac_c" 1>&6
  -echo "configure:1883: checking for pthread_mutex_init in -lpthread" >&5
  +echo "configure:1961: 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
  @@ -1887,7 +1965,7 @@
     ac_save_LIBS="$LIBS"
   LIBS="-lpthread  $LIBS"
   cat > conftest.$ac_ext <<EOF
  -#line 1891 "configure"
  +#line 1969 "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
  @@ -1898,7 +1976,7 @@
   pthread_mutex_init()
   ; return 0; }
   EOF
  -if { (eval echo configure:1902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest; then
  +if { (eval echo configure:1980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext}; then
     rm -rf conftest*
     eval "ac_cv_lib_$ac_lib_var=yes"
   else
  @@ -1955,12 +2033,12 @@
   fi
   
   echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
  -echo "configure:1959: checking for ANSI C header files" >&5
  +echo "configure:2037: 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 1964 "configure"
  +#line 2042 "configure"
   #include "confdefs.h"
   #include <stdlib.h>
   #include <stdarg.h>
  @@ -1968,8 +2046,8 @@
   #include <float.h>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:1972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     ac_cv_header_stdc=yes
  @@ -1985,7 +2063,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 1989 "configure"
  +#line 2067 "configure"
   #include "confdefs.h"
   #include <string.h>
   EOF
  @@ -2003,7 +2081,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 2007 "configure"
  +#line 2085 "configure"
   #include "confdefs.h"
   #include <stdlib.h>
   EOF
  @@ -2024,7 +2102,7 @@
     :
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2028 "configure"
  +#line 2106 "configure"
   #include "confdefs.h"
   #include <ctype.h>
   #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  @@ -2035,7 +2113,7 @@
   exit (0); }
   
   EOF
  -if { (eval echo configure:2039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest && (./conftest; exit) 2>/dev/null
  +if { (eval echo configure:2117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
   then
     :
   else
  @@ -2063,18 +2141,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2067: checking for $ac_hdr" >&5
  +echo "configure:2145: 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 2072 "configure"
  +#line 2150 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2077: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2103,18 +2181,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2107: checking for $ac_hdr" >&5
  +echo "configure:2185: 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 2112 "configure"
  +#line 2190 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2143,18 +2221,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2147: checking for $ac_hdr" >&5
  +echo "configure:2225: 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 2152 "configure"
  +#line 2230 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2157: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2183,18 +2261,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2187: checking for $ac_hdr" >&5
  +echo "configure:2265: 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 2192 "configure"
  +#line 2270 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2197: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2223,18 +2301,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2227: checking for $ac_hdr" >&5
  +echo "configure:2305: 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 2232 "configure"
  +#line 2310 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2263,18 +2341,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2267: checking for $ac_hdr" >&5
  +echo "configure:2345: 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 2272 "configure"
  +#line 2350 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2303,18 +2381,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2307: checking for $ac_hdr" >&5
  +echo "configure:2385: 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 2312 "configure"
  +#line 2390 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2317: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2343,18 +2421,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2347: checking for $ac_hdr" >&5
  +echo "configure:2425: 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 2352 "configure"
  +#line 2430 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2357: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2383,18 +2461,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2387: checking for $ac_hdr" >&5
  +echo "configure:2465: 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 2392 "configure"
  +#line 2470 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2397: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2423,18 +2501,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2427: checking for $ac_hdr" >&5
  +echo "configure:2505: 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 2432 "configure"
  +#line 2510 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2463,18 +2541,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2467: checking for $ac_hdr" >&5
  +echo "configure:2545: 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 2472 "configure"
  +#line 2550 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2477: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2503,18 +2581,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2507: checking for $ac_hdr" >&5
  +echo "configure:2585: 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 2512 "configure"
  +#line 2590 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2543,18 +2621,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2547: checking for $ac_hdr" >&5
  +echo "configure:2625: 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 2552 "configure"
  +#line 2630 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2583,18 +2661,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2587: checking for $ac_hdr" >&5
  +echo "configure:2665: 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 2592 "configure"
  +#line 2670 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2597: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2623,18 +2701,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2627: checking for $ac_hdr" >&5
  +echo "configure:2705: 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 2632 "configure"
  +#line 2710 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2637: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2663,18 +2741,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2667: checking for $ac_hdr" >&5
  +echo "configure:2745: 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 2672 "configure"
  +#line 2750 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2703,18 +2781,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2707: checking for $ac_hdr" >&5
  +echo "configure:2785: 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 2712 "configure"
  +#line 2790 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2743,18 +2821,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2747: checking for $ac_hdr" >&5
  +echo "configure:2825: 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 2752 "configure"
  +#line 2830 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2783,18 +2861,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2787: checking for $ac_hdr" >&5
  +echo "configure:2865: 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 2792 "configure"
  +#line 2870 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2797: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2823,18 +2901,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2827: checking for $ac_hdr" >&5
  +echo "configure:2905: 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 2832 "configure"
  +#line 2910 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2863,18 +2941,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2867: checking for $ac_hdr" >&5
  +echo "configure:2945: 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 2872 "configure"
  +#line 2950 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2877: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2903,18 +2981,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2907: checking for $ac_hdr" >&5
  +echo "configure:2985: 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 2912 "configure"
  +#line 2990 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2943,18 +3021,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2947: checking for $ac_hdr" >&5
  +echo "configure:3025: 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 2952 "configure"
  +#line 3030 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2957: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -2983,18 +3061,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2987: checking for $ac_hdr" >&5
  +echo "configure:3065: 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 2992 "configure"
  +#line 3070 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3023,18 +3101,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3027: checking for $ac_hdr" >&5
  +echo "configure:3105: 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 3032 "configure"
  +#line 3110 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3037: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3063,18 +3141,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3067: checking for $ac_hdr" >&5
  +echo "configure:3145: 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 3072 "configure"
  +#line 3150 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3077: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3103,18 +3181,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3107: checking for $ac_hdr" >&5
  +echo "configure:3185: 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 3112 "configure"
  +#line 3190 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3143,18 +3221,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3147: checking for $ac_hdr" >&5
  +echo "configure:3225: 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 3152 "configure"
  +#line 3230 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3157: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3183,18 +3261,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3187: checking for $ac_hdr" >&5
  +echo "configure:3265: 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 3192 "configure"
  +#line 3270 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3197: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3223,18 +3301,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3227: checking for $ac_hdr" >&5
  +echo "configure:3305: 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 3232 "configure"
  +#line 3310 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3263,18 +3341,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3267: checking for $ac_hdr" >&5
  +echo "configure:3345: 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 3272 "configure"
  +#line 3350 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3303,18 +3381,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3307: checking for $ac_hdr" >&5
  +echo "configure:3385: 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 3312 "configure"
  +#line 3390 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3317: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3343,18 +3421,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3347: checking for $ac_hdr" >&5
  +echo "configure:3425: 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 3352 "configure"
  +#line 3430 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3357: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3383,18 +3461,18 @@
   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
  +echo "configure:3465: 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"
  +#line 3470 "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`
  +{ (eval echo configure:3475: \"$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
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3423,18 +3501,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3427: checking for $ac_hdr" >&5
  +echo "configure:3505: 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 3432 "configure"
  +#line 3510 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3463,18 +3541,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3467: checking for $ac_hdr" >&5
  +echo "configure:3545: 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 3472 "configure"
  +#line 3550 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3477: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out`
  +{ (eval echo configure:3555: \"$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
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3504,18 +3582,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3508: checking for $ac_hdr" >&5
  +echo "configure:3586: 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 3513 "configure"
  +#line 3591 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3518: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3544,18 +3622,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3548: checking for $ac_hdr" >&5
  +echo "configure:3626: 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 3553 "configure"
  +#line 3631 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out`
  +{ (eval echo configure:3636: \"$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
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3585,18 +3663,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3589: checking for $ac_hdr" >&5
  +echo "configure:3667: 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 3594 "configure"
  +#line 3672 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3625,18 +3703,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3629: checking for $ac_hdr" >&5
  +echo "configure:3707: 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 3634 "configure"
  +#line 3712 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3665,18 +3743,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3669: checking for $ac_hdr" >&5
  +echo "configure:3747: 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 3674 "configure"
  +#line 3752 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3705,18 +3783,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3709: checking for $ac_hdr" >&5
  +echo "configure:3787: 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 3714 "configure"
  +#line 3792 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3745,18 +3823,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3749: checking for $ac_hdr" >&5
  +echo "configure:3827: 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 3754 "configure"
  +#line 3832 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3759: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3785,18 +3863,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3789: checking for $ac_hdr" >&5
  +echo "configure:3867: 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 3794 "configure"
  +#line 3872 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3825,18 +3903,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3829: checking for $ac_hdr" >&5
  +echo "configure:3907: 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 3834 "configure"
  +#line 3912 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3865,18 +3943,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3869: checking for $ac_hdr" >&5
  +echo "configure:3947: 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 3874 "configure"
  +#line 3952 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3905,18 +3983,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3909: checking for $ac_hdr" >&5
  +echo "configure:3987: 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 3914 "configure"
  +#line 3992 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' 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}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3945,18 +4023,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3949: checking for $ac_hdr" >&5
  +echo "configure:4027: 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 3954 "configure"
  +#line 4032 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:3959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out`
  +{ (eval echo configure:4037: \"$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
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -3986,18 +4064,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:3990: checking for $ac_hdr" >&5
  +echo "configure:4068: 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 3995 "configure"
  +#line 4073 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:4000: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out`
  +{ (eval echo configure:4078: \"$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
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -4024,12 +4102,12 @@
   
   
   echo $ac_n "checking for working const""... $ac_c" 1>&6
  -echo "configure:4028: checking for working const" >&5
  +echo "configure:4106: 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 4033 "configure"
  +#line 4111 "configure"
   #include "confdefs.h"
   
   int main() {
  @@ -4078,7 +4156,7 @@
   
   ; return 0; }
   EOF
  -if { (eval echo configure:4082: \"$ac_compile\") 1>&5; (eval $ac_compile) 
2>&5; }; then
  +if { (eval echo configure:4160: \"$ac_compile\") 1>&5; (eval $ac_compile) 
2>&5; }; then
     rm -rf conftest*
     ac_cv_c_const=yes
   else
  @@ -4099,12 +4177,12 @@
   fi
   
   echo $ac_n "checking for size_t""... $ac_c" 1>&6
  -echo "configure:4103: checking for size_t" >&5
  +echo "configure:4181: 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 4108 "configure"
  +#line 4186 "configure"
   #include "confdefs.h"
   #include <sys/types.h>
   #if STDC_HEADERS
  @@ -4113,7 +4191,7 @@
   #endif
   EOF
   if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  -  egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
  +  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
     rm -rf conftest*
     ac_cv_type_size_t=yes
   else
  @@ -4135,18 +4213,18 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:4139: checking for $ac_hdr" >&5
  +echo "configure:4217: 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 4144 "configure"
  +#line 4222 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:4149: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  -ac_err=`grep -v '^ *+' conftest.out`
  +{ (eval echo configure:4227: \"$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
     rm -rf conftest*
     eval "ac_cv_header_$ac_safe=yes"
  @@ -4174,12 +4252,12 @@
   for ac_func in getpagesize
   do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
  -echo "configure:4178: checking for $ac_func" >&5
  +echo "configure:4256: 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 4183 "configure"
  +#line 4261 "configure"
   #include "confdefs.h"
   /* System header to define __stub macros and hopefully few prototypes,
       which can conflict with char $ac_func(); below.  */
  @@ -4202,7 +4280,7 @@
   
   ; return 0; }
   EOF
  -if { (eval echo configure:4206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest; then
  +if { (eval echo configure:4284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext}; then
     rm -rf conftest*
     eval "ac_cv_func_$ac_func=yes"
   else
  @@ -4227,7 +4305,7 @@
   done
   
   echo $ac_n "checking for working mmap""... $ac_c" 1>&6
  -echo "configure:4231: checking for working mmap" >&5
  +echo "configure:4309: 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
  @@ -4235,7 +4313,7 @@
     ac_cv_func_mmap_fixed_mapped=no
   else
     cat > conftest.$ac_ext <<EOF
  -#line 4239 "configure"
  +#line 4317 "configure"
   #include "confdefs.h"
   
   /* Thanks to Mike Haertel and Jim Avera for this test.
  @@ -4375,7 +4453,7 @@
   }
   
   EOF
  -if { (eval echo configure:4379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest && (./conftest; exit) 2>/dev/null
  +if { (eval echo configure:4457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
   then
     ac_cv_func_mmap_fixed_mapped=yes
   else
  @@ -4398,7 +4476,7 @@
   fi
   
   echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
  -echo "configure:4402: checking whether setpgrp takes no argument" >&5
  +echo "configure:4480: 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
  @@ -4406,9 +4484,13 @@
     { echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; 
exit 1; }
   else
     cat > conftest.$ac_ext <<EOF
  -#line 4410 "configure"
  +#line 4488 "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.
  @@ -4422,7 +4504,7 @@
   }
   
   EOF
  -if { (eval echo configure:4426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest && (./conftest; exit) 2>/dev/null
  +if { (eval echo configure:4508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
   then
     ac_cv_func_setpgrp_void=no
   else
  @@ -4447,9 +4529,9 @@
   
   
   echo $ac_n "checking looking for union semun in sys/sem.h""... $ac_c" 1>&6
  -echo "configure:4451: checking looking for union semun in sys/sem.h" >&5
  +echo "configure:4533: checking looking for union semun in sys/sem.h" >&5
   cat > conftest.$ac_ext <<EOF
  -#line 4453 "configure"
  +#line 4535 "configure"
   #include "confdefs.h"
   
   #include <sys/types.h>
  @@ -4463,7 +4545,7 @@
   
   ; return 0; }
   EOF
  -if { (eval echo configure:4467: \"$ac_compile\") 1>&5; (eval $ac_compile) 
2>&5; }; then
  +if { (eval echo configure:4549: \"$ac_compile\") 1>&5; (eval $ac_compile) 
2>&5; }; then
     rm -rf conftest*
     cat >> confdefs.h <<\EOF
   #define HAVE_STRUCT_UNION_SEMUN 1
  @@ -4482,12 +4564,12 @@
   for ac_func in strcasecmp stricmp poll setsid
   do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
  -echo "configure:4486: checking for $ac_func" >&5
  +echo "configure:4568: 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 4491 "configure"
  +#line 4573 "configure"
   #include "confdefs.h"
   /* System header to define __stub macros and hopefully few prototypes,
       which can conflict with char $ac_func(); below.  */
  @@ -4510,7 +4592,7 @@
   
   ; return 0; }
   EOF
  -if { (eval echo configure:4514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest; then
  +if { (eval echo configure:4596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext}; then
     rm -rf conftest*
     eval "ac_cv_func_$ac_func=yes"
   else
  @@ -4537,12 +4619,12 @@
   for ac_func in sigaction writev
   do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
  -echo "configure:4541: checking for $ac_func" >&5
  +echo "configure:4623: 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 4546 "configure"
  +#line 4628 "configure"
   #include "confdefs.h"
   /* System header to define __stub macros and hopefully few prototypes,
       which can conflict with char $ac_func(); below.  */
  @@ -4565,7 +4647,7 @@
   
   ; return 0; }
   EOF
  -if { (eval echo configure:4569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest; then
  +if { (eval echo configure:4651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } 
&& test -s conftest${ac_exeext}; then
     rm -rf conftest*
     eval "ac_cv_func_$ac_func=yes"
   else
  @@ -4621,7 +4703,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) 2>&1` in
  +  case `(ac_space=' '; set | grep ac_space) 2>&1` in
     *ac_space=\ *)
       # `set' does not quote correctly, so add quotes (double-quote 
substitution
       # turns \\\\ into \\, and sed turns \\ into \).
  @@ -4688,7 +4770,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.12"
  +    echo "$CONFIG_STATUS generated by autoconf version 2.13"
       exit 0 ;;
     -help | --help | --hel | --he | --h)
       echo "\$ac_cs_usage"; exit 0 ;;
  @@ -4711,9 +4793,11 @@
    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.3       +15 -9     apache-2.0/mpm/src/lib/apr/file_io/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/lib/apr/file_io/unix/Makefile.in,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.in       1999/08/18 12:32:00     1.2
  +++ Makefile.in       1999/08/18 20:18:46     1.3
  @@ -59,16 +59,19 @@
   # DO NOT REMOVE
   dir.o: dir.c fileio.h ../../include/apr_general.h \
    ../../include/apr_config.h ../../include/apr_errno.h \
  - ../../include/apr_file_io.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h \
  - ../../include/apr_portable.h ../../include/apr_thread_proc.h \
  - ../../include/apr_win.h ../../include/apr_network_io.h \
  - ../../include/apr_lock.h ../../include/apr_time.h
  + ../../include/apr_file_io.h ../../include/apr_lib.h \
  + ../../include/hsregex.h ../../include/apr_portable.h \
  + ../../include/apr_thread_proc.h ../../include/apr_win.h \
  + ../../include/apr_network_io.h ../../include/apr_lock.h \
  + ../../include/apr_time.h
   fileacc.o: fileacc.c fileio.h ../../include/apr_general.h \
    ../../include/apr_config.h ../../include/apr_errno.h \
  - ../../include/apr_file_io.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
  + ../../include/apr_file_io.h ../../include/apr_lib.h \
  + ../../include/hsregex.h
   filedup.o: filedup.c fileio.h ../../include/apr_general.h \
    ../../include/apr_config.h ../../include/apr_errno.h \
  - ../../include/apr_file_io.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
  + ../../include/apr_file_io.h ../../include/apr_lib.h \
  + ../../include/hsregex.h
   filestat.o: filestat.c fileio.h ../../include/apr_general.h \
    ../../include/apr_config.h ../../include/apr_errno.h \
    ../../include/apr_file_io.h
  @@ -77,13 +80,16 @@
    ../../include/apr_file_io.h ../../include/apr_portable.h \
    ../../include/apr_thread_proc.h ../../include/apr_win.h \
    ../../include/apr_network_io.h ../../include/apr_lock.h \
  - ../../include/apr_time.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
  + ../../include/apr_time.h ../../include/apr_lib.h \
  + ../../include/hsregex.h
   pipe.o: pipe.c fileio.h ../../include/apr_general.h \
    ../../include/apr_config.h ../../include/apr_errno.h \
  - ../../include/apr_file_io.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
  + ../../include/apr_file_io.h ../../include/apr_lib.h \
  + ../../include/hsregex.h
   readwrite.o: readwrite.c fileio.h ../../include/apr_general.h \
    ../../include/apr_config.h ../../include/apr_errno.h \
  - ../../include/apr_file_io.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
  + ../../include/apr_file_io.h ../../include/apr_lib.h \
  + ../../include/hsregex.h
   seek.o: seek.c fileio.h ../../include/apr_general.h \
    ../../include/apr_config.h ../../include/apr_errno.h \
    ../../include/apr_file_io.h
  
  
  
  1.3       +18 -18    apache-2.0/mpm/src/lib/apr/lib/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/lib/apr/lib/Makefile.in,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.in       1999/08/18 12:32:01     1.2
  +++ Makefile.in       1999/08/18 20:18:50     1.3
  @@ -64,26 +64,26 @@
   apr_cpystrn.o: apr_cpystrn.c ../include/apr_config.h
   apr_execve.o: apr_execve.c ../include/apr_config.h
   apr_fnmatch.o: apr_fnmatch.c ../include/apr_config.h \
  - $(INCDIR)/apr_fnmatch.h $(INCDIR)/apr_lib.h ../include/apr_general.h \
  - ../include/apr_errno.h ../include/apr_file_io.h $(INCDIR)/hsregex.h
  + $(INCDIR)/apr_fnmatch.h ../include/apr_lib.h ../include/apr_general.h \
  + ../include/apr_errno.h ../include/apr_file_io.h ../include/hsregex.h
   apr_getpass.o: apr_getpass.c ../include/apr_config.h \
  - ../include/apr_errno.h $(INCDIR)/apr_lib.h ../include/apr_general.h \
  - ../include/apr_file_io.h $(INCDIR)/hsregex.h
  -apr_md5.o: apr_md5.c ../include/apr_config.h $(INCDIR)/apr_md5.h \
  - $(INCDIR)/apr_lib.h ../include/apr_general.h ../include/apr_errno.h \
  - ../include/apr_file_io.h $(INCDIR)/hsregex.h
  + ../include/apr_errno.h ../include/apr_lib.h ../include/apr_general.h \
  + ../include/apr_file_io.h ../include/hsregex.h
  +apr_md5.o: apr_md5.c ../include/apr_config.h ../include/apr_md5.h \
  + ../include/apr_lib.h ../include/apr_general.h ../include/apr_errno.h \
  + ../include/apr_file_io.h ../include/hsregex.h
   apr_pools.o: apr_pools.c ../include/apr_config.h \
  - ../include/apr_general.h ../include/apr_errno.h \
  - ../include/apr_pools.h $(INCDIR)/apr_lib.h ../include/apr_file_io.h \
  - $(INCDIR)/hsregex.h ../misc/unix/misc.h
  -apr_signal.o: apr_signal.c ../include/apr_config.h $(INCDIR)/apr_lib.h \
  - ../include/apr_general.h ../include/apr_errno.h \
  - ../include/apr_file_io.h $(INCDIR)/hsregex.h
  + ../include/apr_general.h ../include/apr_errno.h $(INCDIR)/apr_pools.h \
  + ../include/apr_lib.h ../include/apr_file_io.h ../include/hsregex.h \
  + ../misc/unix/misc.h
  +apr_signal.o: apr_signal.c ../include/apr_config.h \
  + ../include/apr_lib.h ../include/apr_general.h ../include/apr_errno.h \
  + ../include/apr_file_io.h ../include/hsregex.h
   apr_slack.o: apr_slack.c ../include/apr_config.h
   apr_snprintf.o: apr_snprintf.c ../include/apr_config.h \
  - $(INCDIR)/apr_lib.h ../include/apr_general.h ../include/apr_errno.h \
  - ../include/apr_file_io.h $(INCDIR)/hsregex.h
  + ../include/apr_lib.h ../include/apr_general.h ../include/apr_errno.h \
  + ../include/apr_file_io.h ../include/hsregex.h
   apr_tables.o: apr_tables.c ../include/apr_config.h \
  - ../include/apr_general.h ../include/apr_errno.h \
  - ../include/apr_pools.h $(INCDIR)/apr_lib.h ../include/apr_file_io.h \
  - $(INCDIR)/hsregex.h ../misc/unix/misc.h
  + ../include/apr_general.h ../include/apr_errno.h $(INCDIR)/apr_pools.h \
  + ../include/apr_lib.h ../include/apr_file_io.h ../include/hsregex.h \
  + ../misc/unix/misc.h
  
  
  
  1.3       +2 -2      apache-2.0/mpm/src/lib/apr/misc/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/lib/apr/misc/unix/Makefile.in,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.in       1999/08/18 12:32:02     1.2
  +++ Makefile.in       1999/08/18 20:18:53     1.3
  @@ -56,5 +56,5 @@
    ../../include/apr_file_io.h
   start.o: start.c ../../include/apr_general.h \
    ../../include/apr_config.h ../../include/apr_errno.h \
  - ../../include/apr_pools.h $(INCDIR)/apr_lib.h \
  - ../../include/apr_file_io.h $(INCDIR)/hsregex.h misc.h
  + $(INCDIR)/apr_pools.h ../../include/apr_lib.h \
  + ../../include/apr_file_io.h ../../include/hsregex.h misc.h
  
  
  
  1.3       +6 -5      apache-2.0/mpm/src/lib/apr/network_io/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/lib/apr/network_io/unix/Makefile.in,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.in       1999/08/18 12:32:03     1.2
  +++ Makefile.in       1999/08/18 20:18:56     1.3
  @@ -55,8 +55,8 @@
   # DO NOT REMOVE
   poll.o: poll.c networkio.h ../../include/apr_network_io.h \
    ../../include/apr_general.h ../../include/apr_config.h \
  - ../../include/apr_errno.h $(INCDIR)/apr_lib.h \
  - ../../include/apr_file_io.h $(INCDIR)/hsregex.h
  + ../../include/apr_errno.h ../../include/apr_lib.h \
  + ../../include/apr_file_io.h ../../include/hsregex.h
   sendrecv.o: sendrecv.c networkio.h ../../include/apr_network_io.h \
    ../../include/apr_general.h ../../include/apr_config.h \
    ../../include/apr_errno.h
  @@ -65,8 +65,9 @@
    ../../include/apr_errno.h ../../include/apr_portable.h \
    ../../include/apr_thread_proc.h ../../include/apr_file_io.h \
    ../../include/apr_win.h ../../include/apr_lock.h \
  - ../../include/apr_time.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
  + ../../include/apr_time.h ../../include/apr_lib.h \
  + ../../include/hsregex.h
   sockopt.o: sockopt.c networkio.h ../../include/apr_network_io.h \
    ../../include/apr_general.h ../../include/apr_config.h \
  - ../../include/apr_errno.h $(INCDIR)/apr_lib.h \
  - ../../include/apr_file_io.h $(INCDIR)/hsregex.h
  + ../../include/apr_errno.h ../../include/apr_lib.h \
  + ../../include/apr_file_io.h ../../include/hsregex.h
  
  
  
  1.2       +45 -34    apache-2.0/mpm/src/lib/apr/test/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/lib/apr/test/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in       1999/08/17 15:59:46     1.1
  +++ Makefile.in       1999/08/18 20:18:59     1.2
  @@ -91,37 +91,48 @@
            && rm Makefile.new
   
   # DO NOT REMOVE
  -ab_apr.o: ab_apr.c ../include/apr_network_io.h \
  - ../include/apr_general.h $(INCDIR)/apr_config.h \
  - ../include/apr_errno.h ../include/apr_file_io.h
  -client.o: client.c ../include/apr_network_io.h \
  - ../include/apr_general.h $(INCDIR)/apr_config.h \
  - ../include/apr_errno.h
  -server.o: server.c ../include/apr_network_io.h \
  - ../include/apr_general.h $(INCDIR)/apr_config.h \
  - ../include/apr_errno.h
  -testargs.o: testargs.c ../include/apr_file_io.h \
  - ../include/apr_general.h $(INCDIR)/apr_config.h \
  - ../include/apr_errno.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
  -testfile.o: testfile.c ../include/apr_file_io.h \
  - ../include/apr_general.h $(INCDIR)/apr_config.h \
  - ../include/apr_errno.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
  -testproc.o: testproc.c ../include/apr_thread_proc.h \
  - ../include/apr_file_io.h ../include/apr_general.h \
  - $(INCDIR)/apr_config.h ../include/apr_errno.h \
  - $(INCDIR)/apr_win.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
  -testsig.o: testsig.c ../include/apr_thread_proc.h \
  - ../include/apr_file_io.h ../include/apr_general.h \
  - $(INCDIR)/apr_config.h ../include/apr_errno.h \
  - $(INCDIR)/apr_win.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
  -testsock.o: testsock.c ../include/apr_thread_proc.h \
  - ../include/apr_file_io.h ../include/apr_general.h \
  - $(INCDIR)/apr_config.h ../include/apr_errno.h \
  - $(INCDIR)/apr_win.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
  -testthread.o: testthread.c ../include/apr_thread_proc.h \
  - ../include/apr_file_io.h ../include/apr_general.h \
  - $(INCDIR)/apr_config.h ../include/apr_errno.h \
  - $(INCDIR)/apr_win.h ../include/apr_lock.h
  -testtime.o: testtime.c ../include/apr_time.h \
  - ../include/apr_general.h $(INCDIR)/apr_config.h \
  - ../include/apr_errno.h
  +ab_apr.o: ab_apr.c $(INCDIR)/apr_network_io.h \
  + $(INCDIR)/apr_general.h $(INCDIR)/apr_config.h \
  + $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h
  +abc.o: abc.c $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
  + $(INCDIR)/apr_config.h $(INCDIR)/apr_errno.h
  +client.o: client.c $(INCDIR)/apr_network_io.h \
  + $(INCDIR)/apr_general.h $(INCDIR)/apr_config.h \
  + $(INCDIR)/apr_errno.h
  +htdigest.o: htdigest.c $(INCDIR)/apr_lib.h $(INCDIR)/apr_general.h \
  + $(INCDIR)/apr_config.h $(INCDIR)/apr_errno.h \
  + $(INCDIR)/apr_file_io.h $(INCDIR)/hsregex.h $(INCDIR)/apr_md5.h
  +htpasswd.o: htpasswd.c $(INCDIR)/apr_signal.h \
  + $(INCDIR)/apr_general.h $(INCDIR)/apr_config.h \
  + $(INCDIR)/apr_errno.h $(INCDIR)/apr_lib.h $(INCDIR)/apr_file_io.h \
  + $(INCDIR)/hsregex.h
  +logresolve.o: logresolve.c $(INCDIR)/apr_config.h
  +rotatelogs.o: rotatelogs.c $(INCDIR)/apr_config.h
  +server.o: server.c $(INCDIR)/apr_network_io.h \
  + $(INCDIR)/apr_general.h $(INCDIR)/apr_config.h \
  + $(INCDIR)/apr_errno.h
  +suexec.o: suexec.c $(INCDIR)/apr_config.h suexec.h
  +testargs.o: testargs.c $(INCDIR)/apr_file_io.h \
  + $(INCDIR)/apr_general.h $(INCDIR)/apr_config.h \
  + $(INCDIR)/apr_errno.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
  +testfile.o: testfile.c $(INCDIR)/apr_file_io.h \
  + $(INCDIR)/apr_general.h $(INCDIR)/apr_config.h \
  + $(INCDIR)/apr_errno.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
  +testproc.o: testproc.c $(INCDIR)/apr_thread_proc.h \
  + $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
  + $(INCDIR)/apr_config.h $(INCDIR)/apr_errno.h $(INCDIR)/apr_win.h \
  + $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
  +testsig.o: testsig.c $(INCDIR)/apr_thread_proc.h \
  + $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
  + $(INCDIR)/apr_config.h $(INCDIR)/apr_errno.h $(INCDIR)/apr_win.h \
  + $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
  +testsock.o: testsock.c $(INCDIR)/apr_thread_proc.h \
  + $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
  + $(INCDIR)/apr_config.h $(INCDIR)/apr_errno.h $(INCDIR)/apr_win.h \
  + $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
  +testthread.o: testthread.c $(INCDIR)/apr_thread_proc.h \
  + $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
  + $(INCDIR)/apr_config.h $(INCDIR)/apr_errno.h $(INCDIR)/apr_win.h \
  + $(INCDIR)/apr_lock.h
  +testtime.o: testtime.c $(INCDIR)/apr_time.h $(INCDIR)/apr_general.h \
  + $(INCDIR)/apr_config.h $(INCDIR)/apr_errno.h
  
  
  
  1.2       +1 -1      apache-2.0/mpm/src/lib/apr/test/logresolve.c
  
  Index: logresolve.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/lib/apr/test/logresolve.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logresolve.c      1999/08/17 15:59:49     1.1
  +++ logresolve.c      1999/08/18 20:19:28     1.2
  @@ -39,7 +39,7 @@
    * that one of these matches the original address.
    */
   
  -#include "ap_config.h"
  +#include "apr_config.h"
   #include <sys/types.h>
   
   #include <ctype.h>
  
  
  
  1.2       +1 -1      apache-2.0/mpm/src/lib/apr/test/rotatelogs.c
  
  Index: rotatelogs.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/lib/apr/test/rotatelogs.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- rotatelogs.c      1999/08/17 15:59:49     1.1
  +++ rotatelogs.c      1999/08/18 20:19:33     1.2
  @@ -10,7 +10,7 @@
   #define BUFSIZE              65536
   #define MAX_PATH     1024
   
  -#include "ap_config.h"
  +#include "apr_config.h"
   #include <time.h>
   #include <errno.h>
   #include <fcntl.h>
  
  
  
  1.2       +1 -1      apache-2.0/mpm/src/lib/apr/test/suexec.c
  
  Index: suexec.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/lib/apr/test/suexec.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- suexec.c  1999/08/17 15:59:48     1.1
  +++ suexec.c  1999/08/18 20:19:42     1.2
  @@ -71,7 +71,7 @@
    *
    */
   
  -#include "ap_config.h"
  +#include "apr_config.h"
   #include <sys/param.h>
   #include <sys/stat.h>
   #include <sys/types.h>
  
  
  
  1.3       +4 -4      apache-2.0/mpm/src/lib/apr/threadproc/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/lib/apr/threadproc/unix/Makefile.in,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.in       1999/08/18 12:32:03     1.2
  +++ Makefile.in       1999/08/18 20:20:23     1.3
  @@ -60,14 +60,14 @@
    ../../include/apr_file_io.h ../../include/apr_general.h \
    ../../include/apr_config.h ../../include/apr_errno.h \
    ../../include/apr_win.h ../../file_io/unix/fileio.h \
  - $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h ../../include/apr_portable.h \
  - ../../include/apr_network_io.h ../../include/apr_lock.h \
  - ../../include/apr_time.h
  + ../../include/apr_lib.h ../../include/hsregex.h \
  + ../../include/apr_portable.h ../../include/apr_network_io.h \
  + ../../include/apr_lock.h ../../include/apr_time.h
   procsup.o: procsup.c threadproc.h ../../include/apr_thread_proc.h \
    ../../include/apr_file_io.h ../../include/apr_general.h \
    ../../include/apr_config.h ../../include/apr_errno.h \
    ../../include/apr_win.h ../../file_io/unix/fileio.h \
  - $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
  + ../../include/apr_lib.h ../../include/hsregex.h
   signals.o: signals.c threadproc.h ../../include/apr_thread_proc.h \
    ../../include/apr_file_io.h ../../include/apr_general.h \
    ../../include/apr_config.h ../../include/apr_errno.h \
  
  
  
  1.3       +4 -4      apache-2.0/mpm/src/lib/apr/time/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/lib/apr/time/unix/Makefile.in,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.in       1999/08/18 12:32:04     1.2
  +++ Makefile.in       1999/08/18 20:20:27     1.3
  @@ -53,12 +53,12 @@
   # DO NOT REMOVE
   access.o: access.c atime.h ../../include/apr_time.h \
    ../../include/apr_general.h ../../include/apr_config.h \
  - ../../include/apr_errno.h $(INCDIR)/apr_lib.h \
  - ../../include/apr_file_io.h $(INCDIR)/hsregex.h
  + ../../include/apr_errno.h ../../include/apr_lib.h \
  + ../../include/apr_file_io.h ../../include/hsregex.h
   time.o: time.c atime.h ../../include/apr_time.h \
    ../../include/apr_general.h ../../include/apr_config.h \
  - ../../include/apr_errno.h $(INCDIR)/apr_lib.h \
  - ../../include/apr_file_io.h $(INCDIR)/hsregex.h \
  + ../../include/apr_errno.h ../../include/apr_lib.h \
  + ../../include/apr_file_io.h ../../include/hsregex.h \
    ../../include/apr_portable.h ../../include/apr_thread_proc.h \
    ../../include/apr_win.h ../../include/apr_network_io.h \
    ../../include/apr_lock.h
  
  
  

Reply via email to