Date: Thu, 11 Jul 2002 18:45:39 -0400 (EDT)
From: Geoff Hutchison <ghutchis@wso.williams.edu>
To: J.J.Peereboom@dnz.rws.minvenw.nl
Cc: htdig-general@lists.sourceforge.net
Subject: [htdig] Re: [patch] for gcc-3.1

On Thu, 11 Jul 2002 J.J.Peereboom@dnz.rws.minvenw.nl wrote:

> Will the same help for HP-UX11?
> I don't have autoconf. It depends on some other packages I do not have, and
> I'm getting tired of installing so many packages.

I can't promise this will help, but it should try fstream.h and then
fstream in the configure file. I would assume that it should get past the
configure script to allow compilation with gcc 3.1.

Please let me know if this helps.

--
-Geoff Hutchison
Williams Students Online
http://wso.williams.edu/

Index: configure.in
===================================================================
RCS file: /cvsroot/htdig/htdig/configure.in,v
retrieving revision 1.29.2.12
diff -c -3 -p -r1.29.2.12 configure.in
*** configure.in	26 Jan 2002 03:43:38 -0000	1.29.2.12
--- configure.in	11 Jul 2002 22:43:41 -0000
*************** AC_LANG_CPLUSPLUS
*** 112,118 ****
--- 112,121 ----
  AC_CHECK_HEADERS(fcntl.h limits.h malloc.h sys/file.h sys/ioctl.h sys/time.h unistd.h getopt.h strings.h zlib.h alloca.h sys/select.h wait.h sys/wait.h malloc.h ostream.h iostream.h)
  AC_CHECK_HEADER(fstream.h,nofstream=0,nofstream=1)
  if test "x$nofstream" = "x1" ; then
+ AC_CHECK_HEADER(fstream,nofstream=0,nofstream=1)
+ if test "x$nofstream" = "x1" ; then
  AC_MSG_ERROR([To compile ht://Dig, you will need a C++ library. Try installing libstdc++.])
+ fi
  fi
  
  dnl Checks for typedefs, structures, and compiler characteristics.
Index: configure
===================================================================
RCS file: /cvsroot/htdig/htdig/configure,v
retrieving revision 1.28.2.12
diff -c -3 -p -r1.28.2.12 configure
*** configure	26 Jan 2002 03:43:37 -0000	1.28.2.12
--- configure	11 Jul 2002 22:43:41 -0000
*************** else
*** 1302,1311 ****
    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:1309: 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
--- 1302,1362 ----
    fi
  fi
  
+ for ac_declaration in \
+    ''\
+    '#include <stdlib.h>' \
+    'extern "C" void std::exit (int) throw (); using std::exit;' \
+    'extern "C" void std::exit (int); using std::exit;' \
+    'extern "C" void exit (int) throw ();' \
+    'extern "C" void exit (int);' \
+    'void exit (int);'
+ do
+   cat > conftest.$ac_ext <<EOF
+ #line 1316 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ $ac_declaration
+ int main() {
+ exit (42);
+ ; return 0; }
+ EOF
+ if { (eval echo configure:1324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   continue
+ fi
+ rm -f conftest*
+   cat > conftest.$ac_ext <<EOF
+ #line 1334 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int main() {
+ exit (42);
+ ; return 0; }
+ EOF
+ if { (eval echo configure:1341: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest*
+ done
+ if test -n "$ac_declaration"; then
+   echo '#ifdef __cplusplus' >>confdefs.h
+   echo $ac_declaration      >>confdefs.h
+   echo '#endif'             >>confdefs.h
+ 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:1360: 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
*************** fi
*** 1335,1341 ****
  # 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:1339: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1386,1392 ----
  # 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:1390: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
*************** fi
*** 1371,1377 ****
  # 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:1375: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_SHELL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1422,1428 ----
  # 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:1426: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_SHELL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
*************** fi
*** 1407,1413 ****
  # Extract the first word of "sed", so it can be a program name with args.
  set dummy sed; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1411: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1458,1464 ----
  # Extract the first word of "sed", so it can be a program name with args.
  set dummy sed; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1462: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
*************** fi
*** 1443,1449 ****
  # Extract the first word of "sort", so it can be a program name with args.
  set dummy sort; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1447: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_SORT'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1494,1500 ----
  # Extract the first word of "sort", so it can be a program name with args.
  set dummy sort; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1498: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_SORT'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
*************** fi
*** 1479,1485 ****
  # Extract the first word of "find", so it can be a program name with args.
  set dummy find; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1483: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_FIND'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1530,1536 ----
  # Extract the first word of "find", so it can be a program name with args.
  set dummy find; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1534: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_FIND'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
*************** fi
*** 1515,1521 ****
  # Extract the first word of "gunzip", so it can be a program name with args.
  set dummy gunzip; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1519: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_GUNZIP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1566,1572 ----
  # Extract the first word of "gunzip", so it can be a program name with args.
  set dummy gunzip; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1570: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_GUNZIP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
*************** do
*** 1553,1559 ****
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1557: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1604,1610 ----
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1608: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
*************** test -n "$TAR" || TAR="tar"
*** 1586,1592 ****
  # Extract the first word of "acroread", so it can be a program name with args.
  set dummy acroread; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1590: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PDF_PARSER'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1637,1643 ----
  # Extract the first word of "acroread", so it can be a program name with args.
  set dummy acroread; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1641: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PDF_PARSER'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
*************** fi
*** 1622,1628 ****
  # Extract the first word of "sendmail", so it can be a program name with args.
  set dummy sendmail; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1626: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_SENDMAIL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1673,1679 ----
  # Extract the first word of "sendmail", so it can be a program name with args.
  set dummy sendmail; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1677: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_SENDMAIL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
*************** fi
*** 1657,1663 ****
  
  
  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
! echo "configure:1661: checking how to run the C preprocessor" >&5
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
--- 1708,1714 ----
  
  
  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
! echo "configure:1712: checking how to run the C preprocessor" >&5
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
*************** else
*** 1672,1684 ****
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp.
    cat > conftest.$ac_ext <<EOF
! #line 1676 "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:1682: \"$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
    :
--- 1723,1735 ----
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp.
    cat > conftest.$ac_ext <<EOF
! #line 1727 "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:1733: \"$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
*** 1689,1701 ****
    rm -rf conftest*
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
! #line 1693 "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:1699: \"$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
    :
--- 1740,1752 ----
    rm -rf conftest*
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
! #line 1744 "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:1750: \"$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
*** 1706,1718 ****
    rm -rf conftest*
    CPP="${CC-cc} -nologo -E"
    cat > conftest.$ac_ext <<EOF
! #line 1710 "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:1716: \"$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
    :
--- 1757,1769 ----
    rm -rf conftest*
    CPP="${CC-cc} -nologo -E"
    cat > conftest.$ac_ext <<EOF
! #line 1761 "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:1767: \"$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
    :
*************** fi
*** 1737,1745 ****
  echo "$ac_t""$CPP" 1>&6
  
  echo $ac_n "checking for AIX""... $ac_c" 1>&6
! echo "configure:1741: checking for AIX" >&5
  cat > conftest.$ac_ext <<EOF
! #line 1743 "configure"
  #include "confdefs.h"
  #ifdef _AIX
    yes
--- 1788,1796 ----
  echo "$ac_t""$CPP" 1>&6
  
  echo $ac_n "checking for AIX""... $ac_c" 1>&6
! echo "configure:1792: checking for AIX" >&5
  cat > conftest.$ac_ext <<EOF
! #line 1794 "configure"
  #include "confdefs.h"
  #ifdef _AIX
    yes
*************** rm -f conftest*
*** 1762,1768 ****
  
  
  echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
! echo "configure:1766: checking for socket in -lsocket" >&5
  ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1813,1819 ----
  
  
  echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
! echo "configure:1817: checking for socket in -lsocket" >&5
  ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** else
*** 1770,1776 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1774 "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
--- 1821,1827 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1825 "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
*************** int main() {
*** 1781,1787 ****
  socket()
  ; return 0; }
  EOF
! if { (eval echo configure:1785: \"$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
--- 1832,1838 ----
  socket()
  ; return 0; }
  EOF
! if { (eval echo configure:1836: \"$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
*************** else
*** 1809,1815 ****
  fi
  
  echo $ac_n "checking for t_accept in -lnsl""... $ac_c" 1>&6
! echo "configure:1813: checking for t_accept in -lnsl" >&5
  ac_lib_var=`echo nsl'_'t_accept | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1860,1866 ----
  fi
  
  echo $ac_n "checking for t_accept in -lnsl""... $ac_c" 1>&6
! echo "configure:1864: checking for t_accept in -lnsl" >&5
  ac_lib_var=`echo nsl'_'t_accept | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** else
*** 1817,1823 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1821 "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
--- 1868,1874 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1872 "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
*************** int main() {
*** 1828,1834 ****
  t_accept()
  ; return 0; }
  EOF
! if { (eval echo configure:1832: \"$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,1885 ----
  t_accept()
  ; return 0; }
  EOF
! if { (eval echo configure:1883: \"$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
*************** fi
*** 1857,1863 ****
  
  if test $WITH_ZLIB = yes; then
  echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
! echo "configure:1861: checking for deflate in -lz" >&5
  ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1908,1914 ----
  
  if test $WITH_ZLIB = yes; then
  echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
! echo "configure:1912: checking for deflate in -lz" >&5
  ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** else
*** 1865,1871 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lz  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1869 "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
--- 1916,1922 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lz  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1920 "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
*************** int main() {
*** 1876,1882 ****
  deflate()
  ; return 0; }
  EOF
! if { (eval echo configure:1880: \"$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
--- 1927,1933 ----
  deflate()
  ; return 0; }
  EOF
! if { (eval echo configure:1931: \"$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
*************** fi
*** 1907,1918 ****
  
  
  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
! echo "configure:1911: 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 1916 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
--- 1958,1969 ----
  
  
  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
! echo "configure:1962: 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 1967 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
*************** else
*** 1920,1926 ****
  #include <float.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1924: \"$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*
--- 1971,1977 ----
  #include <float.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1975: \"$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*
*************** rm -f conftest*
*** 1937,1943 ****
  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 1941 "configure"
  #include "confdefs.h"
  #include <string.h>
  EOF
--- 1988,1994 ----
  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 1992 "configure"
  #include "confdefs.h"
  #include <string.h>
  EOF
*************** fi
*** 1955,1961 ****
  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 1959 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
--- 2006,2012 ----
  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 2010 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
*************** if test "$cross_compiling" = yes; then
*** 1976,1982 ****
    :
  else
    cat > conftest.$ac_ext <<EOF
! #line 1980 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
--- 2027,2033 ----
    :
  else
    cat > conftest.$ac_ext <<EOF
! #line 2031 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
*************** if (XOR (islower (i), ISLOWER (i)) || to
*** 1987,1993 ****
  exit (0); }
  
  EOF
! if { (eval echo configure:1991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
  else
--- 2038,2044 ----
  exit (0); }
  
  EOF
! if { (eval echo configure:2042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
  else
*************** EOF
*** 2011,2022 ****
  fi
  
  echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
! echo "configure:2015: checking whether time.h and sys/time.h may both be included" >&5
  if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2020 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/time.h>
--- 2062,2073 ----
  fi
  
  echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
! echo "configure:2066: checking whether time.h and sys/time.h may both be included" >&5
  if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2071 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/time.h>
*************** int main() {
*** 2025,2031 ****
  struct tm *tp;
  ; return 0; }
  EOF
! if { (eval echo configure:2029: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_header_time=yes
  else
--- 2076,2082 ----
  struct tm *tp;
  ; return 0; }
  EOF
! if { (eval echo configure:2080: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_header_time=yes
  else
*************** ac_link='${CXX-g++} -o conftest${ac_exee
*** 2054,2060 ****
  cross_compiling=$ac_cv_prog_cxx_cross
  
  echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
! echo "configure:2058: checking how to run the C++ preprocessor" >&5
  if test -z "$CXXCPP"; then
  if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2105,2111 ----
  cross_compiling=$ac_cv_prog_cxx_cross
  
  echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
! echo "configure:2109: checking how to run the C++ preprocessor" >&5
  if test -z "$CXXCPP"; then
  if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** ac_link='${CXX-g++} -o conftest${ac_exee
*** 2067,2078 ****
  cross_compiling=$ac_cv_prog_cxx_cross
    CXXCPP="${CXX-g++} -E"
    cat > conftest.$ac_ext <<EOF
! #line 2071 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2076: \"$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
    :
--- 2118,2129 ----
  cross_compiling=$ac_cv_prog_cxx_cross
    CXXCPP="${CXX-g++} -E"
    cat > conftest.$ac_ext <<EOF
! #line 2122 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2127: \"$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
    :
*************** for ac_hdr in fcntl.h limits.h malloc.h 
*** 2100,2116 ****
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:2104: 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 2109 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2114: \"$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*
--- 2151,2167 ----
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:2155: 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 2160 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2165: \"$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*
*************** done
*** 2138,2154 ****
  
  ac_safe=`echo "fstream.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for fstream.h""... $ac_c" 1>&6
! echo "configure:2142: checking for fstream.h" >&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 2147 "configure"
  #include "confdefs.h"
  #include <fstream.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2152: \"$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*
--- 2189,2240 ----
  
  ac_safe=`echo "fstream.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for fstream.h""... $ac_c" 1>&6
! echo "configure:2193: checking for fstream.h" >&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 2198 "configure"
  #include "confdefs.h"
  #include <fstream.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2203: \"$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"
! else
!   echo "$ac_err" >&5
!   echo "configure: failed program was:" >&5
!   cat conftest.$ac_ext >&5
!   rm -rf conftest*
!   eval "ac_cv_header_$ac_safe=no"
! fi
! rm -f conftest*
! fi
! if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
!   echo "$ac_t""yes" 1>&6
!   nofstream=0
! else
!   echo "$ac_t""no" 1>&6
! nofstream=1
! fi
! 
! if test "x$nofstream" = "x1" ; then
! ac_safe=`echo "fstream" | sed 'y%./+-%__p_%'`
! echo $ac_n "checking for fstream""... $ac_c" 1>&6
! echo "configure:2228: checking for fstream" >&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 2233 "configure"
! #include "confdefs.h"
! #include <fstream>
! EOF
! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2238: \"$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*
*************** fi
*** 2173,2178 ****
--- 2259,2265 ----
  if test "x$nofstream" = "x1" ; then
  { echo "configure: error: To compile ht://Dig, you will need a C++ library. Try installing libstdc++." 1>&2; exit 1; }
  fi
+ fi
  
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
*************** ac_link='${CC-cc} -o conftest${ac_exeext
*** 2182,2193 ****
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking for working const""... $ac_c" 1>&6
! echo "configure:2186: 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 2191 "configure"
  #include "confdefs.h"
  
  int main() {
--- 2269,2280 ----
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking for working const""... $ac_c" 1>&6
! echo "configure:2273: 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 2278 "configure"
  #include "confdefs.h"
  
  int main() {
*************** ccp = (char const *const *) p;
*** 2236,2242 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:2240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_c_const=yes
  else
--- 2323,2329 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:2327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_c_const=yes
  else
*************** EOF
*** 2257,2268 ****
  fi
  
  echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
! echo "configure:2261: checking whether struct tm is in sys/time.h or time.h" >&5
  if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2266 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <time.h>
--- 2344,2355 ----
  fi
  
  echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
! echo "configure:2348: checking whether struct tm is in sys/time.h or time.h" >&5
  if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2353 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <time.h>
*************** int main() {
*** 2270,2276 ****
  struct tm *tp; tp->tm_sec;
  ; return 0; }
  EOF
! if { (eval echo configure:2274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_struct_tm=time.h
  else
--- 2357,2363 ----
  struct tm *tp; tp->tm_sec;
  ; return 0; }
  EOF
! if { (eval echo configure:2361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_struct_tm=time.h
  else
*************** fi
*** 2294,2305 ****
  for ac_func in strdup strerror strstr
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2298: 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 2303 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 2381,2392 ----
  for ac_func in strdup strerror strstr
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2385: 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 2390 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 2322,2328 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:2326: \"$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
--- 2409,2415 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:2413: \"$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
*************** done
*** 2349,2360 ****
  for ac_func in localtime_r
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2353: 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 2358 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 2436,2447 ----
  for ac_func in localtime_r
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2440: 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 2445 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 2377,2383 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:2381: \"$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
--- 2464,2470 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:2468: \"$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
*************** done
*** 2404,2415 ****
  for ac_func in timegm mkstemp
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2408: 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 2413 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 2491,2502 ----
  for ac_func in timegm mkstemp
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2495: 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 2500 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 2432,2438 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:2436: \"$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
--- 2519,2525 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:2523: \"$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
*************** done
*** 2460,2476 ****
  if test $WITH_RX = yes; then
   ac_safe=`echo "rxposix.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for rxposix.h""... $ac_c" 1>&6
! echo "configure:2464: checking for rxposix.h" >&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 2469 "configure"
  #include "confdefs.h"
  #include <rxposix.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2474: \"$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*
--- 2547,2563 ----
  if test $WITH_RX = yes; then
   ac_safe=`echo "rxposix.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for rxposix.h""... $ac_c" 1>&6
! echo "configure:2551: checking for rxposix.h" >&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 2556 "configure"
  #include "confdefs.h"
  #include <rxposix.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2561: \"$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*
*************** fi
*** 2498,2504 ****
  fi
  if test $WITH_RX = no; then
  echo $ac_n "checking if we should use the included regex?""... $ac_c" 1>&6
! echo "configure:2502: checking if we should use the included regex?" >&5
  OLD_CFLAGS=$CFLAGS
  CFLAGS="$CFLAGS -I${srcdir}/htlib"
  if test "$cross_compiling" = yes; then
--- 2585,2591 ----
  fi
  if test $WITH_RX = no; then
  echo $ac_n "checking if we should use the included regex?""... $ac_c" 1>&6
! echo "configure:2589: checking if we should use the included regex?" >&5
  OLD_CFLAGS=$CFLAGS
  CFLAGS="$CFLAGS -I${srcdir}/htlib"
  if test "$cross_compiling" = yes; then
*************** EOF
*** 2509,2515 ****
  
  else
    cat > conftest.$ac_ext <<EOF
! #line 2513 "configure"
  #include "confdefs.h"
  	#include "${srcdir}/htlib/regex.c"
  		int main() {
--- 2596,2602 ----
  
  else
    cat > conftest.$ac_ext <<EOF
! #line 2600 "configure"
  #include "confdefs.h"
  	#include "${srcdir}/htlib/regex.c"
  		int main() {
*************** else
*** 2518,2524 ****
  		}
  		
  EOF
! if { (eval echo configure:2522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    echo "$ac_t""yes" 1>&6;LIBOBJS="$LIBOBJS regex.${ac_objext}"
  else
--- 2605,2611 ----
  		}
  		
  EOF
! if { (eval echo configure:2609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    echo "$ac_t""yes" 1>&6;LIBOBJS="$LIBOBJS regex.${ac_objext}"
  else
*************** ac_link='${CXX-g++} -o conftest${ac_exee
*** 2545,2553 ****
  cross_compiling=$ac_cv_prog_cxx_cross
  
  echo $ac_n "checking whether we need gethostname() prototype?""... $ac_c" 1>&6
! echo "configure:2549: checking whether we need gethostname() prototype?" >&5
  cat > conftest.$ac_ext <<EOF
! #line 2551 "configure"
  #include "confdefs.h"
  #include <unistd.h>
  #include <stdio.h>
--- 2632,2640 ----
  cross_compiling=$ac_cv_prog_cxx_cross
  
  echo $ac_n "checking whether we need gethostname() prototype?""... $ac_c" 1>&6
! echo "configure:2636: checking whether we need gethostname() prototype?" >&5
  cat > conftest.$ac_ext <<EOF
! #line 2638 "configure"
  #include "confdefs.h"
  #include <unistd.h>
  #include <stdio.h>
*************** int main() {
*** 2565,2571 ****
  gethostname("sdsu.edu", (int) 8);
  ; return 0; }
  EOF
! if { (eval echo configure:2569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
  #define NEED_PROTO_GETHOSTNAME 1
--- 2652,2658 ----
  gethostname("sdsu.edu", (int) 8);
  ; return 0; }
  EOF
! if { (eval echo configure:2656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
  #define NEED_PROTO_GETHOSTNAME 1
*************** ac_link='${CC-cc} -o conftest${ac_exeext
*** 2587,2597 ****
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking how to call getpeername?""... $ac_c" 1>&6
! echo "configure:2591: checking how to call getpeername?" >&5
  for sock_t in 'struct sockaddr' 'void'; do
  for getpeername_length_t in 'size_t' 'int' 'unsigned int' 'long unsigned int' 'socklen_t'; do
  cat > conftest.$ac_ext <<EOF
! #line 2595 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/socket.h>
--- 2674,2684 ----
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking how to call getpeername?""... $ac_c" 1>&6
! echo "configure:2678: checking how to call getpeername?" >&5
  for sock_t in 'struct sockaddr' 'void'; do
  for getpeername_length_t in 'size_t' 'int' 'unsigned int' 'long unsigned int' 'socklen_t'; do
  cat > conftest.$ac_ext <<EOF
! #line 2682 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/socket.h>
*************** int main() {
*** 2599,2605 ****
  extern getpeername(int, $sock_t *, $getpeername_length_t *)
  ; return 0; }
  EOF
! if { (eval echo configure:2603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_found=yes ; break 2
  else
--- 2686,2692 ----
  extern getpeername(int, $sock_t *, $getpeername_length_t *)
  ; return 0; }
  EOF
! if { (eval echo configure:2690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_found=yes ; break 2
  else