Index: configure
===================================================================
RCS file: /opt/htdig/cvs/htdig3/configure,v
retrieving revision 1.59.2.37
diff -c -3 -p -r1.59.2.37 configure
*** configure	2001/01/07 04:15:48	1.59.2.37
--- configure	2001/01/07 22:26:54
*************** echo $ac_n "checking how to call select?
*** 4332,4350 ****
  echo "configure:4333: checking how to call select?" >&5
  for fd_set_t in 'fd_set' 'int'
    do
      cat > conftest.$ac_ext <<EOF
! #line 4337 "configure"
  #include "confdefs.h"
  #include <sys/time.h>
  #include <sys/types.h>
  #include <unistd.h>
!  extern "C" int select(int, $fd_set_t *, $fd_set_t *, $fd_set_t *, struct timeval *);
   $fd_set_t fd; 
  int main() {
   select(0, &fd, 0, 0, 0); 
  ; return 0; }
  EOF
! if { (eval echo configure:4348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_found=yes ; break 2
  else
--- 4332,4352 ----
  echo "configure:4333: checking how to call select?" >&5
  for fd_set_t in 'fd_set' 'int'
    do
+   for timeval_t in 'struct timeval' 'const struct timeval'
+   do
      cat > conftest.$ac_ext <<EOF
! #line 4339 "configure"
  #include "confdefs.h"
  #include <sys/time.h>
  #include <sys/types.h>
  #include <unistd.h>
!  extern "C" int select(int, $fd_set_t *, $fd_set_t *, $fd_set_t *, $timeval_t *);
   $fd_set_t fd; 
  int main() {
   select(0, &fd, 0, 0, 0); 
  ; return 0; }
  EOF
! if { (eval echo configure:4350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_found=yes ; break 2
  else
*************** else
*** 4354,4359 ****
--- 4356,4362 ----
    ac_found=no
  fi
  rm -f conftest*
+  done
  done
  
  if test "$ac_found" = no
*************** EOF
*** 4372,4387 ****
  fi
  
  echo $ac_n "checking for bool data type?""... $ac_c" 1>&6
! echo "configure:4376: checking for bool data type?" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4378 "configure"
  #include "confdefs.h"
  
  int main() {
  bool i;
  ; return 0; }
  EOF
! if { (eval echo configure:4385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
  #define HAVE_BOOL 1
--- 4375,4390 ----
  fi
  
  echo $ac_n "checking for bool data type?""... $ac_c" 1>&6
! echo "configure:4379: checking for bool data type?" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4381 "configure"
  #include "confdefs.h"
  
  int main() {
  bool i;
  ; return 0; }
  EOF
! if { (eval echo configure:4388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
  #define HAVE_BOOL 1
*************** fi
*** 4396,4411 ****
  rm -f conftest*
  
  echo $ac_n "checking for true and false?""... $ac_c" 1>&6
! echo "configure:4400: checking for true and false?" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4402 "configure"
  #include "confdefs.h"
  
  int main() {
  int i, j; i= true; j= false;
  ; return 0; }
  EOF
! if { (eval echo configure:4409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    echo "$ac_t""yes" 1>&6
       cat >> confdefs.h <<\EOF
--- 4399,4414 ----
  rm -f conftest*
  
  echo $ac_n "checking for true and false?""... $ac_c" 1>&6
! echo "configure:4403: checking for true and false?" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4405 "configure"
  #include "confdefs.h"
  
  int main() {
  int i, j; i= true; j= false;
  ; return 0; }
  EOF
! if { (eval echo configure:4412: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    echo "$ac_t""yes" 1>&6
       cat >> confdefs.h <<\EOF
*************** fi
*** 4438,4444 ****
  if test x$htdig_cv_tests = xyes
  then
  	echo $ac_n "checking user name""... $ac_c" 1>&6
! echo "configure:4442: checking user name" >&5
  test -n "$LOGNAME" && USER=$LOGNAME
  
  echo "$ac_t""$USER" 1>&6
--- 4441,4447 ----
  if test x$htdig_cv_tests = xyes
  then
  	echo $ac_n "checking user name""... $ac_c" 1>&6
! echo "configure:4445: checking user name" >&5
  test -n "$LOGNAME" && USER=$LOGNAME
  
  echo "$ac_t""$USER" 1>&6
*************** echo "$ac_t""$USER" 1>&6
*** 4448,4454 ****
  #
  
   echo $ac_n "checking if apache is wanted""... $ac_c" 1>&6
! echo "configure:4452: checking if apache is wanted" >&5
   # Check whether --with-apache or --without-apache was given.
  if test "${with_apache+set}" = set; then
    withval="$with_apache"
--- 4451,4457 ----
  #
  
   echo $ac_n "checking if apache is wanted""... $ac_c" 1>&6
! echo "configure:4455: checking if apache is wanted" >&5
   # Check whether --with-apache or --without-apache was given.
  if test "${with_apache+set}" = set; then
    withval="$with_apache"
*************** fi
*** 4489,4495 ****
        # Extract the first word of "httpd", so it can be a program name with args.
  set dummy httpd; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:4493: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_APACHE'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 4492,4498 ----
        # Extract the first word of "httpd", so it can be a program name with args.
  set dummy httpd; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:4496: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_APACHE'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
*************** fi
*** 4542,4548 ****
      #
      if test -n "1.3.1" ; then
        echo $ac_n "checking apache version >= 1.3.1""... $ac_c" 1>&6
! echo "configure:4546: checking apache version >= 1.3.1" >&5
        APACHE_REQUEST=`echo 1.3.1 | sed -e 's/\.//g'`
        APACHE_REQUEST_MAJOR=`expr $APACHE_REQUEST : '\(..\)'`
        APACHE_REQUEST_MINOR=`expr $APACHE_REQUEST : '..\(.*\)'`
--- 4545,4551 ----
      #
      if test -n "1.3.1" ; then
        echo $ac_n "checking apache version >= 1.3.1""... $ac_c" 1>&6
! echo "configure:4549: checking apache version >= 1.3.1" >&5
        APACHE_REQUEST=`echo 1.3.1 | sed -e 's/\.//g'`
        APACHE_REQUEST_MAJOR=`expr $APACHE_REQUEST : '\(..\)'`
        APACHE_REQUEST_MINOR=`expr $APACHE_REQUEST : '..\(.*\)'`
*************** echo "configure:4546: checking apache ve
*** 4558,4564 ****
      #
      HTTP_ROOT=`$APACHE -V | grep HTTPD_ROOT | sed -e 's/.*"\(.*\)"/\1/'`
      echo $ac_n "checking apache modules""... $ac_c" 1>&6
! echo "configure:4562: checking apache modules" >&5
      for dir in libexec modules lib/apache
      do
        if test -f $HTTP_ROOT/$dir/mod_env.*
--- 4561,4567 ----
      #
      HTTP_ROOT=`$APACHE -V | grep HTTPD_ROOT | sed -e 's/.*"\(.*\)"/\1/'`
      echo $ac_n "checking apache modules""... $ac_c" 1>&6
! echo "configure:4565: checking apache modules" >&5
      for dir in libexec modules lib/apache
      do
        if test -f $HTTP_ROOT/$dir/mod_env.*
Index: configure.in
===================================================================
RCS file: /opt/htdig/cvs/htdig3/configure.in,v
retrieving revision 1.60.2.30
diff -c -3 -p -r1.60.2.30 configure.in
*** configure.in	2001/01/07 04:15:50	1.60.2.30
--- configure.in	2001/01/07 22:26:55
*************** fi
*** 224,236 ****
  AC_MSG_CHECKING(how to call select?)
  for fd_set_t in 'fd_set' 'int'
    do
      AC_TRY_COMPILE([#include <sys/time.h>
  #include <sys/types.h>
  #include <unistd.h>
!  extern "C" int select(int, $fd_set_t *, $fd_set_t *, $fd_set_t *, struct timeval *);
   $fd_set_t fd; ],
      [ select(0, &fd, 0, 0, 0); ],
      [ac_found=yes ; break 2],[ac_found=no])
  done
  
  if test "$ac_found" = no
--- 224,239 ----
  AC_MSG_CHECKING(how to call select?)
  for fd_set_t in 'fd_set' 'int'
    do
+   for timeval_t in 'struct timeval' 'const struct timeval'
+   do
      AC_TRY_COMPILE([#include <sys/time.h>
  #include <sys/types.h>
  #include <unistd.h>
!  extern "C" int select(int, $fd_set_t *, $fd_set_t *, $fd_set_t *, $timeval_t *);
   $fd_set_t fd; ],
      [ select(0, &fd, 0, 0, 0); ],
      [ac_found=yes ; break 2],[ac_found=no])
+  done
  done
  
  if test "$ac_found" = no