New release, added ssl support, disable mysql support temporarily. Closes #39857.

author: Chuck Short <zul@gentoo.org> 2004-02-03 03:02:50 +0000
committer: Chuck Short <zul@gentoo.org> 2004-02-03 03:02:50 +0000
commit: d05c1d79013a87744b7380567be15cc743bc8133 (patch)
tree: a551d9febde3682cbf18373171e6ac4cccefe480 /net-irc/eggdrop
parent: ver bump #40219 (diff)
download: gentoo-2-d05c1d79013a87744b7380567be15cc743bc8133.tar.gz
gentoo-2-d05c1d79013a87744b7380567be15cc743bc8133.tar.bz2
gentoo-2-d05c1d79013a87744b7380567be15cc743bc8133.zip
6 files changed, 4034 insertions, 5 deletions
diff --git a/net-irc/eggdrop/ChangeLog b/net-irc/eggdrop/ChangeLog
index 45fd35d1ca63..6d840e48800d 100644
--- a/net-irc/eggdrop/ChangeLog
+++ b/net-irc/eggdrop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/eggdrop
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/ChangeLog,v 1.10 2004/01/13 03:07:41 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/ChangeLog,v 1.11 2004/02/03 03:02:49 zul Exp $
+
+*eggdrop-1.6.15-r2 (02 Feb 2004)
+
+  02 Feb 2004; Chuck Short <zul@gentoo.org> eggdrop-1.6.15-r2.ebuild,
+  files/eggdrop-installer, files/eggdrop1.6.15-ssl.fixed.diff:
+  New release, added ssl support, disabled mysql support temporarily.
+  Updated eggdrop-installer. Closes #39587.
 
   12 Jan 2004; Chuck Short <zul@gentoo.org> files/eggdrop-installer:
   Added some more error checking to eggdrop-installer.
diff --git a/net-irc/eggdrop/Manifest b/net-irc/eggdrop/Manifest
index 9eef1095f051..0bd020b5feff 100644
--- a/net-irc/eggdrop/Manifest
+++ b/net-irc/eggdrop/Manifest
@@ -1,11 +1,14 @@
+MD5 f444a0d703ee1b5664da235eb3c01b07 eggdrop-1.6.15-r2.ebuild 2656
+MD5 c50752b844073f6b187c248d54ab3d39 eggdrop-1.6.15.ebuild 1789
+MD5 a414d7387081ff5be6220539fa917a4a eggdrop-1.6.15-r1.ebuild 2283
+MD5 10f3627f915448fea76d20b457cf6c09 ChangeLog 1658
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 MD5 e410ac6d9adce910c8f37daf99a4b0e1 files/eggdrop-1.6.15-config.patch 6182
+MD5 4b36c8026b7081614b9e185e63cb8115 files/eggdrop1.6.15-ssl.fixed.diff 115601
 MD5 4f41cb7335240a85a78f8674c9564e8a files/digest-eggdrop-1.6.15-r1 146
+MD5 e7250db4a53f866e043cd2629f9dd8cf files/digest-eggdrop-1.6.15-r2 221
 MD5 de237a9eaabae91f41afbd6d18448320 files/eggdrop-1.6.15-configure-in.patch 575
 MD5 86513844ef13a664bc5bf7d1a68d2d59 files/eggdrop-1.6.15-potential-undef-tm-struct.patch 523
 MD5 e9830c3f4fb21aa6a8651d6e47bae613 files/digest-eggdrop-1.6.15 65
 MD5 1892518b7bb9c06cf7cfd46868012971 files/eggdrop-1.6.15-botchk.patch 2931
 MD5 e542855c118ec2e8239f8040c9f5d439 files/eggdrop-installer 2631
-MD5 c50752b844073f6b187c248d54ab3d39 eggdrop-1.6.15.ebuild 1789
-MD5 a414d7387081ff5be6220539fa917a4a eggdrop-1.6.15-r1.ebuild 2283
-MD5 10f3627f915448fea76d20b457cf6c09 ChangeLog 1658
-MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
diff --git a/net-irc/eggdrop/eggdrop-1.6.15-r2.ebuild b/net-irc/eggdrop/eggdrop-1.6.15-r2.ebuild
new file mode 100644
index 000000000000..4db0a22bb03e
--- /dev/null
+++ b/net-irc/eggdrop/eggdrop-1.6.15-r2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/eggdrop-1.6.15-r2.ebuild,v 1.1 2004/02/03 03:02:49 zul Exp $
+
+inherit fixheadtails
+
+DESCRIPTION="An IRC bot extensible with C or Tcl."
+HOMEPAGE="http://www.eggheads.org/"
+SRC_URI="ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/eggdrop${PV}.tar.gz
+http://gentoo.mirror.at.stealer.net/files/${P}-STEALER.net.patch.bz2
+		http://www.egghelp.org/files/patches/eggdrop${PV}-ssl.fixed.diff.gz"
+KEYWORDS="~x86 ~sparc ~mips ~ia64"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="debug static ipv6 ssl"
+DEPEND="dev-lang/tcl
+	ssl? ( dev-libs/openssl )"
+
+pre_pkg() {
+	use ipv6 && \
+		ewarn "Note: If eggdrop is built with ipv6 support, the dns.so module is"
+		ewarn "not built."
+
+	use mysql && \
+		ewarn "Note: for this release mysql has been temporarily disabled."
+}
+
+src_unpack()  {
+
+	unpack ${A}
+	use ssl && epatch eggdrop${PV}-ssl.fixed.diff
+
+	mv ${WORKDIR}/eggdrop${PV} ${WORKDIR}/${P}
+
+	epatch ${FILESDIR}/${P}-config.patch
+	epatch ${FILESDIR}/${P}-botchk.patch
+	epatch ${FILESDIR}/${P}-configure-in.patch
+	epatch ${FILESDIR}/${P}-potential-undef-tm-struct.patch
+	epatch ${P}-STEALER.net.patch
+
+	cd ${WORKDIR}/${P}
+	ht_fix_file configure aclocal.m4
+
+	autoconf || die "autoconf failed?!"
+
+}
+
+src_compile() {
+	local mytarg myconf
+
+	# Sets eggdrop to use ipv6
+	use ipv6 && myconf="${myconf} --enable-ipv6"
+	use mysql || echo mysql >>disabled_modules
+	use ssl && myconf="${myconf} --with-ssl"
+	./configure \
+		--host=${CHOST} \
+		--disable-cc-optimization \
+		${myconf} || die "./configure failed"
+
+	make config || die "module config failed"
+
+	if use static; then
+		make static || die "make static failed"
+	fi
+
+	if use debug; then
+		make debug || die "make debug failed"
+	fi
+	make || die "make failed"
+
+}
+
+src_install() {
+
+	local a
+	make DEST=${D}/opt/eggdrop install
+
+	for a in doc/*
+	do
+		[ -f $a ] && dodoc $a
+	done
+
+	cd src/mod
+	for a in *.mod
+	do
+		for b in README UPDATES INSTALL TODO CONTENTS
+		do
+			[ -f $a/$b ] && newdoc $a/$b $b.$a
+		done
+	done
+	cd ${S}
+
+	dodoc src/mod/botnetop.mod/botnetop.conf src/mod/gseen.mod/gseen.conf
+	dodoc src/mod/mc_greet.mod/mc_greet.conf src/mod/stats.mod/stats.conf
+	dodoc src/mod/away.mod/away.doc src/mod/rcon.mod/matchbot.tcl
+
+	for a in doc/html/*
+	do
+		[ -f $a ] && dohtml $a
+	done
+
+	dobin ${FILESDIR}/eggdrop-installer
+	doman doc/man1/eggdrop.1
+}
+
+pkg_postinfo() {
+	einfo "Please run /usr/bin/eggdrop-insaller to install your eggdrop bot."
+
+	use ssl && \
+		einfo "You must ad 'set use-ssl [0/1]' to your bot.conf to disable/"
+		einfo "enable SSL connectivity."
+}
diff --git a/net-irc/eggdrop/files/digest-eggdrop-1.6.15-r2 b/net-irc/eggdrop/files/digest-eggdrop-1.6.15-r2
new file mode 100644
index 000000000000..3f45597aee22
--- /dev/null
+++ b/net-irc/eggdrop/files/digest-eggdrop-1.6.15-r2
@@ -0,0 +1,3 @@
+MD5 f1f0c3e8b914d626c06a567560f737dd eggdrop1.6.15.tar.gz 961868
+MD5 b52560e86131aed26720c7662fe3f947 eggdrop-1.6.15-STEALER.net.patch.bz2 214563
+MD5 ac2a146dc1ec2c4e28bf8e77178fae74 eggdrop1.6.15-ssl.fixed.diff.gz 20318
diff --git a/net-irc/eggdrop/files/eggdrop-installer b/net-irc/eggdrop/files/eggdrop-installer
index 3aead39cc25c..c7b37354f1d7 100644
--- a/net-irc/eggdrop/files/eggdrop-installer
+++ b/net-irc/eggdrop/files/eggdrop-installer
@@ -52,6 +52,7 @@ install_eggdrop()
       mkdir -p $HOME/.eggdrop/$bot_name/filesys 
       mkdir -p $HOME/.eggdrop/$bot_name/filesys/incoming 
       mkdir -p $HOME/.eggdrop/$bot_name/text 
+      mkdir -p $HOME/.eggdrop/$bot_name/tmp
       mkdir -p $HOME/.eggdrop/$bot_name/scripts
       # Added because of bug #3073
       mkdir -p $HOME/.eggdrop/$bot_name/var
diff --git a/net-irc/eggdrop/files/eggdrop1.6.15-ssl.fixed.diff b/net-irc/eggdrop/files/eggdrop1.6.15-ssl.fixed.diff
new file mode 100644
index 000000000000..a2bbef9b43c8
--- /dev/null
+++ b/net-irc/eggdrop/files/eggdrop1.6.15-ssl.fixed.diff
@@ -0,0 +1,3901 @@
+diff -burN eggdrop1.6.15/acconfig.h eggdrop1.6.15-ssl/acconfig.h
+--- eggdrop1.6.15/acconfig.h	2003-05-05 00:05:32.000000000 +0200
++++ eggdrop1.6.15-ssl/acconfig.h	2003-05-19 16:41:56.000000000 +0200
+@@ -56,6 +56,9 @@
+ /* Defines extension of Eggdrop modules.  */
+ #undef EGG_MOD_EXT
+ 
++/* Defines ssl mode  */
++#undef EGG_SSL_EXT
++
+ @BOTTOM@
+ 
+ #endif /* !_EGG_CONFIG_H */
+diff -burN eggdrop1.6.15/aclocal.m4 eggdrop1.6.15-ssl/aclocal.m4
+--- eggdrop1.6.15/aclocal.m4	2003-05-05 00:09:24.000000000 +0200
++++ eggdrop1.6.15-ssl/aclocal.m4	2003-05-19 16:41:56.000000000 +0200
+@@ -15,6 +15,62 @@
+ AC_MSG_RESULT()
+ ])dnl
+ 
++dnl  EGG_SSL_CRAP()
++dnl
++AC_DEFUN(EGG_SSL_CRAP, [dnl
++#ssl checks - hoe
++AC_MSG_CHECKING(whether to include SSL support)
++AC_ARG_WITH(ssl,
++[  --with-ssl[=PATH]         Include SSL support (DIR is OpenSSL's install dir).],
++[
++  case "$withval" in
++    no)
++      AC_MSG_RESULT(no) ;;
++    yes)
++      AC_MSG_RESULT(yes)
++      AC_CHECK_LIB(ssl,SSL_accept,[AC_DEFINE(EGG_SSL_EXT)
++      SSL_LIBS="-lssl -lcrypto"],[AC_MSG_ERROR([You requested SSL support, but OpenSSL was not found. Please supply a pathname to OpenSSL])],-lcrypto)
++      ;;
++    *)
++dnl A whole whack of possible places where this might be
++      test -f $withval/openssl/ssl.h && SSL_INCLUDE="$withval"
++      test -f $withval/include/openssl/ssl.h && SSL_INCLUDE="$withval/include"
++
++      test -f $withval/lib/libssl.a && SSL_LIB="$withval/lib"
++      test -f $withval/lib/ssl/libssl.a && SSL_LIB="$withval/lib/ssl"
++      test -f $withval/lib/openssl/libssl.a && SSL_LIB="$withval/lib/openssl/ssl"
++      test -f $withval/libssl.a && SSL_LIB="$withval"
++      test -f $withval/ssl/libssl.a && SSL_LIB="$withval/ssl"
++      test -f $withval/openssl/libssl.a && SSL_LIB="$withval/openssl"
++
++      test -f $withval/lib/libcrypto.a && CRYPTO_LIB="$withval/lib"
++      test -f $withval/lib/ssl/libcrypto.a && CRYPTO_LIB="$withval/lib/ssl"
++      test -f $withval/lib/openssl/libcrypto.a && CRYPTO_LIB="$withval/lib/openssl/ssl"
++      test -f $withval/libcrypto.a && CRYPTO_LIB="$withval"
++      test -f $withval/ssl/libcrypto.a && CRYPTO_LIB="$withval/ssl"
++      test -f $withval/openssl/libcrypto.a && CRYPTO_LIB="$withval/openssl"
++
++      if test -n "$SSL_INCLUDE" && test -n "$SSL_LIB" && test -n "$CRYPTO_LIB"; then
++        SSL_LIBS="-lssl -lcrypto -L$SSL_LIB -L$CRYPTO_LIB";
++        AC_DEFINE(EGG_SSL_EXT)
++        AC_MSG_RESULT(yes)
++      else
++        AC_MSG_RESULT(no)
++        AC_MSG_ERROR([You requested SSL support, but OpenSSL was not found. Please supply a pathname to OpenSSL])
++      fi ;;
++  esac
++],[
++    AC_MSG_RESULT(will try to find)
++    AC_CHECK_LIB(ssl,SSL_accept,[AC_DEFINE(EGG_SSL_EXT)
++     SSL_LIBS="-lssl -lcrypto"],[AC_MSG_ERROR([OpenSSL was not found. Please supply a pathname to OpenSSL])],-lcrypto)
++    AC_CHECK_HEADERS("openssl/ssl.h",,[AC_MSG_ERROR([OpenSSL was not found. Please supply a pathname to OpenSSL])],)
++
++    AC_SUBST(SSL_LIBS)dnl
++    AC_SUBST(SSL_INCLUDE)dnl
++])
++
++#end of ssl checks - hoe
++])dnl
+ 
+ dnl  EGG_MSG_CONFIGURE_END()
+ dnl
+diff -burN eggdrop1.6.15/config.h.in eggdrop1.6.15-ssl/config.h.in
+--- eggdrop1.6.15/config.h.in	2003-05-05 00:05:32.000000000 +0200
++++ eggdrop1.6.15-ssl/config.h.in	2003-05-19 16:41:57.000000000 +0200
+@@ -60,6 +60,9 @@
+ /* Define to 1 if you have the `clock' function. */
+ #undef HAVE_CLOCK
+ 
++/* Defines ssl mode  */
++#undef EGG_SSL_EXT 
++
+ /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+    */
+ #undef HAVE_DIRENT_H
+diff -burN eggdrop1.6.15/configure eggdrop1.6.15-ssl/configure
+--- eggdrop1.6.15/configure	2003-05-05 00:08:25.000000000 +0200
++++ eggdrop1.6.15-ssl/configure	2003-05-19 16:41:57.000000000 +0200
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.54.
++# Generated by GNU Autoconf 2.57.
+ #
+ # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+ # Free Software Foundation, Inc.
+@@ -36,7 +36,10 @@
+ PS4='+ '
+ 
+ # NLS nuisances.
+-for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME
++for as_var in \
++  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++  LC_TELEPHONE LC_TIME
+ do
+   if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+     eval $as_var=C; export $as_var
+@@ -82,15 +85,15 @@
+ 
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conftest.sh
+-  echo  "exit 0"   >>conftest.sh
+-  chmod +x conftest.sh
+-  if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then
++  echo "#! /bin/sh" >conf$$.sh
++  echo  "exit 0"   >>conf$$.sh
++  chmod +x conf$$.sh
++  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+     PATH_SEPARATOR=';'
+   else
+     PATH_SEPARATOR=:
+   fi
+-  rm -f conftest.sh
++  rm -f conf$$.sh
+ fi
+ 
+ 
+@@ -306,7 +309,7 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP SET_MAKE RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S STRIP AWK BASENAME UNAME MOD_LD MOD_CC MOD_STRIP SHLIB_LD SHLIB_CC SHLIB_STRIP DEFAULT_MAKE MOD_EXT ENABLEIPV6 EGGEXEC TCLLIB TCLLIBFN TCLINC TCLINCFN TCL_REQS TCL_LIBS EGGVERSION DEST MOD_UPDIR LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP SET_MAKE RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S STRIP AWK BASENAME UNAME MOD_LD MOD_CC MOD_STRIP SHLIB_LD SHLIB_CC SHLIB_STRIP DEFAULT_MAKE MOD_EXT ENABLEIPV6 EGGEXEC TCLLIB TCLLIBFN TCLINC TCLINCFN TCL_REQS TCL_LIBS SSL_LIBS SSL_INCLUDE EGGVERSION DEST MOD_UPDIR LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -839,14 +842,14 @@
+   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+   --disable-cc-optimization  disable -O2 cflag
+   --enable-ipv6           enable IPv6 support
+-  --disable-tcl-threads   Disable threaded Tcl support if detected. (Ignore this
+-                          option unless you know what you are doing)
++  --disable-tcl-threads   disable threaded Tcl support if detected
+ 
+ Optional Packages:
+   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+   --with-tcllib=PATH      full path to Tcl library
+   --with-tclinc=PATH      full path to Tcl header
++  --with-ssl=PATH         Include SSL support (DIR is OpenSSL's install dir).
+ 
+ Some influential environment variables:
+   CC          C compiler command
+@@ -936,7 +939,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.54.  Invocation command line was
++generated by GNU Autoconf 2.57.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -988,24 +991,54 @@
+ 
+ # Keep a trace of the command line.
+ # Strip out --no-create and --no-recursion so they do not pile up.
++# Strip out --silent because we don't want to record it for future runs.
+ # Also quote any args containing shell meta-characters.
++# Make two passes to allow for proper duplicate-argument suppression.
+ ac_configure_args=
++ac_configure_args0=
++ac_configure_args1=
+ ac_sep=
+-for ac_arg
++ac_must_keep_next=false
++for ac_pass in 1 2
+ do
++  for ac_arg
++  do
+   case $ac_arg in
+-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+-  | --no-cr | --no-c | -n ) continue ;;
+-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
++    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
++    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++    | -silent | --silent | --silen | --sile | --sil)
+     continue ;;
+   *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+     ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+   esac
++    case $ac_pass in
++    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
++    2)
++      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
++      if test $ac_must_keep_next = true; then
++        ac_must_keep_next=false # Got value, back to normal.
++      else
++        case $ac_arg in
++          *=* | --config-cache | -C | -disable-* | --disable-* \
++          | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
++          | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
++          | -with-* | --with-* | -without-* | --without-* | --x)
++            case "$ac_configure_args0 " in
++              "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
++            esac
++            ;;
++          -* ) ac_must_keep_next=true ;;
++        esac
++      fi
+   ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+   # Get rid of the leading space.
+   ac_sep=" "
++      ;;
++    esac
++  done
+ done
++$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
++$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+ 
+ # When interrupted or exit'd, cleanup temporary files, and complete
+ # config.log.  We remove comments because anyway the quotes in there
+@@ -1611,8 +1644,10 @@
+ fi
+ 
+ 
+-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5
+-echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;}
++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
++See \`config.log' for more details." >&5
++echo "$as_me: error: no acceptable C compiler found in \$PATH
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ # Provide some information about the compiler.
+@@ -1637,7 +1672,11 @@
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ int
+ main ()
+@@ -1648,7 +1687,7 @@
+ }
+ _ACEOF
+ ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.exe"
++ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+@@ -1667,27 +1706,39 @@
+ # Be careful to initialize this variable, since it used to be cached.
+ # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+ ac_cv_exeext=
+-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.*; do
++# b.out is created by i960 compilers.
++for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
++do
+   test -f "$ac_file" || continue
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+-    a.out ) # We found the default executable, but exeext='' is most
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
++        ;;
++    conftest.$ac_ext )
++        # This is the source file.
++        ;;
++    [ab].out )
++        # We found the default executable, but exeext='' is most
+             # certainly right.
+             break;;
+-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+-          # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
++    *.* )
++        ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++        # FIXME: I believe we export ac_cv_exeext for Libtool,
++        # but it would be cool to find out if it's true.  Does anybody
++        # maintain Libtool? --akim.
+           export ac_cv_exeext
+           break;;
+-    * ) break;;
++    * )
++        break;;
+   esac
+ done
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ { { echo "$as_me:$LINENO: error: C compiler cannot create executables
+-check \`config.log' for details." >&5
++See \`config.log' for more details." >&5
+ echo "$as_me: error: C compiler cannot create executables
+-check \`config.log' for details." >&2;}
++See \`config.log' for more details." >&2;}
+    { (exit 77); exit 77; }; }
+ fi
+ 
+@@ -1714,9 +1765,11 @@
+ 	cross_compiling=yes
+     else
+ 	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'." >&5
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'." >&2;}
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+     fi
+   fi
+@@ -1724,7 +1777,7 @@
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-rm -f a.out a.exe conftest$ac_cv_exeext
++rm -f a.out a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
+ # Check the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+@@ -1755,8 +1808,10 @@
+   esac
+ done
+ else
+-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5
+-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;}
++  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+@@ -1774,7 +1829,11 @@
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ int
+ main ()
+@@ -1799,9 +1858,12 @@
+ done
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5
+-echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;}
++sed 's/^/| /' conftest.$ac_ext >&5
++
++{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+@@ -1818,7 +1880,11 @@
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ int
+ main ()
+@@ -1846,7 +1912,8 @@
+   ac_compiler_gnu=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_compiler_gnu=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+@@ -1866,7 +1933,11 @@
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ int
+ main ()
+@@ -1891,7 +1962,8 @@
+   ac_cv_prog_cc_g=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_prog_cc_g=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+@@ -1922,7 +1994,11 @@
+ ac_save_CC=$CC
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <sys/types.h>
+@@ -1985,7 +2061,8 @@
+ break
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+ rm -f conftest.$ac_objext
+ done
+@@ -2036,7 +2113,11 @@
+ do
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <stdlib.h>
+ $ac_declaration
+ int
+@@ -2062,13 +2143,18 @@
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ continue
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_declaration
+ int
+ main ()
+@@ -2093,7 +2179,8 @@
+   break
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+@@ -2106,7 +2193,8 @@
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ ac_ext=c
+@@ -2153,12 +2241,22 @@
+ do
+   # Use a header file that comes with gcc, so configuring glibc
+   # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
+-#include <assert.h>
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
+                      Syntax error
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+@@ -2181,7 +2279,8 @@
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+   # Broken: fails on valid input.
+ continue
+ fi
+@@ -2191,7 +2290,11 @@
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+@@ -2215,7 +2318,8 @@
+ continue
+ else
+   echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+   # Passes both tests.
+ ac_preproc_ok=:
+ break
+@@ -2244,12 +2348,22 @@
+ do
+   # Use a header file that comes with gcc, so configuring glibc
+   # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
+-#include <assert.h>
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
+                      Syntax error
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+@@ -2272,7 +2386,8 @@
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+   # Broken: fails on valid input.
+ continue
+ fi
+@@ -2282,7 +2397,11 @@
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+@@ -2306,7 +2425,8 @@
+ continue
+ else
+   echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+   # Passes both tests.
+ ac_preproc_ok=:
+ break
+@@ -2319,8 +2439,10 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5
+-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
++  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&5
++echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+@@ -2351,7 +2473,11 @@
+ echo $ECHO_N "checking for AIX... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #ifdef _AIX
+   yes
+ #endif
+@@ -2381,7 +2507,11 @@
+ ac_cv_search_strerror=no
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -2413,7 +2543,8 @@
+   ac_cv_search_strerror="none required"
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ if test "$ac_cv_search_strerror" = no; then
+@@ -2421,7 +2552,11 @@
+     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+     cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -2454,7 +2589,8 @@
+ break
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+   done
+@@ -2475,43 +2611,54 @@
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <string.h>
+ #include <float.h>
+ 
++int
++main ()
++{
++
++  ;
++  return 0;
++}
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
+   ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   ac_cv_header_stdc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  ac_cv_header_stdc=no
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_header_stdc=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <string.h>
+ 
+ _ACEOF
+@@ -2529,7 +2676,11 @@
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <stdlib.h>
+ 
+ _ACEOF
+@@ -2550,13 +2701,18 @@
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+ # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+ #else
+-# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \
++# define ISLOWER(c) \
++                   (('a' <= (c) && (c) <= 'i') \
+                      || ('j' <= (c) && (c) <= 'r') \
+                      || ('s' <= (c) && (c) <= 'z'))
+ # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+@@ -2589,7 +2745,8 @@
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ( exit $ac_status )
+ ac_cv_header_stdc=no
+ fi
+@@ -2628,7 +2785,11 @@
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+ 
+ #include <$ac_header>
+@@ -2648,7 +2809,8 @@
+   eval "$as_ac_Header=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ eval "$as_ac_Header=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+@@ -2679,7 +2841,11 @@
+ echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+ #include <minix/config.h>
+ _ACEOF
+@@ -2698,7 +2864,8 @@
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_header_compiler=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+@@ -2710,7 +2877,11 @@
+ echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <minix/config.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+@@ -2733,7 +2904,8 @@
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+   ac_header_preproc=no
+ fi
+ rm -f conftest.err conftest.$ac_ext
+@@ -2746,14 +2918,32 @@
+     { echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
+ echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+     { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;};;
++echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
++    (
++      cat <<\_ASBOX
++## ------------------------------------ ##
++## Report this to bug-autoconf@gnu.org. ##
++## ------------------------------------ ##
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
+   no:yes )
+     { echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
+ echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
+     { echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5
+ echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;}
+     { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;};;
++echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
++    (
++      cat <<\_ASBOX
++## ------------------------------------ ##
++## Report this to bug-autoconf@gnu.org. ##
++## ------------------------------------ ##
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
+ esac
+ echo "$as_me:$LINENO: checking for minix/config.h" >&5
+ echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6
+@@ -2806,7 +2996,11 @@
+       CC="$CC -pipe"
+       cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ int
+ main ()
+@@ -2831,7 +3025,8 @@
+   egg_cv_var_ccpipe="yes"
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ egg_cv_var_ccpipe="no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+@@ -2849,15 +3044,15 @@
+ 
+ 
+ # Checks for programs
+-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5
+-echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+ if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.make <<\_ACEOF
+ all:
+-	@echo 'ac_maketemp="${MAKE}"'
++	@echo 'ac_maketemp="$(MAKE)"'
+ _ACEOF
+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+ eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+@@ -3306,7 +3501,11 @@
+ WIN32FLAGS=
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ int
+ main ()
+@@ -3339,7 +3538,8 @@
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ 
+ ac_compile_save="$ac_compile"
+ save_CC="$CC"
+@@ -3347,7 +3547,11 @@
+ CC="$CC -mwin32"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ int
+ main ()
+@@ -3383,7 +3587,8 @@
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ 
+ ac_compile="$ac_compile_save"
+ CC="$save_CC"
+@@ -3643,7 +3848,11 @@
+ LIBS="-lsocket  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -3675,7 +3884,8 @@
+   ac_cv_lib_socket_socket=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_lib_socket_socket=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -3702,7 +3912,11 @@
+ LIBS="-lnsl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -3734,7 +3948,8 @@
+   ac_cv_lib_nsl_connect=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_lib_nsl_connect=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -3761,7 +3976,11 @@
+ LIBS="-ldns  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -3793,7 +4012,8 @@
+   ac_cv_lib_dns_gethostbyname=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_lib_dns_gethostbyname=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -3820,7 +4040,11 @@
+ LIBS="-ldl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -3852,7 +4076,8 @@
+   ac_cv_lib_dl_dlopen=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_lib_dl_dlopen=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -3878,7 +4103,11 @@
+ LIBS="-lm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -3910,7 +4139,8 @@
+   ac_cv_lib_m_tan=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_lib_m_tan=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -3932,7 +4162,11 @@
+ LIBS="-lpthread  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -3964,7 +4198,8 @@
+   ac_cv_lib_pthread_pthread_mutex_init=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_lib_pthread_pthread_mutex_init=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -3985,7 +4220,11 @@
+ LIBS="-lpthread  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -4017,7 +4256,8 @@
+   ac_cv_lib_pthread___pthread_mutex_init=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_lib_pthread___pthread_mutex_init=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -4038,7 +4278,11 @@
+ LIBS="-lpthreads  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -4070,7 +4314,8 @@
+   ac_cv_lib_pthreads_pthread_mutex_init=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_lib_pthreads_pthread_mutex_init=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -4089,31 +4334,44 @@
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ /* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char pthread_mutex_init (); below.  */
+-#include <assert.h>
++    which can conflict with char pthread_mutex_init (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
++{
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+ char pthread_mutex_init ();
+-char (*f) ();
+-
+-int
+-main ()
+-{
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+ #if defined (__stub_pthread_mutex_init) || defined (__stub___pthread_mutex_init)
+ choke me
+ #else
+-f = pthread_mutex_init;
++char (*f) () = pthread_mutex_init;
++#endif
++#ifdef __cplusplus
++}
+ #endif
+ 
++int
++main ()
++{
++return f != pthread_mutex_init;
+   ;
+   return 0;
+ }
+@@ -4133,7 +4391,8 @@
+   ac_cv_func_pthread_mutex_init=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_func_pthread_mutex_init=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -4166,7 +4425,11 @@
+ LIBS="-ldl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ 
+ int
+@@ -4192,7 +4455,8 @@
+   ac_cv_lib_dl_main=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_lib_dl_main=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -4222,7 +4486,11 @@
+ LIBS="-ldld  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -4254,7 +4522,8 @@
+   ac_cv_lib_dld_shl_load=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_lib_dld_shl_load=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -4292,7 +4561,11 @@
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <sys/types.h>
+ #include <$ac_hdr>
+ 
+@@ -4320,7 +4593,8 @@
+   eval "$as_ac_Header=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ eval "$as_ac_Header=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+@@ -4347,7 +4621,11 @@
+ ac_cv_search_opendir=no
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -4379,7 +4657,8 @@
+   ac_cv_search_opendir="none required"
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ if test "$ac_cv_search_opendir" = no; then
+@@ -4387,7 +4666,11 @@
+     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+     cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -4420,7 +4703,8 @@
+ break
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+   done
+@@ -4444,7 +4728,11 @@
+ ac_cv_search_opendir=no
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -4476,7 +4764,8 @@
+   ac_cv_search_opendir="none required"
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ if test "$ac_cv_search_opendir" = no; then
+@@ -4484,7 +4773,11 @@
+     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+     cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -4517,7 +4810,8 @@
+ break
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+   done
+@@ -4540,7 +4834,11 @@
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #ifndef WEXITSTATUS
+@@ -4575,7 +4873,8 @@
+   ac_cv_header_sys_wait_h=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_header_sys_wait_h=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+@@ -4608,7 +4907,11 @@
+ echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+@@ -4627,7 +4930,8 @@
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_header_compiler=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+@@ -4639,7 +4943,11 @@
+ echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+@@ -4662,7 +4970,8 @@
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+   ac_header_preproc=no
+ fi
+ rm -f conftest.err conftest.$ac_ext
+@@ -4675,14 +4984,32 @@
+     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+ echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    (
++      cat <<\_ASBOX
++## ------------------------------------ ##
++## Report this to bug-autoconf@gnu.org. ##
++## ------------------------------------ ##
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
+   no:yes )
+     { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+ echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+ echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    (
++      cat <<\_ASBOX
++## ------------------------------------ ##
++## Report this to bug-autoconf@gnu.org. ##
++## ------------------------------------ ##
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
+ esac
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+@@ -4711,7 +5038,11 @@
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <time.h>
+@@ -4740,7 +5071,8 @@
+   ac_cv_header_time=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_header_time=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+@@ -4779,7 +5111,11 @@
+ echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+@@ -4798,7 +5134,8 @@
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_header_compiler=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+@@ -4810,7 +5147,11 @@
+ echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+@@ -4833,7 +5174,8 @@
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+   ac_header_preproc=no
+ fi
+ rm -f conftest.err conftest.$ac_ext
+@@ -4846,14 +5188,32 @@
+     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+ echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    (
++      cat <<\_ASBOX
++## ------------------------------------ ##
++## Report this to bug-autoconf@gnu.org. ##
++## ------------------------------------ ##
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
+   no:yes )
+     { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+ echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+ echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    (
++      cat <<\_ASBOX
++## ------------------------------------ ##
++## Report this to bug-autoconf@gnu.org. ##
++## ------------------------------------ ##
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
+ esac
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+@@ -4884,7 +5244,11 @@
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+ int
+ main ()
+@@ -4912,7 +5276,8 @@
+   ac_cv_type_pid_t=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_type_pid_t=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+@@ -4936,7 +5301,11 @@
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+ int
+ main ()
+@@ -4964,7 +5333,8 @@
+   ac_cv_type_size_t=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_type_size_t=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+@@ -4988,7 +5358,11 @@
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ int
+ main ()
+@@ -5059,7 +5433,8 @@
+   ac_cv_c_const=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_c_const=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+@@ -5082,7 +5457,11 @@
+   # See if sys/param.h defines the BYTE_ORDER macro.
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <sys/types.h>
+ #include <sys/param.h>
+ 
+@@ -5112,7 +5491,11 @@
+   # It does; now see whether it defined to BIG_ENDIAN or not.
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <sys/types.h>
+ #include <sys/param.h>
+ 
+@@ -5142,20 +5525,26 @@
+   ac_cv_c_bigendian=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_c_bigendian=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ # It does not; compile a test program.
+ if test "$cross_compiling" = yes; then
+   # try to guess the endianness by grepping values into an object file
+   ac_cv_c_bigendian=unknown
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+ short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+ void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
+@@ -5195,13 +5584,18 @@
+ fi
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ int
+ main ()
+ {
+@@ -5230,7 +5624,8 @@
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ( exit $ac_status )
+ ac_cv_c_bigendian=yes
+ fi
+@@ -5267,7 +5662,11 @@
+ for ac_kw in inline __inline__ __inline; do
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #ifndef __cplusplus
+ typedef int foo_t;
+ static $ac_kw foo_t static_foo () {return 0; }
+@@ -5290,7 +5689,8 @@
+   ac_cv_c_inline=$ac_kw; break
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+@@ -5318,7 +5718,11 @@
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+ int
+ main ()
+@@ -5346,7 +5750,8 @@
+   ac_cv_type_long=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_type_long=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+@@ -5368,7 +5773,11 @@
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+ int
+ main ()
+@@ -5396,7 +5805,11 @@
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+ int
+ main ()
+@@ -5423,7 +5836,8 @@
+   ac_hi=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_lo=`expr $ac_mid + 1`
+                     if test $ac_lo -le $ac_mid; then
+                       ac_lo= ac_hi=
+@@ -5435,10 +5849,15 @@
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+ int
+ main ()
+@@ -5466,7 +5885,11 @@
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+ int
+ main ()
+@@ -5493,7 +5916,8 @@
+   ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_hi=`expr '(' $ac_mid ')' - 1`
+                        if test $ac_mid -le $ac_hi; then
+                          ac_lo= ac_hi=
+@@ -5505,7 +5929,8 @@
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_lo= ac_hi=
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+@@ -5516,7 +5941,11 @@
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+ int
+ main ()
+@@ -5543,26 +5972,35 @@
+   ac_hi=$ac_mid
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_long=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77" >&5
+-echo "$as_me: error: cannot compute sizeof (long), 77" >&2;}
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; } ;;
+ esac
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
+-echo "$as_me: error: cannot run test program while cross compiling" >&2;}
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+ long longval () { return (long) (sizeof (long)); }
+ unsigned long ulongval () { return (long) (sizeof (long)); }
+@@ -5610,10 +6048,13 @@
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77" >&5
+-echo "$as_me: error: cannot compute sizeof (long), 77" >&2;}
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+@@ -5638,7 +6079,11 @@
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+ int
+ main ()
+@@ -5666,7 +6111,8 @@
+   ac_cv_type_int=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_type_int=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+@@ -5688,7 +6134,11 @@
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+ int
+ main ()
+@@ -5716,7 +6166,11 @@
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+ int
+ main ()
+@@ -5743,7 +6197,8 @@
+   ac_hi=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_lo=`expr $ac_mid + 1`
+                     if test $ac_lo -le $ac_mid; then
+                       ac_lo= ac_hi=
+@@ -5755,10 +6210,15 @@
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+ int
+ main ()
+@@ -5786,7 +6246,11 @@
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+ int
+ main ()
+@@ -5813,7 +6277,8 @@
+   ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_hi=`expr '(' $ac_mid ')' - 1`
+                        if test $ac_mid -le $ac_hi; then
+                          ac_lo= ac_hi=
+@@ -5825,7 +6290,8 @@
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_lo= ac_hi=
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+@@ -5836,7 +6302,11 @@
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+ int
+ main ()
+@@ -5863,26 +6333,35 @@
+   ac_hi=$ac_mid
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_int=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77" >&5
+-echo "$as_me: error: cannot compute sizeof (int), 77" >&2;}
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (int), 77
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; } ;;
+ esac
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
+-echo "$as_me: error: cannot run test program while cross compiling" >&2;}
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+ long longval () { return (long) (sizeof (int)); }
+ unsigned long ulongval () { return (long) (sizeof (int)); }
+@@ -5930,10 +6409,13 @@
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77" >&5
+-echo "$as_me: error: cannot compute sizeof (int), 77" >&2;}
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (int), 77
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+@@ -5964,7 +6446,11 @@
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ #include <fcntl.h>
+ #include <sys/socket.h>
+@@ -6000,7 +6486,8 @@
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ( exit $ac_status )
+ egg_cv_ipv6_supported=no
+ fi
+@@ -6032,8 +6519,8 @@
+ 
+ else
+    ac_cv_ipv6="no"
+-  echo "$as_me:$LINENO: result: $ac_cv_ipv6" >&5
+-echo "${ECHO_T}$ac_cv_ipv6" >&6
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ 
+ fi;
+ if test "$ac_cv_ipv6" = "yes"
+@@ -6055,7 +6542,13 @@
+ 
+ 
+ 
+-for ac_func in clock getrusage setpgid uname sigaction sigemptyset rename
++
++
++
++
++
++
++for ac_func in clock getrusage setpgid uname sigaction sigemptyset rename strcasecmp strncasecmp getdtablesize memset random srandom
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_func" >&5
+@@ -6065,31 +6558,44 @@
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ /* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.  */
+-#include <assert.h>
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
++{
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+ char $ac_func ();
+-char (*f) ();
+-
+-int
+-main ()
+-{
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+-f = $ac_func;
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
+ #endif
+ 
++int
++main ()
++{
++return f != $ac_func;
+   ;
+   return 0;
+ }
+@@ -6109,7 +6615,8 @@
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ eval "$as_ac_var=no"
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -6130,83 +6637,13 @@
+ 
+ 
+ 
+-for ac_func in strcasecmp strncasecmp getdtablesize memset random srandom
+-do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.  */
+-#include <assert.h>
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char $ac_func ();
+-char (*f) ();
+ 
+-int
+-main ()
+-{
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-f = $ac_func;
+-#endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  eval "$as_ac_var=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$as_ac_var=no"
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-done
+ 
+ 
+ 
+ 
+ 
+-
+-
+-
+-for ac_func in dlopen dprintf snprintf vsnprintf isascii inet_aton inet_ntop
++for ac_func in dlopen dprintf snprintf vsnprintf isascii inet_aton inet_ntop memcpy strftime fsync gethostbyname2 getipnodebyname
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_func" >&5
+@@ -6216,105 +6653,44 @@
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ /* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.  */
+-#include <assert.h>
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
++{
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+ char $ac_func ();
+-char (*f) ();
+-
+-int
+-main ()
+-{
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+-f = $ac_func;
++char (*f) () = $ac_func;
+ #endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  eval "$as_ac_var=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$as_ac_var=no"
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-done
+-
+-
+-
+-
+-
+-
+-for ac_func in memcpy strftime fsync gethostbyname2 getipnodebyname
+-do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.  */
+-#include <assert.h>
+-/* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+-extern "C"
++}
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char $ac_func ();
+-char (*f) ();
+ 
+ int
+ main ()
+ {
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-f = $ac_func;
+-#endif
+-
++return f != $ac_func;
+   ;
+   return 0;
+ }
+@@ -6334,7 +6710,8 @@
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ eval "$as_ac_var=no"
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -6360,31 +6737,44 @@
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ /* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.  */
+-#include <assert.h>
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
++{
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+ char $ac_func ();
+-char (*f) ();
+-
+-int
+-main ()
+-{
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+-f = $ac_func;
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
+ #endif
+ 
++int
++main ()
++{
++return f != $ac_func;
+   ;
+   return 0;
+ }
+@@ -6404,7 +6794,8 @@
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ eval "$as_ac_var=no"
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -6457,7 +6848,11 @@
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ #include <stdio.h>
+ 
+@@ -6488,7 +6883,8 @@
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ( exit $ac_status )
+ egg_cv_var_libsafe_sscanf="yes"
+ fi
+@@ -6994,7 +7390,11 @@
+ LIBS="-l$TCL_TEST_LIB $TCL_TEST_OTHERLIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -7026,7 +7426,8 @@
+   eval "$as_ac_Lib=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ eval "$as_ac_Lib=no"
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -7073,7 +7474,11 @@
+ LIBS="-l$TCL_TEST_LIB $TCL_TEST_OTHERLIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -7105,7 +7510,8 @@
+   eval "$as_ac_Lib=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ eval "$as_ac_Lib=no"
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -7201,6 +7607,346 @@
+ 
+ # ---------- end of (what used to be) robey's Tcl thingies
+ 
++#ssl checks - hoe
++echo "$as_me:$LINENO: checking whether to include SSL support" >&5
++echo $ECHO_N "checking whether to include SSL support... $ECHO_C" >&6
++
++# Check whether --with-ssl or --without-ssl was given.
++if test "${with_ssl+set}" = set; then
++  withval="$with_ssl"
++
++  case "$withval" in
++    no)
++      echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6 ;;
++    yes)
++      echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++      echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
++echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
++if test "${ac_cv_lib_ssl_SSL_accept+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lssl -lcrypto $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char SSL_accept ();
++int
++main ()
++{
++SSL_accept ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_ssl_SSL_accept=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_ssl_SSL_accept=no
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_accept" >&5
++echo "${ECHO_T}$ac_cv_lib_ssl_SSL_accept" >&6
++if test $ac_cv_lib_ssl_SSL_accept = yes; then
++  cat >>confdefs.h <<\_ACEOF
++#define EGG_SSL_EXT 1
++_ACEOF
++
++      SSL_LIBS="-lssl -lcrypto"
++else
++  { { echo "$as_me:$LINENO: error: You requested SSL support, but OpenSSL was not found. Please supply a pathname to OpenSSL" >&5
++echo "$as_me: error: You requested SSL support, but OpenSSL was not found. Please supply a pathname to OpenSSL" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++      ;;
++    *)
++      test -f $withval/openssl/ssl.h && SSL_INCLUDE="$withval"
++      test -f $withval/include/openssl/ssl.h && SSL_INCLUDE="$withval/include"
++
++      test -f $withval/lib/libssl.a && SSL_LIB="$withval/lib"
++      test -f $withval/lib/ssl/libssl.a && SSL_LIB="$withval/lib/ssl"
++      test -f $withval/lib/openssl/libssl.a && SSL_LIB="$withval/lib/openssl/ssl"
++      test -f $withval/libssl.a && SSL_LIB="$withval"
++      test -f $withval/ssl/libssl.a && SSL_LIB="$withval/ssl"
++      test -f $withval/openssl/libssl.a && SSL_LIB="$withval/openssl"
++
++      test -f $withval/lib/libcrypto.a && CRYPTO_LIB="$withval/lib"
++      test -f $withval/lib/ssl/libcrypto.a && CRYPTO_LIB="$withval/lib/ssl"
++      test -f $withval/lib/openssl/libcrypto.a && CRYPTO_LIB="$withval/lib/openssl/ssl"
++      test -f $withval/libcrypto.a && CRYPTO_LIB="$withval"
++      test -f $withval/ssl/libcrypto.a && CRYPTO_LIB="$withval/ssl"
++      test -f $withval/openssl/libcrypto.a && CRYPTO_LIB="$withval/openssl"
++
++      if test -n "$SSL_INCLUDE" && test -n "$SSL_LIB" && test -n "$CRYPTO_LIB"; then
++        SSL_LIBS="-lssl -lcrypto -L$SSL_LIB -L$CRYPTO_LIB";
++        cat >>confdefs.h <<\_ACEOF
++#define EGG_SSL_EXT 1
++_ACEOF
++
++        echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++      else
++        echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++        { { echo "$as_me:$LINENO: error: You requested SSL support, but OpenSSL was not found. Please supply a pathname to OpenSSL" >&5
++echo "$as_me: error: You requested SSL support, but OpenSSL was not found. Please supply a pathname to OpenSSL" >&2;}
++   { (exit 1); exit 1; }; }
++      fi ;;
++  esac
++
++else
++
++    echo "$as_me:$LINENO: result: will try to find" >&5
++echo "${ECHO_T}will try to find" >&6
++    echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
++echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
++if test "${ac_cv_lib_ssl_SSL_accept+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lssl -lcrypto $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char SSL_accept ();
++int
++main ()
++{
++SSL_accept ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_ssl_SSL_accept=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_ssl_SSL_accept=no
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_accept" >&5
++echo "${ECHO_T}$ac_cv_lib_ssl_SSL_accept" >&6
++if test $ac_cv_lib_ssl_SSL_accept = yes; then
++  cat >>confdefs.h <<\_ACEOF
++#define EGG_SSL_EXT 1
++_ACEOF
++
++     SSL_LIBS="-lssl -lcrypto"
++else
++  { { echo "$as_me:$LINENO: error: OpenSSL was not found. Please supply a pathname to OpenSSL" >&5
++echo "$as_me: error: OpenSSL was not found. Please supply a pathname to OpenSSL" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++
++for ac_header in "openssl/ssl.h"
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++#include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc in
++  yes:no )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    (
++      cat <<\_ASBOX
++## ------------------------------------ ##
++## Report this to bug-autoconf@gnu.org. ##
++## ------------------------------------ ##
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++  no:yes )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    (
++      cat <<\_ASBOX
++## ------------------------------------ ##
++## Report this to bug-autoconf@gnu.org. ##
++## ------------------------------------ ##
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  eval "$as_ac_Header=$ac_header_preproc"
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++else
++  { { echo "$as_me:$LINENO: error: OpenSSL was not found. Please supply a pathname to OpenSSL" >&5
++echo "$as_me: error: OpenSSL was not found. Please supply a pathname to OpenSSL" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++done
++
++
++
++fi;
++
++#end of ssl checks - hoe
++
++
+ if test "$NEED_DL" = 1 && test "$ac_cv_func_dlopen" = "no"
+ then
+   if test "$LINUX" = "yes"
+@@ -7320,7 +8066,7 @@
+      t end
+      /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+      : end' >>confcache
+-if cmp -s $cache_file confcache; then :; else
++if diff $cache_file confcache >/dev/null 2>&1; then :; else
+   if test -w $cache_file; then
+     test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+     cat confcache >$cache_file
+@@ -7380,6 +8126,8 @@
+ # configure, is in config.log if it exists.
+ 
+ debug=false
++ac_cs_recheck=false
++ac_cs_silent=false
+ SHELL=\${CONFIG_SHELL-$SHELL}
+ _ACEOF
+ 
+@@ -7414,7 +8162,10 @@
+ PS4='+ '
+ 
+ # NLS nuisances.
+-for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME
++for as_var in \
++  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++  LC_TELEPHONE LC_TIME
+ do
+   if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+     eval $as_var=C; export $as_var
+@@ -7460,15 +8211,15 @@
+ 
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conftest.sh
+-  echo  "exit 0"   >>conftest.sh
+-  chmod +x conftest.sh
+-  if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then
++  echo "#! /bin/sh" >conf$$.sh
++  echo  "exit 0"   >>conf$$.sh
++  chmod +x conf$$.sh
++  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+     PATH_SEPARATOR=';'
+   else
+     PATH_SEPARATOR=:
+   fi
+-  rm -f conftest.sh
++  rm -f conf$$.sh
+ fi
+ 
+ 
+@@ -7631,7 +8382,7 @@
+ cat >&5 <<_CSEOF
+ 
+ This file was extended by $as_me, which was
+-generated by GNU Autoconf 2.54.  Invocation command line was
++generated by GNU Autoconf 2.57.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -7671,6 +8422,7 @@
+ 
+   -h, --help       print this help, then exit
+   -V, --version    print version number, then exit
++  -q, --quiet      do not print progress messages
+   -d, --debug      don't remove temporary files
+       --recheck    update $as_me by reconfiguring in the same conditions
+   --file=FILE[:TEMPLATE]
+@@ -7693,7 +8445,7 @@
+ cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.54,
++configured by $0, generated by GNU Autoconf 2.57,
+   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+ 
+ Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+@@ -7730,12 +8482,9 @@
+   case $ac_option in
+   # Handling of the options.
+ _ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF
+-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+-    echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
+-    exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
+-_ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
++  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++    ac_cs_recheck=: ;;
+   --version | --vers* | -V )
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+@@ -7757,6 +8506,9 @@
+     $ac_shift
+     CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+     ac_need_defaults=false;;
++  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++  | -silent | --silent | --silen | --sile | --sil | --si | --s)
++    ac_cs_silent=: ;;
+ 
+   # This is an error.
+   -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+@@ -7771,6 +8523,20 @@
+   shift
+ done
+ 
++ac_configure_extra_args=
++
++if $ac_cs_silent; then
++  exec 6>/dev/null
++  ac_configure_extra_args="$ac_configure_extra_args --silent"
++fi
++
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF
++if \$ac_cs_recheck; then
++  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
++  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++fi
++
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<_ACEOF
+@@ -7818,6 +8584,9 @@
+   test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+ fi
+ 
++# Have a temporary directory for convenience.  Make it in the build tree
++# simply because there is no reason to put it here, and in addition,
++# creating and moving files from /tmp can sometimes cause problems.
+ # Create a temporary directory, and hook for its removal unless debugging.
+ $debug ||
+ {
+@@ -7826,17 +8595,17 @@
+ }
+ 
+ # Create a (secure) tmp directory for tmp files.
+-: ${TMPDIR=/tmp}
++
+ {
+-  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
++  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
+   test -n "$tmp" && test -d "$tmp"
+ }  ||
+ {
+-  tmp=$TMPDIR/cs$$-$RANDOM
++  tmp=./confstat$$-$RANDOM
+   (umask 077 && mkdir $tmp)
+ } ||
+ {
+-   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
++   echo "$me: cannot create a temporary directory in ." >&2
+    { (exit 1); exit 1; }
+ }
+ 
+@@ -7921,6 +8690,8 @@
+ s,@TCLINCFN@,$TCLINCFN,;t t
+ s,@TCL_REQS@,$TCL_REQS,;t t
+ s,@TCL_LIBS@,$TCL_LIBS,;t t
++s,@SSL_LIBS@,$SSL_LIBS,;t t
++s,@SSL_INCLUDE@,$SSL_INCLUDE,;t t
+ s,@EGGVERSION@,$EGGVERSION,;t t
+ s,@DEST@,$DEST,;t t
+ s,@MOD_UPDIR@,$MOD_UPDIR,;t t
+@@ -8303,7 +9074,7 @@
+   cat $tmp/in >>$tmp/config.h
+   rm -f $tmp/in
+   if test x"$ac_file" != x-; then
+-    if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
++    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
+       { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+@@ -8452,8 +9223,11 @@
+ # need to make the FD available again.
+ if test "$no_create" != yes; then
+   ac_cs_success=:
++  ac_config_status_args=
++  test "$silent" = yes &&
++    ac_config_status_args="$ac_config_status_args --quiet"
+   exec 5>/dev/null
+-  $SHELL $CONFIG_STATUS || ac_cs_success=false
++  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+   exec 5>>config.log
+   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+   # would make configure fail if this is the last instruction.
+diff -burN eggdrop1.6.15/configure.in eggdrop1.6.15-ssl/configure.in
+--- eggdrop1.6.15/configure.in	2003-05-05 00:05:32.000000000 +0200
++++ eggdrop1.6.15-ssl/configure.in	2003-05-19 16:41:57.000000000 +0200
+@@ -124,6 +124,8 @@
+ EGG_TCL_LUSH
+ # ---------- end of (what used to be) robey's Tcl thingies
+ 
++EGG_SSL_CRAP
++
+ EGG_FUNC_DLOPEN
+ 
+ EGG_SUBST_EGGVERSION
+diff -burN eggdrop1.6.15/Makefile.in eggdrop1.6.15-ssl/Makefile.in
+--- eggdrop1.6.15/Makefile.in	2003-05-05 00:05:32.000000000 +0200
++++ eggdrop1.6.15-ssl/Makefile.in	2003-05-19 16:41:57.000000000 +0200
+@@ -61,6 +61,8 @@
+ # stuff for Tcl
+ XREQS = @TCL_REQS@
+ XLIBS = @TCL_LIBS@ @LIBS@
++XSSL_LIBS = @SSL_LIBS@
++XSSL_INCLUDE = @SSL_INCLUDE@
+ TCLLIB = @TCLLIB@
+ TCLLIBFN = @TCLLIBFN@
+ 
+@@ -86,7 +88,8 @@
+ MAKE_MODEGG = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(MOD_CC)' 'LD=$(MOD_LD)' \
+ 'STRIP=$(MOD_STRIP)' 'RANLIB=$(RANLIB)' 'CFLGS=$(CFLGS)' \
+ 'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \
+-'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=' 'MODOBJS='
++'XSSL_LIBS=$(XSSL_LIBS)' 'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' \
++'XSSL_INCLUDE=$(XSSL_INCLUDE)' 'EGGBUILD=' 'MODOBJS='
+ 
+ MAKE_MODULES = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(SHLIB_CC)' 'LD=$(SHLIB_LD)' \
+ 'STRIP=$(SHLIB_STRIP)' 'CFLGS=$(CFLGS)' 'XLIBS=$(XLIBS)' 'MOD_EXT=$(MOD_EXT)'
+@@ -95,12 +98,13 @@
+ 'STRIP=$(STRIP)' 'RANLIB=$(RANLIB)' 'CFLGS=$(CFLGS) -DSTATIC' \
+ 'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \
+ 'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(static version)' \
+-'MODOBJS=mod/*.o'
++'XSSL_INCLUDE=$(XSSL_INCLUDE)' 'XSSL_LIBS=$(XSSL_LIBS)' 'MODOBJS=mod/*.o'
+ 
+ MAKE_DEBEGG = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(MOD_CC)' 'LD=$(MOD_LD) -g' \
+ 'STRIP=touch' 'RANLIB=$(RANLIB)' 'CFLGS=-g3 $(DEBCFLAGS) $(CFLGS)' \
+ 'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \
+-'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(debug version)' 'MODOBJS='
++'XSSL_LIBS=$(XSSL_LIBS)' 'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' \
++'XSSL_INCLUDE=$(XSSL_INCLUDE)' 'EGGBUILD=(debug version)' 'MODOBJS='
+ 
+ MAKE_DEBMODULES = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(SHLIB_CC)' 'LD=$(SHLIB_LD)' \
+ 'XLIBS=$(XLIBS)' 'STRIP=touch' 'CFLGS=-g3 $(DEBCFLAGS) $(CFLGS)' \
+@@ -109,7 +113,8 @@
+ MAKE_SDEBUG = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD) -g' \
+ 'STRIP=touch' 'RANLIB=$(RANLIB)' 'CFLGS=-g3 $(DEBCFLAGS) -DSTATIC $(CFLGS)' \
+ 'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLIBS=$(XLIBS)' \
+-'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(static and debug version)' 'MODOBJS=mod/*.o'
++'XSSL_INCLUDE=$(XSSL_INCLUDE)' 'XSSL_LIBS=$(XSSL_LIBS)' 'EGGEXEC=$(EGGEXEC)' \
++'EGGBUILD=(static and debug version)' 'MODOBJS=mod/*.o'
+ 
+ MAKE_DEPEND = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
+ 'STRIP=$(STRIP)' 'CFLGS=$(CFLGS)'
+diff -burN eggdrop1.6.15/src/dcc.c eggdrop1.6.15-ssl/src/dcc.c
+--- eggdrop1.6.15/src/dcc.c	2003-05-05 00:05:32.000000000 +0200
++++ eggdrop1.6.15-ssl/src/dcc.c	2003-05-19 16:41:57.000000000 +0200
+@@ -32,7 +32,11 @@
+ #include "tandem.h"
+ 
+ /* Includes for botnet md5 challenge/response code <cybah> */
++#ifndef EGG_SSL_EXT
+ #include "md5/md5.h"
++#else
++#include "openssl/md5.h"
++#endif
+ 
+ extern struct userrec *userlist;
+ extern struct chanset_t *chanset;
+diff -burN eggdrop1.6.15/src/dccutil.c eggdrop1.6.15-ssl/src/dccutil.c
+--- eggdrop1.6.15/src/dccutil.c	2003-05-05 00:05:32.000000000 +0200
++++ eggdrop1.6.15-ssl/src/dccutil.c	2003-05-19 16:41:57.000000000 +0200
+@@ -33,6 +33,7 @@
+ #include "chan.h"
+ #include "modules.h"
+ #include "tandem.h"
++#include "net.h"
+ 
+ extern struct dcc_t *dcc;
+ extern int dcc_total, max_dcc, dcc_flood_thr, backgrd, copy_to_tmp, MAXSOCKS;
+diff -burN eggdrop1.6.15/src/eggdrop.h eggdrop1.6.15-ssl/src/eggdrop.h
+--- eggdrop1.6.15/src/eggdrop.h	2003-05-05 00:05:32.000000000 +0200
++++ eggdrop1.6.15-ssl/src/eggdrop.h	2003-05-19 16:41:57.000000000 +0200
+@@ -594,17 +594,7 @@
+ /* This is used by the net module to keep track of sockets and what's
+  * queued on them
+  */
+-typedef struct {
+-  int sock;
+-  short flags;
+-  char *inbuf;
+-  char *outbuf;
+-  unsigned long outbuflen;      /* Outbuf could be binary data  */
+-  unsigned long inbuflen;       /* Inbuf could be binary data   */
+-#ifdef USE_IPV6
+-  unsigned int af;
+-#endif /* USE_IPV6 */
+-} sock_list;
++/* sock_list moved to net.h */
+ 
+ enum {
+   EGG_OPTION_SET = 1,           /* Set option(s).               */
+diff -burN eggdrop1.6.15/src/main.c eggdrop1.6.15-ssl/src/main.c
+--- eggdrop1.6.15/src/main.c	2003-05-05 00:05:32.000000000 +0200
++++ eggdrop1.6.15-ssl/src/main.c	2003-05-19 16:41:57.000000000 +0200
+@@ -162,6 +162,9 @@
+ int cx_ptr = 0;
+ #endif
+ 
++#ifdef EGG_SSL_EXT
++ int clean_net();
++#endif
+ 
+ void fatal(const char *s, int recoverable)
+ {
+@@ -172,6 +175,9 @@
+   for (i = 0; i < dcc_total; i++)
+     if (dcc[i].sock >= 0)
+       killsock(dcc[i].sock);
++#ifdef EGG_SSL_EXT
++  clean_net();
++#endif        
+   unlink(pid_file);
+   if (!recoverable) {
+     bg_send_quit(BG_ABORT);
+diff -burN eggdrop1.6.15/src/Makefile.in eggdrop1.6.15-ssl/src/Makefile.in
+--- eggdrop1.6.15/src/Makefile.in	2003-05-05 00:05:32.000000000 +0200
++++ eggdrop1.6.15-ssl/src/Makefile.in	2003-05-19 16:41:57.000000000 +0200
+@@ -15,7 +15,8 @@
+ CC = @CC@
+ LD = @CC@
+ STRIP = @STRIP@
+-CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) @DEFS@ $(CFLGS)
++#CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) @DEFS@ $(CFLGS)
++CFLAGS = @CFLAGS@ -I$(XSSL_INCLUDE) -I.. -I$(top_srcdir) @DEFS@ $(CFLGS)
+ CPPFLAGS = @CPPFLAGS@
+ 
+ eggdrop_objs = bg.o botcmd.o botmsg.o botnet.o chanprog.o cmds.o dcc.o \
+@@ -37,7 +38,8 @@
+ 	@echo "Linking eggdrop... $(EGGBUILD)"
+ 	@echo ""
+ 	@touch mod/mod.xlibs
+-	$(LD) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs`
++#	$(LD) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs`
++	$(LD) -o ../$(EGGEXEC) $(eggdrop_objs) $(XSSL_LIBS) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs`
+ 	$(STRIP) ../$(EGGEXEC)
+ 	@echo "Successful compile: $(EGGEXEC)"
+ 	@echo ""
+diff -burN eggdrop1.6.15/src/md5/md5c.c eggdrop1.6.15-ssl/src/md5/md5c.c
+--- eggdrop1.6.15/src/md5/md5c.c	2003-05-05 00:05:32.000000000 +0200
++++ eggdrop1.6.15-ssl/src/md5/md5c.c	2003-05-19 16:41:57.000000000 +0200
+@@ -15,6 +15,9 @@
+  * and avoid compile-time configuration.
+  */
+ 
++#include "../config.h"
++#ifndef EGG_SSL_EXT
++
+ #include <string.h>
+ 
+ #include "md5.h"
+@@ -269,3 +272,5 @@
+ 
+ 	egg_memset(ctx, 0, sizeof(ctx));
+ }
++
++#endif
+diff -burN eggdrop1.6.15/src/md5/md5.h eggdrop1.6.15-ssl/src/md5/md5.h
+--- eggdrop1.6.15/src/md5/md5.h	2003-05-05 00:05:32.000000000 +0200
++++ eggdrop1.6.15-ssl/src/md5/md5.h	2003-05-19 16:41:57.000000000 +0200
+@@ -6,6 +6,9 @@
+  * the public domain.  See md5c.c for more information.
+  */
+ 
++#include "../config.h"
++#ifndef EGG_SSL_EXT
++
+ #ifndef _MD5_H
+ #define _MD5_H
+ 
+@@ -24,3 +27,4 @@
+ extern void MD5_Final(unsigned char *result, MD5_CTX *ctx);
+ 
+ #endif
++#endif
+diff -burN eggdrop1.6.15/src/mod/compress.mod/compress.c eggdrop1.6.15-ssl/src/mod/compress.mod/compress.c
+--- eggdrop1.6.15/src/mod/compress.mod/compress.c	2003-05-05 00:05:32.000000000 +0200
++++ eggdrop1.6.15-ssl/src/mod/compress.mod/compress.c	2003-05-19 16:41:57.000000000 +0200
+@@ -31,11 +31,12 @@
+ 
+ #include <string.h>
+ #include <errno.h>
+-#include <zlib.h>
+ 
+ #include "src/mod/module.h"
+ #include "share.mod/share.h"
+ 
++#include <zlib.h>
++
+ #include "compress_config.h"
+ #ifdef HAVE_MMAP
+ #  include <sys/types.h>
+diff -burN eggdrop1.6.15/src/mod/irc.mod/chan.c eggdrop1.6.15-ssl/src/mod/irc.mod/chan.c
+--- eggdrop1.6.15/src/mod/irc.mod/chan.c	2003-05-05 00:05:32.000000000 +0200
++++ eggdrop1.6.15-ssl/src/mod/irc.mod/chan.c	2003-05-19 16:41:57.000000000 +0200
+@@ -924,10 +924,10 @@
+         q = strchr(p, ' ');
+         if (q != NULL) {
+           *q = 0;
+-          set_key(chan, p);
++          set_keyegg(chan, p);
+           strcpy(p, q + 1);
+         } else {
+-          set_key(chan, p);
++          set_keyegg(chan, p);
+           *p = 0;
+         }
+       }
+diff -burN eggdrop1.6.15/src/mod/irc.mod/irc.c eggdrop1.6.15-ssl/src/mod/irc.mod/irc.c
+--- eggdrop1.6.15/src/mod/irc.mod/irc.c	2003-05-05 00:05:32.000000000 +0200
++++ eggdrop1.6.15-ssl/src/mod/irc.mod/irc.c	2003-05-19 16:41:57.000000000 +0200
+@@ -253,7 +253,7 @@
+ 
+ /* Set the key.
+  */
+-static void set_key(struct chanset_t *chan, char *k)
++static void set_keyegg(struct chanset_t *chan, char *k)
+ {
+   nfree(chan->channel.key);
+   if (k == NULL) {
+diff -burN eggdrop1.6.15/src/mod/irc.mod/irc.h eggdrop1.6.15-ssl/src/mod/irc.mod/irc.h
+--- eggdrop1.6.15/src/mod/irc.mod/irc.h	2003-05-05 00:05:32.000000000 +0200
++++ eggdrop1.6.15-ssl/src/mod/irc.mod/irc.h	2003-05-19 16:41:57.000000000 +0200
+@@ -69,7 +69,7 @@
+ 
+ static void reset_chan_info(struct chanset_t *);
+ static void recheck_channel(struct chanset_t *, int);
+-static void set_key(struct chanset_t *, char *);
++static void set_keyegg(struct chanset_t *, char *);
+ static void maybe_revenge(struct chanset_t *, char *, char *, int);
+ static int detect_chan_flood(char *, char *, char *, struct chanset_t *, int,
+                              char *);
+diff -burN eggdrop1.6.15/src/mod/irc.mod/mode.c eggdrop1.6.15-ssl/src/mod/irc.mod/mode.c
+--- eggdrop1.6.15/src/mod/irc.mod/mode.c	2003-05-05 00:05:32.000000000 +0200
++++ eggdrop1.6.15-ssl/src/mod/irc.mod/mode.c	2003-05-19 16:41:57.000000000 +0200
+@@ -1106,7 +1106,7 @@
+           }
+           check_tcl_mode(nick, from, u, chan->dname, ms2, op);
+           if (ms2[0] == '+') {
+-            set_key(chan, op);
++            set_keyegg(chan, op);
+             if (channel_active(chan))
+               got_key(chan, nick, from, op);
+           } else {
+@@ -1117,7 +1117,7 @@
+                        !chan_master(user) && !match_my_nick(nick))
+                 add_mode(chan, '+', 'k', chan->key_prot);
+             }
+-            set_key(chan, NULL);
++            set_keyegg(chan, NULL);
+           }
+           break;
+         case 'o':
+diff -burN eggdrop1.6.15/src/mod/module.h eggdrop1.6.15-ssl/src/mod/module.h
+--- eggdrop1.6.15/src/mod/module.h	2003-05-05 00:05:32.000000000 +0200
++++ eggdrop1.6.15-ssl/src/mod/module.h	2003-05-19 16:42:33.000000000 +0200
+@@ -477,8 +477,12 @@
+ #define file_readable ((int (*) (char *))global[285])
+ #define getprotocol ((int (*)(char *))global[286])
+ #define open_listen_by_af ((int (*) (int *, int))global[287])
+-/* 288 - 291 */
++/* 288 - 293 */
+ #define egg_inet_ntop ((int (*)(int af, const void *src, char *dst, socklen_t size))global[288])
++#ifdef EGG_SSL_EXT
++#define net_switch_to_ssl ((int (*)(int))global[289])
++#define use_ssl (*(int *)global[290]) /* kyotou */
++#endif
+ 
+ /* hostmasking */
+ #define maskhost(a,b) _maskhost((a),(b),1)
+diff -burN eggdrop1.6.15/src/mod/server.mod/servmsg.c eggdrop1.6.15-ssl/src/mod/server.mod/servmsg.c
+--- eggdrop1.6.15/src/mod/server.mod/servmsg.c	2003-05-05 00:05:33.000000000 +0200
++++ eggdrop1.6.15-ssl/src/mod/server.mod/servmsg.c	2003-05-19 16:41:57.000000000 +0200
+@@ -1242,6 +1242,14 @@
+       fatal("NO SERVERS WILL ACCEPT MY CONNECTION.", 0);
+   } else {
+     dcc[servidx].sock = serv;
++#ifdef EGG_SSL_EXT
++    if (use_ssl) { /* kyotou */
++        if (net_switch_to_ssl(serv)==0) {
++            putlog(LOG_SERV, "*", "SSL %s %s (Error while switching to SSL)", IRC_FAILEDCONNECT, dcc[servidx].host);
++            lostdcc(servidx);    
++        }
++    }    
++#endif
+     /* Queue standard login */
+     dcc[servidx].timeval = now;
+     SERVER_SOCKET.timeout_val = &server_timeout;
+diff -burN eggdrop1.6.15/src/modules.c eggdrop1.6.15-ssl/src/modules.c
+--- eggdrop1.6.15/src/modules.c	2003-05-05 00:05:33.000000000 +0200
++++ eggdrop1.6.15-ssl/src/modules.c	2003-05-19 16:41:57.000000000 +0200
+@@ -28,7 +28,13 @@
+ #include "main.h"
+ #include "modules.h"
+ #include "tandem.h"
++
++#ifndef EGG_SSL_EXT
+ #include "md5/md5.h"
++#else
++#include "openssl/md5.h"
++#endif
++
+ #include <ctype.h>
+ #ifndef STATIC
+ #  ifdef HPUX_HACKS
+@@ -65,6 +71,7 @@
+ extern struct dcc_t *dcc;
+ 
+ #include "users.h"
++#include "net.h"
+ 
+ 
+ extern struct userrec *userlist, *lastuser;
+@@ -83,6 +90,9 @@
+            default_flags, require_p, share_greet, use_invites, use_exempts,
+            password_timeout, force_expire, protect_readonly, reserved_port_min,
+            reserved_port_max, copy_to_tmp, quiet_reject;
++#ifdef EGG_SSL_EXT
++extern int      use_ssl; /* kyotou */
++#endif
+ 
+ extern party_t *party;
+ extern time_t now, online_since;
+@@ -97,6 +107,11 @@
+ int xtra_unpack();
+ static int module_rename(char *name, char *newname);
+ 
++#ifdef EGG_SSL_EXT
++int net_switch_to_ssl(int);
++#endif
++
++
+ 
+ #ifndef STATIC
+ 
+@@ -563,7 +578,13 @@
+   (Function) file_readable,
+   (Function) getprotocol,
+   (Function) open_listen_by_af,
++#ifdef EGG_SSL_EXT
++  (Function) egg_inet_ntop,
++  (Function) net_switch_to_ssl,
++  (Function) & use_ssl /* kyotou */
++#else
+   (Function) egg_inet_ntop
++#endif
+ };
+ 
+ void init_modules(void)
+diff -burN eggdrop1.6.15/src/net.c eggdrop1.6.15-ssl/src/net.c
+--- eggdrop1.6.15/src/net.c	2003-05-05 00:05:33.000000000 +0200
++++ eggdrop1.6.15-ssl/src/net.c	2003-05-19 16:41:57.000000000 +0200
+@@ -34,6 +34,17 @@
+ #  endif
+ #endif
+ 
++#ifdef EGG_SSL_EXT
++# ifndef EGG_SSL_INCS
++#  include <openssl/ssl.h>
++#  include <openssl/err.h>
++#  include <openssl/rand.h>
++#  define EGG_SSL_INCS 1
++# endif
++#endif
++
++#include "net.h"
++
+ extern struct dcc_t *dcc;
+ extern int backgrd, use_stderr, resolve_timeout, dcc_total;
+ extern unsigned long otraffic_irc_today, otraffic_bn_today, otraffic_dcc_today,
+@@ -53,6 +64,11 @@
+ char botuser[21] = "eggdrop"; /* Username of the user running the bot         */
+ int dcc_sanitycheck = 0;      /* We should do some sanity checking on dcc
+                                * connections.                                 */
++#ifdef EGG_SSL_EXT
++SSL_CTX *ssl_ctx=NULL;
++char	*tls_rand_file = NULL;
++int     use_ssl = 0; /* kyotou */
++#endif
+ sock_list *socklist = NULL;   /* Enough to be safe                            */
+ int MAXSOCKS = 0;
+ jmp_buf alarmret;             /* Env buffer for alarm() returns               */
+@@ -109,6 +125,45 @@
+ #endif /* USE_IPV6 */
+ }
+ 
++#ifdef EGG_SSL_EXT
++int seed_PRNG(void)
++{
++    char stackdata[1024];
++    static char rand_file[300];
++    FILE *fh;
++    
++#if OPENSSL_VERSION_NUMBER >= 0x00905100
++    if (RAND_status())
++	return 0;     /* PRNG already good seeded */
++#endif
++    /* if the device '/dev/urandom' is present, OpenSSL uses it by default.
++     * check if it's present, else we have to make random data ourselfs.
++     */
++    if ((fh = fopen("/dev/urandom", "r"))) {
++	fclose(fh);
++	return 0;
++    }
++    if (RAND_file_name(rand_file, sizeof(rand_file)))
++	tls_rand_file = rand_file;
++    else
++	return 1;
++    if (!RAND_load_file(rand_file, 1024)) {
++	/* no .rnd file found, create new seed */
++	unsigned int c;
++	c = time(NULL);
++	RAND_seed(&c, sizeof(c));
++	c = getpid();
++	RAND_seed(&c, sizeof(c));
++	RAND_seed(stackdata, sizeof(stackdata));
++    }
++#if OPENSSL_VERSION_NUMBER >= 0x00905100
++    if (!RAND_status())
++	return 2;   /* PRNG still badly seeded */
++#endif
++    return 0;
++}
++#endif
++
+ /* Initialize the socklist
+  */
+ void init_net()
+@@ -117,9 +172,35 @@
+ 
+   for (i = 0; i < MAXSOCKS; i++) {
+     socklist[i].flags = SOCK_UNUSED;
++#ifdef EGG_SSL_EXT
++    socklist[i].ssl=NULL;
++#endif
+   }
++#ifdef EGG_SSL_EXT
++  /* good place to init ssl stuff */
++  SSL_load_error_strings();
++  OpenSSL_add_ssl_algorithms();
++  ssl_ctx=SSL_CTX_new(SSLv23_client_method());
++  if (!ssl_ctx) 
++   fatal("SSL_CTX_new() failed",0);
++  if (seed_PRNG())
++    fatal("Wasn't able to properly seed the PRNG!",0);	
++#endif
+ }
+ 
++#ifdef EGG_SSL_EXT
++/* cleanup mess when quiting */
++int clean_net() {
++   if (ssl_ctx) {
++	SSL_CTX_free(ssl_ctx);
++	ssl_ctx = NULL;
++  }
++  if (tls_rand_file)
++	RAND_write_file(tls_rand_file);
++ return 0;
++}
++#endif
++
+ int expmem_net()
+ {
+   int i, tot = 0;
+@@ -382,6 +463,13 @@
+     return;
+   for (i = 0; i < MAXSOCKS; i++) {
+     if ((socklist[i].sock == sock) && !(socklist[i].flags & SOCK_UNUSED)) {
++#ifdef EGG_SSL_EXT
++      if (socklist[i].ssl) {
++    	SSL_shutdown(socklist[i].ssl);
++	SSL_free(socklist[i].ssl);
++	socklist[i].ssl=NULL;
++  }
++#endif
+       close(socklist[i].sock);
+       if (socklist[i].inbuf != NULL) {
+         nfree(socklist[i].inbuf);
+@@ -625,6 +713,63 @@
+   return sock;
+ }
+ 
++#ifdef EGG_SSL_EXT
++int net_switch_to_ssl(int sock) {
++int err;
++int i=0;
++    debug0("net_switch_to_ssl()");
++    while (i<MAXSOCKS) {
++     if (socklist[i].sock==sock) {
++      break;
++     }
++     i++;
++    }
++    if (i==MAXSOCKS) {
++        debug0("Error while swithing to SSL - sock not found in list");
++	return 0;
++    }
++
++    if (socklist[i].ssl) {
++        debug0("Error while swithing to SSL - already in ssl");
++	return 0;
++    }
++    socklist[i].ssl = SSL_new(ssl_ctx);
++    if (!socklist[i].ssl) {
++        debug0("Error while swithing to SSL - SSL_new() error");
++	return 0;
++    }
++
++     SSL_set_fd(socklist[i].ssl, socklist[i].sock);
++     err = SSL_connect(socklist[i].ssl);
++   
++     while (err <= 0) {
++        int errs;
++        errs=SSL_get_error(socklist[i].ssl,err);
++        if ((errs!=SSL_ERROR_WANT_READ)&&(errs!=SSL_ERROR_WANT_WRITE)&&
++	        (errs!=SSL_ERROR_WANT_X509_LOOKUP)) {
++		putlog(LOG_DEBUG,"*", "SSL_connect() = %d, %s", err,
++			(char *)ERR_error_string(ERR_get_error(), NULL));
++	 	SSL_shutdown(socklist[i].ssl);
++	 	SSL_free(socklist[i].ssl);
++	 	socklist[i].ssl = NULL;
++	        return 0;	    
++        }
++        usleep(1000);
++        err = SSL_connect(socklist[i].ssl);
++     }
++
++     if (err==1) {
++      debug0("SSL_connect() success"); 
++      return 1;
++     }
++     debug0("Error while SSL_connect()"); 
++     SSL_shutdown(socklist[i].ssl);
++     SSL_free(socklist[i].ssl); 
++     socklist[i].ssl = NULL;
++     return 0;
++}
++#endif
++
+ /* Ordinary non-binary connection attempt */
+ int open_telnet(char *server, int port)
+ {
+@@ -957,6 +1102,9 @@
+     for (i = 0; i < MAXSOCKS; i++) {
+       if ((!(socklist[i].flags & SOCK_UNUSED)) &&
+           ((FD_ISSET(socklist[i].sock, &fd)) ||
++#ifdef EGG_SSL_EXT
++	   ((socklist[i].ssl)&&(SSL_pending(socklist[i].ssl))) ||
++#endif	  
+           ((socklist[i].sock == STDOUT) && (!backgrd) &&
+           (FD_ISSET(STDIN, &fd))))) {
+         if (socklist[i].flags & (SOCK_LISTEN | SOCK_CONNECT)) {
+@@ -981,7 +1129,31 @@
+         if ((socklist[i].sock == STDOUT) && !backgrd)
+           x = read(STDIN, s, grab);
+         else
++#ifdef EGG_SSL_EXT
++	{
++        if (socklist[i].ssl) {
++           x=SSL_read(socklist[i].ssl,s,grab);
++ 	   if (x < 0) {
++	    int err = SSL_get_error(socklist[i].ssl, x);
++	    x = -1;
++	    switch (err) {
++	    	case SSL_ERROR_WANT_READ:
++		    errno = EAGAIN;
++		    break;
++	    	case SSL_ERROR_WANT_WRITE:
++ 		    errno = EAGAIN;
++		    break;
++         	case SSL_ERROR_WANT_X509_LOOKUP:
++		    errno = EAGAIN;
++		    break;
++		}
++  	    }
++        } else
+           x = read(socklist[i].sock, s, grab);
++	}
++#else
++	  x = read(socklist[i].sock, s, grab);
++#endif      
+         if (x <= 0) {           /* eof */
+           if (errno != EAGAIN) { /* EAGAIN happens when the operation would
+                                   * block on a non-blocking socket, if the
+@@ -1283,6 +1455,26 @@
+         socklist[i].outbuflen += len;
+         return;
+       }
++#ifdef EGG_SSL_EXT
++      if (socklist[i].ssl) {
++       x=SSL_write(socklist[i].ssl,s,len);
++ 	   if (x < 0) {
++	    int err = SSL_get_error(socklist[i].ssl, x);
++	    x = -1;
++	    switch (err) {
++	    	case SSL_ERROR_WANT_READ:
++		    errno = EAGAIN;
++		    break;
++        	case SSL_ERROR_WANT_WRITE:
++		    errno = EAGAIN;
++		    break;
++        	case SSL_ERROR_WANT_X509_LOOKUP:
++		    errno = EAGAIN;
++		    break;
++		}
++  	    }
++      } else
++#endif      
+       /* Try. */
+       x = write(z, s, len);
+       if (x == -1)
+@@ -1354,6 +1546,27 @@
+         (socklist[i].outbuf != NULL) && (FD_ISSET(socklist[i].sock, &wfds))) {
+       /* Trick tputs into doing the work */
+       errno = 0;
++#ifdef EGG_SSL_EXT
++       if (socklist[i].ssl) {
++	   x = write(socklist[i].sock, socklist[i].outbuf,
++		socklist[i].outbuflen);
++ 	   if (x < 0) {
++ 	    int err = SSL_get_error(socklist[i].ssl, x);
++ 	    x = -1;
++ 	    switch (err) {
++ 	    	case SSL_ERROR_WANT_READ:
++ 		    errno = EAGAIN;
++ 		    break;
++ 	    	case SSL_ERROR_WANT_WRITE:
++ 		    errno = EAGAIN;
++ 		    break;
++ 	    	case SSL_ERROR_WANT_X509_LOOKUP:
++ 		    errno = EAGAIN;
++ 		    break;
++ 		}
++   	    }
++       } else
++#endif      
+       x = write(socklist[i].sock, socklist[i].outbuf, socklist[i].outbuflen);
+       if ((x < 0) && (errno != EAGAIN)
+ #ifdef EBADSLT
+diff -burN eggdrop1.6.15/src/net.h eggdrop1.6.15-ssl/src/net.h
+--- eggdrop1.6.15/src/net.h	1970-01-01 01:00:00.000000000 +0100
++++ eggdrop1.6.15-ssl/src/net.h	2003-05-19 16:41:57.000000000 +0200
+@@ -0,0 +1,30 @@
++#ifndef _EGG_NET_H
++#define _EGG_NET_H
++#ifdef EGG_SSL_EXT
++# ifndef EGG_SSL_INCS
++#  include <openssl/ssl.h>
++#  include <openssl/err.h>
++#  include <openssl/rand.h>
++#  define EGG_SSL_INCS 1
++# endif
++#endif
++
++/* This is used by the net module to keep track of sockets and what's
++ * queued on them
++ */
++typedef struct {
++  int		 sock;
++#ifdef EGG_SSL_EXT
++  SSL *ssl;  
++#endif
++  short		 flags;
++  char		*inbuf;
++  char		*outbuf;
++  unsigned long  outbuflen;	/* Outbuf could be binary data	*/
++  unsigned long	 inbuflen;	/* Inbuf could be binary data	*/
++#ifdef USE_IPV6
++  unsigned int af;
++#endif /* USE_IPV6 */
++} sock_list;
++
++#endif				/* _EGG_NET_H */
+diff -burN eggdrop1.6.15/src/patch.h eggdrop1.6.15-ssl/src/patch.h
+--- eggdrop1.6.15/src/patch.h	2003-05-05 00:08:01.000000000 +0200
++++ eggdrop1.6.15-ssl/src/patch.h	2003-05-19 16:41:57.000000000 +0200
+@@ -32,6 +32,9 @@
+  */
+ #ifndef _EGG_PATCH_H
+ #define _EGG_PATCH_H
++#ifdef EGG_SSL_EXT
++patch("SSL");
++#endif
+ /*
+  *
+  *
+diff -burN eggdrop1.6.15/src/tcl.c eggdrop1.6.15-ssl/src/tcl.c
+--- eggdrop1.6.15/src/tcl.c	2003-05-05 00:05:33.000000000 +0200
++++ eggdrop1.6.15-ssl/src/tcl.c	2003-05-19 16:41:57.000000000 +0200
+@@ -44,6 +44,9 @@
+ 
+ 
+ extern time_t online_since;
++#ifdef EGG_SSL_EXT
++extern int      use_ssl; /* kyotou */
++#endif
+ 
+ extern char origbotname[], botuser[], motdfile[], admin[], userfile[],
+             firewall[], helpdir[], notify_new[], hostname[], myip[], moddir[],
+@@ -529,6 +532,9 @@
+   {"enable-simul",          &enable_simul,         0}, /* compat */
+   {"debug-output",          &debug_output,         0}, /* compat */
+   {"use-console-r",         &use_console_r,        0}, /* compat */
++#ifdef EGG_SSL_EXT
++  {"use-ssl",			&use_ssl,		0}, /* kyotou */
++#endif
+   {NULL,                    NULL,                  0}
+ };
+ 
+diff -burN eggdrop1.6.15/src/tclmisc.c eggdrop1.6.15-ssl/src/tclmisc.c
+--- eggdrop1.6.15/src/tclmisc.c	2003-05-05 00:05:33.000000000 +0200
++++ eggdrop1.6.15-ssl/src/tclmisc.c	2003-05-19 16:41:57.000000000 +0200
+@@ -26,7 +26,13 @@
+ #include "main.h"
+ #include "modules.h"
+ #include "tandem.h"
++
++#ifndef EGG_SSL_EXT
+ #include "md5/md5.h"
++#else
++#include "openssl/md5.h"
++#endif
++
+ #ifdef TIME_WITH_SYS_TIME
+ # include <sys/time.h>
+ # include <time.h>
author	Chuck Short <zul@gentoo.org>	2004-02-03 03:02:50 +0000
committer	Chuck Short <zul@gentoo.org>	2004-02-03 03:02:50 +0000
commit	d05c1d79013a87744b7380567be15cc743bc8133 (patch)
tree	a551d9febde3682cbf18373171e6ac4cccefe480 /net-irc/eggdrop
parent	ver bump #40219 (diff)
download	gentoo-2-d05c1d79013a87744b7380567be15cc743bc8133.tar.gz gentoo-2-d05c1d79013a87744b7380567be15cc743bc8133.tar.bz2 gentoo-2-d05c1d79013a87744b7380567be15cc743bc8133.zip