* Compile time fixes/improvments

* SSL is now compiled in
* Md5 now uses the openssl/md5.h
  -fixed to irc.mod for this to work
* zlib is now compiled in
* autoheader/autoconf files moves to autoconf/
* Need to strip TCL from this point on, its bloat.


svn: 136

Makefile.in

@@ -10,8 +10,6 @@ VPATH = @srcdir@
 
 @SET_MAKE@
 prefix = @prefix@
-DEST = @DEST@
-EGGEXEC = @EGGEXEC@
 EGGVERSION = @EGGVERSION@
 LEAFEXEC = leaf
 HUBEXEC = hub
@@ -34,24 +32,6 @@ CFLGS =
 CC = @CC@
 LD = @CC@
 STRIP = @STRIP@
-RANLIB = @RANLIB@
-
-# make eggmod
-MOD_CC = @MOD_CC@
-MOD_LD = @MOD_LD@
-MOD_STRIP = @MOD_STRIP@
-
-# make modules
-SHLIB_CC = @SHLIB_CC@
-SHLIB_LD = @SHLIB_LD@
-SHLIB_STRIP = @SHLIB_STRIP@
-
-# programs make install uses
-LN_S = @LN_S@
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 # STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP #
 # - - - - - - - - do not edit anything below this line. - - - - - - - - #
@@ -60,7 +40,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 # stuff for Tcl
 XREQS = @TCL_REQS@
-XLIBS = @TCL_LIBS@ @LIBS@
+XLIBS = @TCL_LIBS@ @LIBS@ @ZLIB@ @SSL@
 TCLLIB = @TCLLIB@
 TCLLIBFN = @TCLLIBFN@
 
@@ -78,29 +58,29 @@ egg_install_msg =  echo "" && \
 DEBCFLAGS = -DDEBUG_ASSERT -DDEBUG_MEM
 
 MAKE_LEAF = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
-'STRIP=$(STRIP)' 'RANLIB=$(RANLIB)' 'CFLGS=$(CFLGS) -DLEAF' \
+'STRIP=$(STRIP)' 'CFLGS=$(CFLGS) -DLEAF' \
 'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \
 'XLIBS=$(XLIBS)' 'EGGEXEC=$(LEAFEXEC)' 'EGGBUILD=(leaf)' \
 'MODOBJS=mod/*.o' 
 
 MAKE_DLEAF = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD) -g' \
-'STRIP=touch' 'RANLIB=$(RANLIB)' 'CFLGS=-g3 $(DEBCFLAGS) -DLEAF $(CFLGS)' \
+'STRIP=touch' 'CFLGS=-g3 $(DEBCFLAGS) -DLEAF $(CFLGS)' \
 'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLIBS=$(XLIBS)' \
 'EGGEXEC=$(LEAFEXEC)' 'EGGBUILD=(debug leaf)' 'MODOBJS=mod/*.o'
 
 MAKE_HUB = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
-'STRIP=$(STRIP)' 'RANLIB=$(RANLIB)' 'CFLGS=$(CFLGS) -CHUB' \
+'STRIP=$(STRIP)' 'CFLGS=$(CFLGS) -CHUB' \
 'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \
 'XLIBS=$(XLIBS)' 'EGGEXEC=$(HUBEXEC)' 'EGGBUILD=(hub)' \
 'MODOBJS=mod/*.o'
 
 MAKE_DHUB = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD) -g' \
-'STRIP=touch' 'RANLIB=$(RANLIB)' 'CFLGS=-g3 $(DEBCFLAGS) -DHUB $(CFLGS)' \
+'STRIP=touch' 'CFLGS=-g3 $(DEBCFLAGS) -DHUB $(CFLGS)' \
 'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLIBS=$(XLIBS)' \
 'EGGEXEC=$(HUBEXEC)' 'EGGBUILD=(debug hub)' 'MODOBJS=mod/*.o'
 
 MAKE_UTILS = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'STRIP=$(STRIP)' \
-'RANLIB=$(RANLIB)' 'CFLGS=$(CFLGS) -DSTANDALONE' 'XREQS=$(XREQS)' \
+'CFLGS=$(CFLGS) -DSTANDALONE' 'XREQS=$(XREQS)' \
 'XLIBS=$(XLIBS)' 'LD=$(LD)'
 
 MAKE_DEPEND = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
@@ -121,14 +101,13 @@ cleanpack:
 
 clean:  cleanutils cleanpack
 	@cd src && $(MAKE) clean
-	@cd src/md5 && $(MAKE) clean
 	@cd src/compat && $(MAKE) clean
 	@rm -f $(HUBEXEC) $(LEAFEXEC) *.stamp core DEBUG *~ key configure.temp makesalt 
 	@rm -f $(HUBEXEC).* $(LEAFEXEC).* src/makesalt
 
 distclean: clean clean-modconfig
 	@cd src/mod && $(MAKE) distclean
-	@rm -f Makefile src/Makefile src/md5/Makefile src/compat/Makefile src/mod/Makefile
+	@rm -f Makefile src/Makefile src/compat/Makefile src/mod/Makefile
 	@rm -f config.cache config.log config.status config.h lush.h stamp.*
 	@rm -rf autom4te.cache
 
@@ -140,19 +119,15 @@ distrib: distclean
 depend:
 	@cat /dev/null > lush.h
 	@cd src && $(MAKE_DEPEND) depend
-	@cd src/md5 && $(MAKE_DEPEND) depend
 	@cd src/mod && $(MAKE_DEPEND) depend
 	@cd src/compat && $(MAKE_DEPEND) depend
 
 eggautoconf:
 	@$(modconf) eggautoconf
 
-salt:
-	@echo [*] Compiling MakeSalt for Encryption..
-	@$(CC) -I. -o makesalt src/makesalt.c
+salt:	utils
 	@./makesalt
 
-
 config:
 	@$(modconf) modules-still-exist
 	@$(modconf) detect-modules
@@ -170,8 +145,8 @@ packconf:
 	@cp -f pack/settings.c src/settings.c
 
 utils:  packconf
-#	@./misc/maketype utils
-	@cd src; $(MAKE_UTILS) ../stringfix
+	@cd src && $(MAKE_UTILS) ../stringfix
+	@cd src && $(MAKE_UTILS) ../makesalt
 
 depleaf:
 	@echo ""
@@ -183,14 +158,12 @@ depleaf:
 	@echo ""
 	@cat /dev/null > lush.h
 	@cd src && $(MAKE_DEPEND) depleaf
-	@cd src/md5 && $(MAKE_DEPEND) depleaf
 	@cd src/mod && $(MAKE_DEPEND) depleaf
 	@cd src/compat && $(MAKE_DEPEND) depleaf
 
 dephub:
 	@cat /dev/null > lush.h
 	@cd src && $(MAKE_DEPEND) dephub
-	@cd src/md5 && $(MAKE_DEPEND) dephub
 	@cd src/mod && $(MAKE_DEPEND) dephub
 	@cd src/compat && $(MAKE_DEPEND) dephub
 

acconfig.h

@@ -1,66 +0,0 @@
-#ifndef _EGG_CONFIG_H
-#define _EGG_CONFIG_H
-@TOP@
-/* 
- * acconfig.h
- *   template file autoheader uses when building config.h.in
- * 
- */
-
-/* Define if you want to enable IPv6 support. */
-#undef HAVE_IPV6
-
-/* Define if you have support for socklen_t. */
-#undef HAVE_SOCKLEN_T
-
-/* Define if modules will work on your system  */
-#undef MODULES_OK
-
-/* Define if running on hpux that supports dynamic linking  */
-#undef HPUX_HACKS
-
-/* Define if running on hpux 10.x  */
-#undef HPUX10_HACKS
-
-/* Define if running on OSF/1 platform.  */
-#undef OSF1_HACKS
-
-/* Define to use Eggdrop's snprintf functions without regard to HAVE_SNPRINTF. */
-#undef BROKEN_SNPRINTF
-
-/* Define if running on OSF/1 platform.  */
-#undef STOP_UAC
-
-/* Define if running on sunos 4.0 *sigh*  */
-#undef DLOPEN_1
-
-/* Define if running on NeXT Step  */
-#undef BORGCUBES
-
-/* Define if running under cygwin  */
-#undef CYGWIN_HACKS
-
-/* Define if you have a version of libsafe with a broken sscanf */
-#undef LIBSAFE_HACKS
-
-/* Define if we need dlopen (for module support)  */
-#undef HAVE_DLOPEN
-
-/* Define for pre Tcl 7.5 compat  */
-#undef HAVE_PRE7_5_TCL
-
-/* Define for Tcl that has Tcl_Free() (7.5p1 and later)  */
-#undef HAVE_TCL_FREE
-
-/* Define for Tcl that has threads  */
-#undef HAVE_TCL_THREADS
-
-/* Defines the current eggdrop version  */
-#undef EGG_VERSION
-
-/* Define if you have the `ipv6' support. */
-#define USE_IPV6
-
-@BOTTOM@
-
-#endif /* !_EGG_CONFIG_H */

aclocal.m4

@@ -1,1271 +0,0 @@
-dnl aclocal.m4
-dnl   macros autoconf uses when building configure from configure.in
-dnl
-dnl
-
-
-dnl  EGG_CHECK_CC()
-dnl
-dnl  FIXME: make a better test
-dnl
-AC_DEFUN(EGG_CHECK_CC, [dnl
-if test "${cross_compiling-x}" = "x"
-then
-  cat << 'EOF' >&2
-configure: error:
-
-  This system does not appear to have a working C compiler.
-  A working C compiler is required to compile Eggdrop.
-
-EOF
-  exit 1
-fi
-])dnl
-
-dnl  EGG_IPV6_OPTIONS()
-dnl
-AC_DEFUN(EGG_IPV6_OPTIONS, [dnl
-AC_MSG_CHECKING(whether or not you enabled IPv6 support)
-AC_ARG_ENABLE(ipv6, [  --enable-ipv6           enable IPv6 support],
-[ ac_cv_ipv6="yes"
-  if test "$egg_cv_ipv6_supported" = "no"; then
-    ac_cv_ipv6="no"
-  fi
-  AC_MSG_RESULT($ac_cv_ipv6)
-],
-[ ac_cv_ipv6="no"
-  AC_MSG_RESULT(no)
-])
-if test "$ac_cv_ipv6" = "yes"; then
-  AC_DEFINE(HAVE_IPV6)
-  ENABLEIPV6="--enable-ipv6"
-fi
-AC_SUBST(ENABLEIPV6)
-])dnl
-
-
-dnl  EGG_CHECK_SOCKLEN_T()
-dnl
-AC_DEFUN(EGG_CHECK_SOCKLEN_T, [dnl
-AC_MSG_CHECKING(for socklen_t)
-AC_CACHE_VAL(egg_cv_socklen_t,[
-  AC_TRY_RUN([
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-int main()
-{
-  socklen_t test = sizeof(int);
-
-  return 0;
-}
-  ],
-egg_cv_socklen_t=yes, egg_cv_socklen_t=no, egg_cv_socklen_t=no)])
-if test "$egg_cv_socklen_t" = "yes"; then
-  AC_DEFINE(HAVE_SOCKLEN_T)
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
-])dnl
-
-
-dnl  EGG_CHECK_CCPIPE()
-dnl
-dnl  Checks whether the compiler supports the `-pipe' flag, which
-dnl  speeds up the compilation.
-AC_DEFUN(EGG_CHECK_CCPIPE, [dnl
-if test -z "$no_pipe"
-then
-  if test -n "$GCC"
-  then
-    AC_CACHE_CHECK(whether the compiler understands -pipe, egg_cv_var_ccpipe, [dnl
-      ac_old_CC="$CC"
-      CC="$CC -pipe"
-      AC_TRY_COMPILE(,, egg_cv_var_ccpipe="yes", egg_cv_var_ccpipe="no")
-      CC="$ac_old_CC"
-    ])
-    if test "$egg_cv_var_ccpipe" = "yes"
-    then
-      CC="$CC -pipe"
-    fi
-  fi
-fi
-])dnl
-
-
-dnl  EGG_PROG_STRIP()
-dnl
-AC_DEFUN(EGG_PROG_STRIP, [dnl
-AC_CHECK_PROG(STRIP, strip, strip)
-if test "${STRIP-x}" = "x"
-then
-  STRIP=touch
-fi
-])dnl
-
-
-dnl  EGG_PROG_AWK()
-dnl
-AC_DEFUN(EGG_PROG_AWK, [dnl
-# awk is needed for Tcl library and header checks, and eggdrop version subst
-AC_PROG_AWK
-if test "${AWK-x}" = "x"
-then
-  cat << 'EOF' >&2
-configure: error:
-
-  This system seems to lack a working 'awk' command.
-  A working 'awk' command is required to compile Eggdrop.
-
-EOF
-  exit 1
-fi
-])dnl
-
-
-dnl  EGG_PROG_BASENAME()
-dnl
-AC_DEFUN(EGG_PROG_BASENAME, [dnl
-# basename is needed for Tcl library and header checks
-AC_CHECK_PROG(BASENAME, basename, basename)
-if test "${BASENAME-x}" = "x"
-then
-  cat << 'EOF' >&2
-configure: error:
-
-  This system seems to lack a working 'basename' command.
-  A working 'basename' command is required to compile Eggdrop.
-
-EOF
-  exit 1
-fi
-])dnl
-
-
-dnl  EGG_CHECK_OS()
-dnl
-dnl  FIXME/NOTICE:
-dnl    This function is obsolete. Any NEW code/checks should be written
-dnl    as individual tests that will be checked on ALL operating systems.
-dnl
-AC_DEFUN(EGG_CHECK_OS, [dnl
-LINUX=no
-IRIX=no
-SUNOS=no
-HPUX=no
-EGG_CYGWIN=no
-MOD_CC="$CC"
-MOD_LD="$CC"
-MOD_STRIP="$STRIP"
-SHLIB_CC="$CC"
-SHLIB_LD="$CC"
-SHLIB_STRIP="$STRIP"
-NEED_DL=1
-
-AC_CACHE_CHECK(system type, egg_cv_var_system_type, egg_cv_var_system_type=`$UNAME -s`)
-AC_CACHE_CHECK(system release, egg_cv_var_system_release, egg_cv_var_system_release=`$UNAME -r`)
-
-case "$egg_cv_var_system_type" in
-  BSD/OS)
-    case "`echo $egg_cv_var_system_release | cut -d . -f 1`" in
-      2)
-        NEED_DL=0
-      ;;
-      3)
-        MOD_CC=shlicc
-        MOD_LD=shlicc
-        MOD_STRIP="$STRIP -d"
-        SHLIB_LD="shlicc -r"
-        SHLIB_STRIP=touch
-        AC_DEFINE(MODULES_OK)dnl
-      ;;
-      *)
-        CFLAGS="$CFLAGS -Wall"
-        MOD_LD="$CC"
-        MOD_STRIP="$STRIP -d"
-        SHLIB_CC="$CC -export-dynamic -fPIC"
-        SHLIB_LD="$CC -shared -nostartfiles"
-        AC_DEFINE(MODULES_OK)dnl
-      ;;
-    esac
-  ;;
-  CYGWI*)
-    case "`echo $egg_cv_var_system_release | cut -c 1-3`" in
-      1.*)
-        NEED_DL=0
-        SHLIB_LD="$CC -shared"
-        AC_PROG_CC_WIN32
-        CC="$CC $WIN32FLAGS"
-        MOD_CC="$CC"
-        MOD_LD="$CC"
-        AC_MSG_CHECKING(for /usr/lib/binmode.o)
-        if test -r /usr/lib/binmode.o
-        then
-          AC_MSG_RESULT(yes)
-          LIBS="$LIBS /usr/lib/binmode.o"
-        else
-          AC_MSG_RESULT(no)
-          AC_MSG_WARN(Make sure the directory Eggdrop is installed into is mounted in binary mode.)
-        fi
-        AC_DEFINE(MODULES_OK)dnl
-      ;;
-      *)
-        NEED_DL=0
-        AC_MSG_WARN(Make sure the directory Eggdrop is installed into is mounted in binary mode.)
-      ;;
-    esac
-    EGG_CYGWIN=yes
-    AC_DEFINE(CYGWIN_HACKS)
-  ;;
-  HP-UX)
-    HPUX=yes
-    MOD_LD="$CC -fPIC -shared"
-    SHLIB_CC="$CC -fPIC"
-    SHLIB_LD="ld -b"
-    NEED_DL=0
-    AC_DEFINE(MODULES_OK)dnl
-    AC_DEFINE(HPUX_HACKS)dnl
-    if test "`echo $egg_cv_var_system_release | cut -d . -f 2`" = "10"
-    then
-      AC_DEFINE(HPUX10_HACKS)dnl
-    fi
-  ;;
-  dell)
-    AC_MSG_RESULT(Dell SVR4)
-    SHLIB_STRIP=touch
-    NEED_DL=0
-    MOD_LD="$CC -lelf -lucb"
-  ;;
-  IRIX)
-    SHLIB_LD="ld -n32 -shared -rdata_shared"
-    IRIX=yes
-    SHLIB_STRIP=touch
-    NEED_DL=0
-  ;;
-  Ultrix)
-    NEED_DL=0
-    SHLIB_STRIP=touch
-    SHELL=/bin/sh5
-  ;;
-  SINIX*)
-    NEED_DL=0
-    SHLIB_STRIP=touch
-    SHLIB_CC="cc -G"
-  ;;
-  BeOS)
-    NEED_DL=0
-    SHLIB_STRIP=strip
-  ;;
-  Linux)
-    LINUX=yes
-    CFLAGS="$CFLAGS -Wall"
-    MOD_LD="$CC"
-    SHLIB_CC="$CC -fPIC"
-    SHLIB_LD="$CC -shared -nostartfiles"
-    AC_DEFINE(MODULES_OK)dnl
-  ;;
-  Lynx)
-    NEED_DL=0
-    SHLIB_STRIP=strip
-  ;;
-  QNX)
-    NEED_DL=0
-    SHLIB_LD="ld -shared"
-    SHLIB_STRIP=strip
-  ;;
-  OSF1)
-    case "`echo $egg_cv_var_system_release | cut -d . -f 1`" in
-      V*)
-        # FIXME: we should check this in a separate test
-        # Digital OSF uses an ancient version of gawk
-        if test "$AWK" = "gawk"
-        then
-          AWK=awk
-        fi
-        MOD_CC=cc
-        MOD_LD=cc
-        SHLIB_CC=cc
-        SHLIB_LD="ld -shared -expect_unresolved \"'*'\""
-        SHLIB_STRIP=touch
-        AC_DEFINE(MODULES_OK)dnl
-      ;;
-      1.0|1.1|1.2)
-        SHLIB_LD="ld -R -export $@:"
-        AC_DEFINE(MODULES_OK)dnl
-        AC_DEFINE(OSF1_HACKS)dnl
-      ;;
-      1.*)
-        SHLIB_CC="$CC -fpic"
-        SHLIB_LD="ld -shared"
-        AC_DEFINE(MODULES_OK)dnl
-        AC_DEFINE(OSF1_HACKS)dnl
-      ;;
-      *)
-        NEED_DL=0
-      ;;
-    esac
-    AC_DEFINE(STOP_UAC)dnl
-    AC_DEFINE(BROKEN_SNPRINTF)dnl
-  ;;
-  SunOS)
-    if test "`echo $egg_cv_var_system_release | cut -d . -f 1`" = "5"
-    then
-      # Solaris
-      if test -n "$GCC"
-      then
-        SHLIB_CC="$CC -fPIC"
-        SHLIB_LD="$CC -shared"
-      else
-        SHLIB_CC="$CC -KPIC"
-        SHLIB_LD="$CC -G -z text"
-      fi
-    else
-      # SunOS 4
-      SUNOS=yes
-      SHLIB_LD=ld
-      SHLIB_CC="$CC -PIC"
-      AC_DEFINE(DLOPEN_1)dnl
-    fi
-    AC_DEFINE(MODULES_OK)dnl
-  ;;
-  *BSD)
-    # FreeBSD/OpenBSD/NetBSD
-    SHLIB_CC="$CC -fPIC"
-    SHLIB_LD="ld -Bshareable -x"
-    AC_DEFINE(MODULES_OK)dnl
-  ;;
-  *)
-    AC_MSG_CHECKING(if system is Mach based)
-    if test -r /mach
-    then
-      AC_MSG_RESULT(yes)
-      NEED_DL=0
-      AC_DEFINE(BORGCUBES)dnl
-    else
-      AC_MSG_RESULT(no)
-      AC_MSG_CHECKING(if system is QNX)
-      if test -r /cmds
-      then
-        AC_MSG_RESULT(yes)
-        SHLIB_STRIP=touch
-        NEED_DL=0
-      else
-        AC_MSG_RESULT(no)
-        AC_MSG_RESULT(Something unknown!)
-        AC_MSG_RESULT([If you get dynamic modules to work, be sure to let the devel team know HOW :)])
-        NEED_DL=0
-      fi
-    fi
-  ;;
-esac
-AC_SUBST(MOD_LD)dnl
-AC_SUBST(MOD_CC)dnl
-AC_SUBST(MOD_STRIP)dnl
-AC_SUBST(SHLIB_LD)dnl
-AC_SUBST(SHLIB_CC)dnl
-AC_SUBST(SHLIB_STRIP)dnl
-])dnl
-
-
-dnl  EGG_CHECK_LIBS()
-dnl
-AC_DEFUN(EGG_CHECK_LIBS, [dnl
-# FIXME: this needs to be fixed so that it works on IRIX
-if test "$IRIX" = "yes"
-then
-  AC_MSG_WARN(Skipping library tests because they CONFUSE Irix.)
-else
-  AC_CHECK_LIB(socket, socket)
-  AC_CHECK_LIB(nsl, connect)
-  AC_CHECK_LIB(dns, gethostbyname)
-  AC_CHECK_LIB(dl, dlopen)
-  AC_CHECK_LIB(m, tan, EGG_MATH_LIB="-lm")
-  # This is needed for Tcl libraries compiled with thread support
-  AC_CHECK_LIB(pthread, pthread_mutex_init, [dnl
-  ac_cv_lib_pthread_pthread_mutex_init=yes
-  ac_cv_lib_pthread="-lpthread"], [dnl
-    AC_CHECK_LIB(pthread, __pthread_mutex_init, [dnl
-    ac_cv_lib_pthread_pthread_mutex_init=yes
-    ac_cv_lib_pthread="-lpthread"], [dnl
-      AC_CHECK_LIB(pthreads, pthread_mutex_init, [dnl
-      ac_cv_lib_pthread_pthread_mutex_init=yes
-      ac_cv_lib_pthread="-lpthreads"], [dnl
-        AC_CHECK_FUNC(pthread_mutex_init, [dnl
-        ac_cv_lib_pthread_pthread_mutex_init=yes
-        ac_cv_lib_pthread=""],
-        ac_cv_lib_pthread_pthread_mutex_init=no)])])])
-  if test "$SUNOS" = "yes"
-  then
-    # For suns without yp or something like that
-    AC_CHECK_LIB(dl, main)
-  else
-    if test "$HPUX" = "yes"
-    then
-      AC_CHECK_LIB(dld, shl_load)
-    fi
-  fi
-fi
-])dnl
-
-
-dnl  EGG_CHECK_FUNC_VSPRINTF()
-dnl
-AC_DEFUN(EGG_CHECK_FUNC_VSPRINTF, [dnl
-AC_CHECK_FUNCS(vsprintf)
-if test "$ac_cv_func_vsprintf" = "no"
-then
-  cat << 'EOF' >&2
-configure: error:
-
-  Your system does not have the sprintf/vsprintf libraries.
-  These are required to compile almost anything.  Sorry.
-
-EOF
-  exit 1
-fi
-])dnl
-
-
-dnl  EGG_HEADER_STDC()
-dnl
-AC_DEFUN(EGG_HEADER_STDC, [dnl
-if test "$ac_cv_header_stdc" = "no"
-then
-  cat << 'EOF' >&2
-configure: error:
-
-  Your system must support ANSI C Header files.
-  These are required for the language support.  Sorry.
-
-EOF
-  exit 1
-fi
-])dnl
-
-
-dnl  EGG_CHECK_LIBSAFE_SSCANF()
-dnl
-AC_DEFUN(EGG_CHECK_LIBSAFE_SSCANF, [dnl
-AC_CACHE_CHECK(for broken libsafe sscanf, egg_cv_var_libsafe_sscanf, [dnl
-  AC_TRY_RUN([
-#include <stdio.h>
-
-int main()
-{
-  char *src = "0x001,guppyism\n";
-  char dst[10];
-  int idx;
-  if (sscanf(src, "0x%x,%10c", &idx, dst) == 1)
-    exit(1);
-  return 0;
-}
-], egg_cv_var_libsafe_sscanf="no", egg_cv_var_libsafe_sscanf="yes",
-egg_cv_var_libsafe_sscanf="no")
-])
-if test "$egg_cv_var_libsafe_sscanf" = "yes"
-then
-  AC_DEFINE(LIBSAFE_HACKS)dnl
-fi
-])dnl
-
-
-dnl  EGG_EXEEXT()
-dnl
-dnl  Test for executable suffix and define Eggdrop's executable name
-dnl  accordingly.
-AC_DEFUN(EGG_EXEEXT, [dnl
-EGGEXEC=eggdrop
-AC_EXEEXT
-if test ! "${EXEEXT-x}" = "x"
-then
-  EGGEXEC="eggdrop$EXEEXT"
-fi
-AC_SUBST(EGGEXEC)dnl
-])dnl
-
-
-dnl  EGG_TCL_ARG_WITH()
-dnl
-AC_DEFUN(EGG_TCL_ARG_WITH, [dnl
-# oohh new configure --variables for those with multiple Tcl libs
-AC_ARG_WITH(tcllib, [  --with-tcllib=PATH      full path to Tcl library], tcllibname="$withval")
-AC_ARG_WITH(tclinc, [  --with-tclinc=PATH      full path to Tcl header], tclincname="$withval")
-
-WARN=0
-# Make sure either both or neither $tcllibname and $tclincname are set
-if test ! "${tcllibname-x}" = "x"
-then
-  if test "${tclincname-x}" = "x"
-  then
-    WARN=1
-    tcllibname=""
-    TCLLIB=""
-    TCLINC=""
-  fi
-else
-  if test ! "${tclincname-x}" = "x"
-  then
-    WARN=1
-    tclincname=""
-    TCLLIB=""
-    TCLINC=""
-  fi
-fi
-if test "$WARN" = 1
-then
-  cat << 'EOF' >&2
-configure: warning:
-
-  You must specify both --with-tcllib and --with-tclinc for them to work.
-  configure will now attempt to autodetect both the Tcl library and header...
-
-EOF
-fi
-])dnl
-
-
-dnl  EGG_TCL_ENV()
-dnl
-AC_DEFUN(EGG_TCL_ENV, [dnl
-WARN=0
-# Make sure either both or neither $TCLLIB and $TCLINC are set
-if test ! "${TCLLIB-x}" = "x"
-then
-  if test "${TCLINC-x}" = "x"
-  then
-    WARN=1
-    WVAR1=TCLLIB
-    WVAR2=TCLINC
-    TCLLIB=""
-  fi
-else
-  if test ! "${TCLINC-x}" = "x"
-  then
-    WARN=1
-    WVAR1=TCLINC
-    WVAR2=TCLLIB
-    TCLINC=""
-  fi
-fi
-if test "$WARN" = 1
-then
-  cat << EOF >&2
-configure: warning:
-
-  Environment variable $WVAR1 was set, but I did not detect ${WVAR2}.
-  Please set both TCLLIB and TCLINC correctly if you wish to use them.
-  configure will now attempt to autodetect both the Tcl library and header...
-
-EOF
-fi
-])dnl
-
-
-dnl  EGG_TCL_WITH_TCLLIB()
-dnl
-AC_DEFUN(EGG_TCL_WITH_TCLLIB, [dnl
-# Look for Tcl library: if $tcllibname is set, check there first
-if test ! "${tcllibname-x}" = "x"
-then
-  if test -f "$tcllibname" && test -r "$tcllibname"
-  then
-    TCLLIB=`echo $tcllibname | sed 's%/[[^/]][[^/]]*$%%'`
-    TCLLIBFN=`$BASENAME $tcllibname | cut -c4-`
-    TCLLIBEXT=".`echo $TCLLIBFN | $AWK '{j=split([$]1, i, "."); print i[[j]]}'`"
-    TCLLIBFNS=`$BASENAME $tcllibname $TCLLIBEXT | cut -c4-`
-  else
-    cat << EOF >&2
-configure: warning:
-
-  The file '$tcllibname' given to option --with-tcllib is not valid.
-  configure will now attempt to autodetect both the Tcl library and header...
-
-EOF
-    tcllibname=""
-    tclincname=""
-    TCLLIB=""
-    TCLLIBFN=""
-    TCLINC=""
-    TCLINCFN=""
-  fi
-fi
-])dnl
-
-
-dnl  EGG_TCL_WITH_TCLINC()
-dnl
-AC_DEFUN(EGG_TCL_WITH_TCLINC, [dnl
-# Look for Tcl header: if $tclincname is set, check there first
-if test ! "${tclincname-x}" = "x"
-then
-  if test -f "$tclincname" && test -r "$tclincname"
-  then
-    TCLINC=`echo $tclincname | sed 's%/[[^/]][[^/]]*$%%'`
-    TCLINCFN=`$BASENAME $tclincname`
-  else
-    cat << EOF >&2
-configure: warning:
-
-  The file '$tclincname' given to option --with-tclinc is not valid.
-  configure will now attempt to autodetect both the Tcl library and header...
-
-EOF
-    tcllibname=""
-    tclincname=""
-    TCLLIB=""
-    TCLLIBFN=""
-    TCLINC=""
-    TCLINCFN=""
-  fi
-fi
-])dnl
-
-
-dnl  EGG_TCL_FIND_LIBRARY()
-dnl
-AC_DEFUN(EGG_TCL_FIND_LIBRARY, [dnl
-# Look for Tcl library: if $TCLLIB is set, check there first
-if test "${TCLLIBFN-x}" = "x"
-then
-  if test ! "${TCLLIB-x}" = "x"
-  then
-    if test -d "$TCLLIB"
-    then
-      for tcllibfns in $tcllibnames
-      do
-        for tcllibext in $tcllibextensions
-        do
-          if test -r "$TCLLIB/lib$tcllibfns$tcllibext"
-          then
-            TCLLIBFN="$tcllibfns$tcllibext"
-            TCLLIBEXT="$tcllibext"
-            TCLLIBFNS="$tcllibfns"
-            break 2
-          fi
-        done
-      done
-    fi
-    if test "${TCLLIBFN-x}" = "x"
-    then
-      cat << 'EOF' >&2
-configure: warning:
-
-  Environment variable TCLLIB was set, but incorrect.
-  Please set both TCLLIB and TCLINC correctly if you wish to use them.
-  configure will now attempt to autodetect both the Tcl library and header...
-
-EOF
-      TCLLIB=""
-      TCLLIBFN=""
-      TCLINC=""
-      TCLINCFN=""
-    fi
-  fi
-fi
-])dnl
-
-
-dnl  EGG_TCL_FIND_HEADER()
-dnl
-AC_DEFUN(EGG_TCL_FIND_HEADER, [dnl
-# Look for Tcl header: if $TCLINC is set, check there first
-if test "${TCLINCFN-x}" = "x"
-then
-  if test ! "${TCLINC-x}" = "x"
-  then
-    if test -d "$TCLINC"
-    then
-      for tclheaderfn in $tclheadernames
-      do
-        if test -r "$TCLINC/$tclheaderfn"
-        then
-          TCLINCFN="$tclheaderfn"
-          break
-        fi
-      done
-    fi
-    if test "${TCLINCFN-x}" = "x"
-    then
-      cat << 'EOF' >&2
-configure: warning:
-
-  Environment variable TCLINC was set, but incorrect.
-  Please set both TCLLIB and TCLINC correctly if you wish to use them.
-  configure will now attempt to autodetect both the Tcl library and header...
-
-EOF
-      TCLLIB=""
-      TCLLIBFN=""
-      TCLINC=""
-      TCLINCFN=""
-    fi
-  fi
-fi
-])dnl
-
-
-dnl  EGG_TCL_CHECK_LIBRARY()
-dnl
-AC_DEFUN(EGG_TCL_CHECK_LIBRARY, [dnl
-AC_MSG_CHECKING(for Tcl library)
-
-# Attempt autodetect for $TCLLIBFN if it's not set
-if test ! "${TCLLIBFN-x}" = "x"
-then
-  AC_MSG_RESULT(using $TCLLIB/lib$TCLLIBFN)
-else
-  for tcllibfns in $tcllibnames
-  do
-    for tcllibext in $tcllibextensions
-    do
-      for tcllibpath in $tcllibpaths
-      do
-        if test -r "$tcllibpath/lib$tcllibfns$tcllibext"
-        then
-          AC_MSG_RESULT(found $tcllibpath/lib$tcllibfns$tcllibext)
-          TCLLIB="$tcllibpath"
-          TCLLIBFN="$tcllibfns$tcllibext"
-          TCLLIBEXT="$tcllibext"
-          TCLLIBFNS="$tcllibfns"
-          break 3
-        fi
-      done
-    done
-  done
-fi
-
-# Show if $TCLLIBFN wasn't found
-if test "${TCLLIBFN-x}" = "x"
-then
-  AC_MSG_RESULT(not found)
-fi
-AC_SUBST(TCLLIB)dnl
-AC_SUBST(TCLLIBFN)dnl
-])dnl
-
-
-dnl  EGG_TCL_CHECK_HEADER()
-dnl
-AC_DEFUN(EGG_TCL_CHECK_HEADER, [dnl
-AC_MSG_CHECKING(for Tcl header)
-
-# Attempt autodetect for $TCLINCFN if it's not set
-if test ! "${TCLINCFN-x}" = "x"
-then
-  AC_MSG_RESULT(using $TCLINC/$TCLINCFN)
-else
-  for tclheaderpath in $tclheaderpaths
-  do
-    for tclheaderfn in $tclheadernames
-    do
-      if test -r "$tclheaderpath/$tclheaderfn"
-      then
-        AC_MSG_RESULT(found $tclheaderpath/$tclheaderfn)
-        TCLINC="$tclheaderpath"
-        TCLINCFN="$tclheaderfn"
-        break 2
-      fi
-    done
-  done
-  # FreeBSD hack ...
-  if test "${TCLINCFN-x}" = "x"
-  then
-    for tcllibfns in $tcllibnames
-    do
-      for tclheaderpath in $tclheaderpaths
-      do
-        for tclheaderfn in $tclheadernames
-        do
-          if test -r "$tclheaderpath/$tcllibfns/$tclheaderfn"
-          then
-            AC_MSG_RESULT(found $tclheaderpath/$tcllibfns/$tclheaderfn)
-            TCLINC="$tclheaderpath/$tcllibfns"
-            TCLINCFN="$tclheaderfn"
-            break 3
-          fi
-        done
-      done
-    done
-  fi
-fi
-
-# Show if $TCLINCFN wasn't found
-if test "${TCLINCFN-x}" = "x"
-then
-  AC_MSG_RESULT(not found)
-fi
-AC_SUBST(TCLINC)dnl
-AC_SUBST(TCLINCFN)dnl
-])dnl
-
-
-dnl  EGG_CACHE_UNSET(CACHE-ID)
-dnl
-dnl  Unsets a certain cache item. Typically called before using
-dnl  the AC_CACHE_*() macros.
-AC_DEFUN(EGG_CACHE_UNSET, [dnl
-  unset $1
-])
-
-
-dnl  EGG_TCL_DETECT_CHANGE()
-dnl
-dnl  Detect whether the Tcl system has changed since our last
-dnl  configure run. Set egg_tcl_changed accordingly.
-dnl
-dnl  Tcl related feature and version checks should re-run their
-dnl  checks as soon as egg_tcl_changed is set to "yes".
-AC_DEFUN(EGG_TCL_DETECT_CHANGE, [dnl
-  AC_MSG_CHECKING(whether the Tcl system has changed)
-  egg_tcl_changed=yes
-  egg_tcl_id="$TCLLIB:$TCLLIBFN:$TCLINC:$TCLINCFN"
-  if test ! "$egg_tcl_id" = ":::"
-  then
-    egg_tcl_cached=yes
-    AC_CACHE_VAL(egg_cv_var_tcl_id, [dnl
-      egg_cv_var_tcl_id="$egg_tcl_id"
-      egg_tcl_cached=no
-    ])
-    if test "$egg_tcl_cached" = "yes"
-    then
-      if test "${egg_cv_var_tcl_id-x}" = "${egg_tcl_id-x}"
-      then
-        egg_tcl_changed=no
-      else
-        egg_cv_var_tcl_id="$egg_tcl_id"
-      fi
-    fi
-  fi
-  if test "$egg_tcl_changed" = "yes"
-  then
-    AC_MSG_RESULT(yes)
-  else
-    AC_MSG_RESULT(no)
-  fi
-])
-
-
-dnl  EGG_TCL_CHECK_VERSION()
-dnl
-AC_DEFUN(EGG_TCL_CHECK_VERSION, [dnl
-# Both TCLLIBFN & TCLINCFN must be set, or we bail
-TCL_FOUND=0
-if test ! "${TCLLIBFN-x}" = "x" && test ! "${TCLINCFN-x}" = "x"
-then
-  TCL_FOUND=1
-
-  # Check Tcl's version
-  if test "$egg_tcl_changed" = "yes"
-  then
-    EGG_CACHE_UNSET(egg_cv_var_tcl_version)
-  fi
-  AC_MSG_CHECKING(for Tcl version)
-  AC_CACHE_VAL(egg_cv_var_tcl_version, [dnl
-    egg_cv_var_tcl_version=`grep TCL_VERSION $TCLINC/$TCLINCFN | head -1 | $AWK '{gsub(/\"/, "", [$]3); print [$]3}'`
-  ])
-
-  if test ! "${egg_cv_var_tcl_version-x}" = "x"
-  then
-    AC_MSG_RESULT($egg_cv_var_tcl_version)
-  else
-    AC_MSG_RESULT(not found)
-    TCL_FOUND=0
-  fi
-
-  # Check Tcl's patch level (if available)
-  if test "$egg_tcl_changed" = "yes"
-  then
-    EGG_CACHE_UNSET(egg_cv_var_tcl_patch_level)
-  fi
-  AC_MSG_CHECKING(for Tcl patch level)
-  AC_CACHE_VAL(egg_cv_var_tcl_patch_level, [dnl
-    eval "egg_cv_var_tcl_patch_level=`grep TCL_PATCH_LEVEL $TCLINC/$TCLINCFN | head -1 | $AWK '{gsub(/\"/, "", [$]3); print [$]3}'`"
-  ])
-
-  if test ! "${egg_cv_var_tcl_patch_level-x}" = "x"
-  then
-    AC_MSG_RESULT($egg_cv_var_tcl_patch_level)
-  else
-    egg_cv_var_tcl_patch_level="unknown"
-    AC_MSG_RESULT(unknown)
-  fi
-fi
-
-# Check if we found Tcl's version
-if test "$TCL_FOUND" = 0
-then
-  cat << 'EOF' >&2
-configure: error:
-
-  I can't find Tcl on this system.
-  You must set the path for it in pack/conf.h
-
-EOF
-  exit 1
-fi
-])dnl
-
-
-dnl  EGG_TCL_CHECK_PRE70()
-dnl
-AC_DEFUN(EGG_TCL_CHECK_PRE70, [dnl
-# Is this version of Tcl too old for us to use ?
-TCL_VER_PRE70=`echo $egg_cv_var_tcl_version | $AWK '{split([$]1, i, "."); if (i[[1]] < 7) print "yes"; else print "no"}'`
-if test "$TCL_VER_PRE70" = "yes"
-then
-  cat << EOF >&2
-configure: error:
-
-  Your Tcl version is much too old for Eggdrop to use.
-  I suggest you download and compile a more recent version.
-  The most reliable current version is $tclrecommendver and
-  can be downloaded from $tclrecommendsite
-
-EOF
-  exit 1
-fi
-])dnl
-
-
-dnl  EGG_TCL_TESTLIBS()
-dnl
-AC_DEFUN(EGG_TCL_TESTLIBS, [dnl
-# Set variables for Tcl library tests
-TCL_TEST_LIB="$TCLLIBFNS"
-TCL_TEST_OTHERLIBS="-L$TCLLIB $EGG_MATH_LIB"
-
-if test ! "${ac_cv_lib_pthread-x}" = "x"
-then
-  TCL_TEST_OTHERLIBS="$TCL_TEST_OTHERLIBS $ac_cv_lib_pthread"
-fi
-])dnl
-
-
-dnl  EGG_TCL_CHECK_FREE()
-dnl
-AC_DEFUN(EGG_TCL_CHECK_FREE, [dnl
-if test "$egg_tcl_changed" = "yes"
-then
-  EGG_CACHE_UNSET(egg_cv_var_tcl_free)
-fi
-
-# Check for Tcl_Free()
-AC_CHECK_LIB($TCL_TEST_LIB, Tcl_Free, egg_cv_var_tcl_free="yes", egg_cv_var_tcl_free="no", $TCL_TEST_OTHERLIBS)
-
-if test "$egg_cv_var_tcl_free" = "yes"
-then
-  AC_DEFINE(HAVE_TCL_FREE)dnl
-fi
-])dnl
-
-
-dnl  EGG_TCL_ENABLE_THREADS()
-dnl
-AC_DEFUN(EGG_TCL_ENABLE_THREADS, [dnl
-AC_ARG_ENABLE(tcl-threads,
-[  --disable-tcl-threads   Disable threaded Tcl support if detected. (Ignore this
-                          option unless you know what you are doing)],
-enable_tcl_threads="$enableval",
-enable_tcl_threads=yes)
-])dnl
-
-
-dnl  EGG_TCL_CHECK_THREADS()
-dnl
-AC_DEFUN(EGG_TCL_CHECK_THREADS, [dnl
-if test "$egg_tcl_changed" = "yes"
-then
-  EGG_CACHE_UNSET(egg_cv_var_tcl_threaded)
-fi
-
-# Check for TclpFinalizeThreadData()
-AC_CHECK_LIB($TCL_TEST_LIB, TclpFinalizeThreadData, egg_cv_var_tcl_threaded="yes", egg_cv_var_tcl_threaded="no", $TCL_TEST_OTHERLIBS)
-
-if test "$egg_cv_var_tcl_threaded" = "yes"
-then
-  if test "$enable_tcl_threads" = "no"
-  then
-
-    cat << 'EOF' >&2
-configure: warning:
-
-  You have disabled threads support on a system with a threaded Tcl library.
-  Tcl features that rely on scheduled events may not function properly.
-
-EOF
-  else
-    AC_DEFINE(HAVE_TCL_THREADS)dnl
-  fi
-
-  # Add pthread library to $LIBS if we need it
-  if test ! "${ac_cv_lib_pthread-x}" = "x"
-  then
-    LIBS="$ac_cv_lib_pthread $LIBS"
-  fi
-fi
-])dnl
-
-
-dnl  EGG_TCL_LIB_REQS()
-dnl
-AC_DEFUN(EGG_TCL_LIB_REQS, [dnl
-if test "$EGG_CYGWIN" = "yes"
-then
-  TCL_REQS="$TCLLIB/lib$TCLLIBFN"
-  TCL_LIBS="-L$TCLLIB -l$TCLLIBFNS $EGG_MATH_LIB"
-else
-if test ! "$TCLLIBEXT" = ".a"
-then
-    cat << 'EOF' >&2
-configure: warning:
-
-  Your Tcl library is not compiled statically.
-  You will need to compile Tcl statically to successfully compile wraith.
-
-EOF
-  exit 1
-#  TCL_REQS="$TCLLIB/lib$TCLLIBFN"
-#  TCL_LIBS="-L$TCLLIB -l$TCLLIBFNS $EGG_MATH_LIB"
-else
-  # Are we using a pre 7.4 Tcl version ?
-  TCL_VER_PRE74=`echo $egg_cv_var_tcl_version | $AWK '{split([$]1, i, "."); if (((i[[1]] == 7) && (i[[2]] < 4)) || (i[[1]] < 7)) print "yes"; else print "no"}'`
-  if test "$TCL_VER_PRE74" = "no"
-  then
-
-    # Was the --with-tcllib option given ?
-    if test ! "${tcllibname-x}" = "x"
-    then
-      TCL_REQS="$TCLLIB/lib$TCLLIBFN"
-      TCL_LIBS="$TCLLIB/lib$TCLLIBFN $EGG_MATH_LIB"
-    else
-      TCL_REQS="$TCLLIB/lib$TCLLIBFN"
-      TCL_LIBS="-L$TCLLIB -l$TCLLIBFNS $EGG_MATH_LIB"
-    fi
-  else
-    cat << EOF >&2
-configure: warning:
-
-  Your Tcl version ($egg_cv_var_tcl_version) is older then 7.4.
-  There are known problems, but we will attempt to work around them.
-
-EOF
-    TCL_REQS="libtcle.a"
-    TCL_LIBS="-L`pwd` -ltcle $EGG_MATH_LIB"
-  fi
-fi
-fi
-AC_SUBST(TCL_REQS)dnl
-AC_SUBST(TCL_LIBS)dnl
-])dnl
-
-
-dnl  EGG_FUNC_DLOPEN()
-dnl
-AC_DEFUN(EGG_FUNC_DLOPEN, [dnl
-if test "$NEED_DL" = 1 && test "$ac_cv_func_dlopen" = "no"
-then
-  if test "$LINUX" = "yes"
-  then
-    cat << 'EOF' >&2
-configure: warning:
-
-  Since you are on a Linux system, this has a known problem...
-  I know a kludge for it,
-EOF
-
-    if test -r "/lib/libdl.so.1"
-    then
-      cat << 'EOF' >&2
-  and you seem to have it, so we'll do that...
-
-EOF
-      AC_DEFINE(HAVE_DLOPEN)dnl
-      LIBS="/lib/libdl.so.1 $LIBS"
-    else
-      cat << 'EOF' >&2
-  which you DON'T seem to have... doh!
-  perhaps you may still have the stuff lying around somewhere
-  if you work out where it is, add it to your XLIBS= lines
-  and #define HAVE_DLOPEN in config.h
-
-  we'll proceed on anyway, but you probably won't be able
-  to 'make eggdrop' but you might be able to make the
-  static bot (I'll default your make to this version).
-
-EOF
-    fi
-  else
-    cat << 'EOF' >&2
-configure: warning:
-
-  You don't seem to have libdl anywhere I can find it, this will
-  prevent you from doing dynamic modules, I'll set your default
-  make to static linking.
-
-EOF
-  fi
-fi
-])dnl
-
-
-dnl  EGG_SUBST_EGGVERSION()
-dnl
-AC_DEFUN(EGG_SUBST_EGGVERSION, [dnl
-EGGVERSION=`grep 'char.egg_version' $srcdir/src/main.c | $AWK '{gsub(/(\"|\;)/, "", [$]4); print [$]4}'`
-egg_version_num=`echo $EGGVERSION | $AWK 'BEGIN {FS = "."} {printf("%d%02d%02d", [$]1, [$]2, [$]3)}'`
-AC_SUBST(EGGVERSION)dnl
-AC_DEFINE_UNQUOTED(EGG_VERSION, $egg_version_num)dnl
-])dnl
-
-
-dnl  EGG_SUBST_DEST()
-dnl
-AC_DEFUN(EGG_SUBST_DEST, [dnl
-if test "${DEST-x}" = "x"
-then
-  DEST=\${prefix}
-fi
-AC_SUBST(DEST)dnl
-])dnl
-
-
-dnl  EGG_SUBST_MOD_UPDIR()
-dnl
-dnl  Since module's Makefiles aren't generated by configure, some
-dnl  paths in src/mod/Makefile.in take care of them. For correct
-dnl  path "calculation", we need to keep absolute paths in mind
-dnl  (which don't need a "../" pre-pended).
-AC_DEFUN(EGG_SUBST_MOD_UPDIR, [dnl
-case "$srcdir" in
-  [[\\/]]* | ?:[[\\/]]*)
-    MOD_UPDIR=""
-  ;;
-  *)
-    MOD_UPDIR="../"
-  ;;
-esac
-AC_SUBST(MOD_UPDIR)dnl
-])dnl
-
-
-dnl  EGG_REPLACE_IF_CHANGED(FILE-NAME, CONTENTS-CMDS, INIT-CMDS)
-dnl
-dnl  Replace FILE-NAME if the newly created contents differs from the existing
-dnl  file contents.  Otherwise, leave the file alone.  This avoids needless
-dnl  recompiles.
-dnl
-define(EGG_REPLACE_IF_CHANGED, [dnl
-  AC_OUTPUT_COMMANDS([
-egg_replace_file="$1"
-echo "creating $1"
-$2
-if test -f "$egg_replace_file" && cmp -s conftest.out $egg_replace_file
-then
-  echo "$1 is unchanged"
-else
-  mv conftest.out $egg_replace_file
-fi
-rm -f conftest.out], [$3])dnl
-])dnl
-
-
-dnl  EGG_TCL_LUSH()
-dnl
-AC_DEFUN(EGG_TCL_LUSH, [dnl
-    EGG_REPLACE_IF_CHANGED(lush.h, [
-cat > conftest.out << EGGEOF
-/* Ignore me but do not erase me.  I am a kludge. */
-
-#include "$egg_tclinc/$egg_tclincfn"
-EGGEOF], [
-    egg_tclinc="$TCLINC"
-    egg_tclincfn="$TCLINCFN"])dnl
-])dnl
-
-
-dnl  EGG_CATCH_MAKEFILE_REBUILD()
-dnl
-AC_DEFUN(EGG_CATCH_MAKEFILE_REBUILD, [dnl
-  AC_OUTPUT_COMMANDS([
-if test -f .modules
-then
-  $srcdir/misc/modconfig --top_srcdir="$srcdir/src" Makefile
-fi])
-])dnl
-
-
-dnl  EGG_SAVE_PARAMETERS()
-dnl
-AC_DEFUN(EGG_SAVE_PARAMETERS, [dnl
-  # Remove --cache-file and --srcdir arguments so they do not pile up.
-  egg_ac_parameters=
-  ac_prev=
-  for ac_arg in $ac_configure_args; do
-    if test -n "$ac_prev"; then
-      ac_prev=
-      continue
-    fi
-    case $ac_arg in
-    -cache-file | --cache-file | --cache-fil | --cache-fi \
-    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-      ac_prev=cache_file ;;
-    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
-    | --c=*)
-      ;;
-    --config-cache | -C)
-      ;;
-    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-      ac_prev=srcdir ;;
-    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-      ;;
-    *) egg_ac_parameters="$egg_ac_parameters $ac_arg" ;;
-    esac
-  done
-
-  AC_SUBST(egg_ac_parameters)dnl
-])dnl
-
-
-AC_DEFUN([AC_PROG_CC_WIN32], [
-AC_MSG_CHECKING([how to access the Win32 API])
-WIN32FLAGS=
-AC_TRY_COMPILE(,[
-#ifndef WIN32
-# ifndef _WIN32
-#  error WIN32 or _WIN32 not defined
-# endif
-#endif], [
-dnl found windows.h with the current config.
-AC_MSG_RESULT([present by default])
-], [
-dnl try -mwin32
-ac_compile_save="$ac_compile"
-dnl we change CC so config.log looks correct
-save_CC="$CC"
-ac_compile="$ac_compile -mwin32"
-CC="$CC -mwin32"
-AC_TRY_COMPILE(,[
-#ifndef WIN32
-# ifndef _WIN32
-#  error WIN32 or _WIN32 not defined
-# endif
-#endif], [
-dnl found windows.h using -mwin32
-AC_MSG_RESULT([found via -mwin32])
-ac_compile="$ac_compile_save"
-CC="$save_CC"
-WIN32FLAGS="-mwin32"
-], [
-ac_compile="$ac_compile_save"
-CC="$save_CC"
-AC_MSG_RESULT([not found])
-])
-])
-
-])
-dnl

config.h.in

@@ -0,0 +1,248 @@
+/* config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
+#ifndef _EGG_CONFIG_H
+#define _EGG_CONFIG_H
+
+/* Define if on AIX 3.
+   System headers sometimes define this.
+   We just want to avoid a redefinition error message.  */
+#ifndef _ALL_SOURCE
+#undef _ALL_SOURCE
+#endif
+
+/* Define to empty if the keyword does not work.  */
+#undef const
+
+/* Define if you have a working `mmap' system call.  */
+#undef HAVE_MMAP
+
+/* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
+#undef HAVE_SYS_WAIT_H
+
+/* Define as __inline if that's what the C compiler calls it.  */
+#undef inline
+
+/* Define if on MINIX.  */
+#undef _MINIX
+
+/* Define to `int' if <sys/types.h> doesn't define.  */
+#undef pid_t
+
+/* Define if the system does not provide POSIX.1 features except
+   with this defined.  */
+#undef _POSIX_1_SOURCE
+
+/* Define if you need to in order for stat and other things to work.  */
+#undef _POSIX_SOURCE
+
+/* Define to `unsigned' if <sys/types.h> doesn't define.  */
+#undef size_t
+
+/* Define if you have the ANSI C header files.  */
+#undef STDC_HEADERS
+
+/* Define if you can safely include both <sys/time.h> and <time.h>.  */
+#undef TIME_WITH_SYS_TIME
+
+/* Define if your processor stores words with the most significant
+   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
+#undef WORDS_BIGENDIAN
+
+/* Define if you want to enable IPv6 support. */
+#undef HAVE_IPV6
+
+/* Define if you have support for socklen_t. */
+#undef HAVE_SOCKLEN_T
+
+/* Define if modules will work on your system  */
+#undef MODULES_OK
+
+/* Define if running on hpux that supports dynamic linking  */
+#undef HPUX_HACKS
+
+/* Define if running on hpux 10.x  */
+#undef HPUX10_HACKS
+
+/* Define if running on OSF/1 platform.  */
+#undef OSF1_HACKS
+
+/* Define to use Eggdrop's snprintf functions without regard to HAVE_SNPRINTF. */
+#undef BROKEN_SNPRINTF
+
+/* Define if running on OSF/1 platform.  */
+#undef STOP_UAC
+
+/* Define if running on sunos 4.0 *sigh*  */
+#undef DLOPEN_1
+
+/* Define if running on NeXT Step  */
+#undef BORGCUBES
+
+/* Define if running under cygwin  */
+#undef CYGWIN_HACKS
+
+/* Define if you have a version of libsafe with a broken sscanf */
+#undef LIBSAFE_HACKS
+
+/* Define if we need dlopen (for module support)  */
+#undef HAVE_DLOPEN
+
+/* Define for Tcl that has Tcl_Free() (7.5p1 and later)  */
+#undef HAVE_TCL_FREE
+
+/* Define for Tcl that has threads  */
+#undef HAVE_TCL_THREADS
+
+/* Defines the current eggdrop version  */
+#undef EGG_VERSION
+
+/* The number of bytes in a int.  */
+#undef SIZEOF_INT
+
+/* The number of bytes in a long.  */
+#undef SIZEOF_LONG
+
+/* Define if you have the clock function.  */
+#undef HAVE_CLOCK
+
+/* Define if you have the dlopen function.  */
+#undef HAVE_DLOPEN
+
+/* Define if you have the dprintf function.  */
+#undef HAVE_DPRINTF
+
+/* Define if you have the fsync function.  */
+#undef HAVE_FSYNC
+
+/* Define if you have the getdtablesize function.  */
+#undef HAVE_GETDTABLESIZE
+
+/* Define if you have the gethostbyname2 function.  */
+#undef HAVE_GETHOSTBYNAME2
+
+/* Define if you have the getipnodebyname function.  */
+#undef HAVE_GETIPNODEBYNAME
+
+/* Define if you have the getpagesize function.  */
+#undef HAVE_GETPAGESIZE
+
+/* Define if you have the getrusage function.  */
+#undef HAVE_GETRUSAGE
+
+/* Define if you have the inet_aton function.  */
+#undef HAVE_INET_ATON
+
+/* Define if you have the inet_ntop function.  */
+#undef HAVE_INET_NTOP
+
+/* Define if you have the isascii function.  */
+#undef HAVE_ISASCII
+
+/* Define if you have the memcpy function.  */
+#undef HAVE_MEMCPY
+
+/* Define if you have the memset function.  */
+#undef HAVE_MEMSET
+
+/* Define if you have the random function.  */
+#undef HAVE_RANDOM
+
+/* Define if you have the rename function.  */
+#undef HAVE_RENAME
+
+/* Define if you have the setpgid function.  */
+#undef HAVE_SETPGID
+
+/* Define if you have the sigaction function.  */
+#undef HAVE_SIGACTION
+
+/* Define if you have the sigemptyset function.  */
+#undef HAVE_SIGEMPTYSET
+
+/* Define if you have the snprintf function.  */
+#undef HAVE_SNPRINTF
+
+/* Define if you have the srandom function.  */
+#undef HAVE_SRANDOM
+
+/* Define if you have the strcasecmp function.  */
+#undef HAVE_STRCASECMP
+
+/* Define if you have the strftime function.  */
+#undef HAVE_STRFTIME
+
+/* Define if you have the strncasecmp function.  */
+#undef HAVE_STRNCASECMP
+
+/* Define if you have the uname function.  */
+#undef HAVE_UNAME
+
+/* Define if you have the vsnprintf function.  */
+#undef HAVE_VSNPRINTF
+
+/* Define if you have the vsprintf function.  */
+#undef HAVE_VSPRINTF
+
+/* Define if you have the <dirent.h> header file.  */
+#undef HAVE_DIRENT_H
+
+/* Define if you have the <dlfcn.h> header file.  */
+#undef HAVE_DLFCN_H
+
+/* Define if you have the <limits.h> header file.  */
+#undef HAVE_LIMITS_H
+
+/* Define if you have the <ndir.h> header file.  */
+#undef HAVE_NDIR_H
+
+/* Define if you have the <openssl/crypto.h> header file.  */
+#undef HAVE_OPENSSL_CRYPTO_H
+
+/* Define if you have the <openssl/ssl.h> header file.  */
+#undef HAVE_OPENSSL_SSL_H
+
+/* Define if you have the <std_args.h> header file.  */
+#undef HAVE_STD_ARGS_H
+
+/* Define if you have the <stdarg.h> header file.  */
+#undef HAVE_STDARG_H
+
+/* Define if you have the <strings.h> header file.  */
+#undef HAVE_STRINGS_H
+
+/* Define if you have the <sys/dir.h> header file.  */
+#undef HAVE_SYS_DIR_H
+
+/* Define if you have the <sys/ndir.h> header file.  */
+#undef HAVE_SYS_NDIR_H
+
+/* Define if you have the <sys/rusage.h> header file.  */
+#undef HAVE_SYS_RUSAGE_H
+
+/* Define if you have the <sys/select.h> header file.  */
+#undef HAVE_SYS_SELECT_H
+
+/* Define if you have the <sys/time.h> header file.  */
+#undef HAVE_SYS_TIME_H
+
+/* Define if you have the <unistd.h> header file.  */
+#undef HAVE_UNISTD_H
+
+/* Define if you have the <zlib.h> header file.  */
+#undef HAVE_ZLIB_H
+
+/* Define if you have the dl library (-ldl).  */
+#undef HAVE_LIBDL
+
+/* Define if you have the dld library (-ldld).  */
+#undef HAVE_LIBDLD
+
+/* Define if you have the dns library (-ldns).  */
+#undef HAVE_LIBDNS
+
+/* Define if you have the nsl library (-lnsl).  */
+#undef HAVE_LIBNSL
+
+/* Define if you have the socket library (-lsocket).  */
+#undef HAVE_LIBSOCKET
+
+#endif /* !_EGG_CONFIG_H */

configure.in

@@ -1,133 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(src/eggdrop.h)
-AC_CONFIG_AUX_DIR(misc)
-AC_CONFIG_HEADER(config.h)
-
-EGG_SAVE_PARAMETERS
-
-# Setup build environment
-AC_PROG_CC
-EGG_CHECK_CC
-
-# Crazy machines
-AC_AIX
-AC_ISC_POSIX
-AC_MINIX
-
-# Speedup compile
-EGG_CHECK_CCPIPE
-
-# Checks for programs
-AC_PROG_MAKE_SET
-AC_PROG_RANLIB
-AC_PROG_INSTALL
-AC_PROG_LN_S
-EGG_PROG_STRIP
-EGG_PROG_AWK
-EGG_PROG_BASENAME
-AC_CHECK_PROG(UNAME,uname,uname)
-
-# Test the os and set the module linking settings
-EGG_CHECK_OS
-
-# Checks for system libraries
-EGG_CHECK_LIBS
-
-# Checks for header files
-AC_HEADER_DIRENT
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(sys/time.h)
-AC_HEADER_TIME
-AC_CHECK_HEADERS(sys/select.h sys/rusage.h unistd.h dlfcn.h stdarg.h std_args.h strings.h limits.h)
-
-# Checks for typedefs, structures, and compiler characteristics
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_C_CONST
-AC_C_BIGENDIAN
-AC_C_INLINE
-AC_CHECK_SIZEOF(long, 0)
-AC_CHECK_SIZEOF(int, 0)
-
-
-# Check for IPv6 support
-#EGG_IPV6_SUPPORTED
-EGG_IPV6_OPTIONS
-EGG_CHECK_SOCKLEN_T
-
-# Checks for library functions
-AC_CHECK_FUNCS(clock getrusage setpgid uname sigaction sigemptyset rename strcasecmp strncasecmp getdtablesize memset random srandom)
-AC_CHECK_FUNCS(dlopen dprintf snprintf vsnprintf isascii inet_aton inet_ntop memcpy strftime fsync gethostbyname2 getipnodebyname)
-EGG_CHECK_FUNC_VSPRINTF
-
-# Make sure we have stdc headers, since we can't compile without them
-EGG_HEADER_STDC
-
-# Make sure we are using the correct result from a broken libsafe sscanf
-EGG_CHECK_LIBSAFE_SSCANF
-
-# Checks for executable extension
-EGG_EXEEXT
-
-# Where is Tcl?  Is it here?
-# ---------- begin robey's Tcl thingies
-# (well, what used to be robey's Tcl thingies...)
-
-# Latest tested Tcl version to recommend if Tcl isn't found
-tclrecommendver="8.3.4"
-
-# Site recommended to download Tcl from
-tclrecommendsite="ftp://tcl.activestate.com/pub/tcl/tcl8_3/"
-
-# Tcl library filename prefixes (also used for Tcl header dir on FreeBSD)
-tcllibnames="tcl tcl8.4 tcl84 tcl8.3 tcl83 tcl8.2 tcl82 tcl8.1 tcl81 \
-	tcl8.0 tcl80 tcl7.6 tcl76 tcl7.5 tcl75 tcl7.4 tcl74 \
-	tcl7.3 tcl73 tcl7.2 tcl72 tcl7.1 tcl71 tcl7.0 tcl70"
-
-# Tcl library filename suffixes
-tcllibextensions=".so .so.1 .so.1.0 .so.1.2 .a .sl .dll .dylib"
-
-# Tcl library search paths
-tcllibpaths="$HOME/lib $HOME/tcl/lib $HOME \
-        /usr/local/lib /usr/local/pkgs/tcl/lib \
-	/usr/lib /lib /usr/i486-linuxaout/lib \
-	/beos/system/lib /sys/lib"
-
-# Tcl header filenames
-tclheadernames="tcl.h"
-
-# Tcl header search paths
-tclheaderpaths="$HOME/include $HOME/tcl/include $HOME \
-        /usr/local/include /usr/local/pkgs/tcl/include \
-	/usr/include /beos/system/include /beos/devel/include \
-       /sys/include"
-
-EGG_TCL_ARG_WITH
-EGG_TCL_ENV
-EGG_TCL_WITH_TCLLIB
-EGG_TCL_WITH_TCLINC
-EGG_TCL_FIND_LIBRARY
-EGG_TCL_FIND_HEADER
-EGG_TCL_CHECK_LIBRARY
-EGG_TCL_CHECK_HEADER
-EGG_TCL_DETECT_CHANGE
-
-EGG_TCL_CHECK_VERSION
-EGG_TCL_CHECK_PRE70
-EGG_TCL_TESTLIBS
-EGG_TCL_CHECK_FREE
-EGG_TCL_ENABLE_THREADS
-EGG_TCL_CHECK_THREADS
-EGG_TCL_LIB_REQS
-EGG_TCL_LUSH
-# ---------- end of (what used to be) robey's Tcl thingies
-
-EGG_FUNC_DLOPEN
-
-EGG_SUBST_EGGVERSION
-EGG_SUBST_DEST
-EGG_SUBST_MOD_UPDIR
-EGG_CATCH_MAKEFILE_REBUILD
-
-AC_OUTPUT(Makefile src/Makefile src/md5/Makefile src/compat/Makefile src/mod/Makefile)
-

src/Makefile.in

@@ -6,10 +6,6 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 @SET_MAKE@
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 CC = @CC@
 LD = @CC@
@@ -37,12 +33,17 @@ doofus:
 	@$(CC) $(CFLAGS) -I$(top_srcdir) $(CPPFLAGS) stringfix.c -o ../stringfix
 	@$(STRIP) ../stringfix
 
-../$(EGGEXEC): build_msg $(eggdrop_objs) $(XREQS) compile_md5 compatability
+../makesalt:
+	@echo -e "Compiling: \033[1mmakesalt\033[0m"
+	@$(CC) $(CFLAGS) -I$(top_srcdir) $(CPPFLAGS) makesalt.c -o ../makesalt
+	@$(STRIP) ../makesalt
+
+../$(EGGEXEC): build_msg $(eggdrop_objs) $(XREQS) compatability
 	@echo ""
 	@echo "Linking wraith... $(EGGBUILD)"
 	@echo ""
 	@touch mod/mod.xlibs
-	@$(LD) -static -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs`
+	@$(LD) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) compat/*.o `cat mod/mod.xlibs`
 	@$(STRIP) ../$(EGGEXEC)
 	@echo "Successful compile: $(EGGEXEC)"
 	@echo ""
@@ -77,16 +78,6 @@ compatability:
 	@cd compat && $(MAKE_GENERIC) compat
 	@echo "---------- Yeah! that's the compiling, now the linking! ----------"
 
-compile_md5:
-	@cd md5 && $(MAKE_GENERIC) md5
-
-libtcle.a: $(TCLLIB)/lib$(TCLLIBFN)
-	@echo "[ Fixing lib$(TCLLIBFN) -> libtcle.a ]"
-	@cp $(TCLLIB)/lib$(TCLLIBFN) libtcle.a
-	@chmod u+rw libtcle.a
-	@ar d libtcle.a tclMain.o
-	@$(RANLIB) libtcle.a
-
 eggdrop.h:
 	@echo "You do not have the eggdrop source!"
 	@exit 1
@@ -137,7 +128,7 @@ dcc.o: dcc.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h proto.h
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
  compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
- modules.h mod/modvals.h tandem.h md5/md5.h
+ modules.h mod/modvals.h tandem.h 
 dccutil.o: dccutil.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
@@ -156,7 +147,7 @@ main.o: main.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h proto.
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
  compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
- modules.h mod/modvals.h tandem.h bg.h md5/md5.h
+ modules.h mod/modvals.h tandem.h bg.h 
 match.o: match.c ./main.h
 mem.o: mem.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
@@ -206,7 +197,7 @@ tclmisc.o: tclmisc.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
- compat/strftime.h modules.h mod/modvals.h tandem.h md5/md5.h
+ compat/strftime.h modules.h mod/modvals.h tandem.h 
 tcluser.o: tcluser.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h compat/inet_ntop.h ../src/main.h \

src/compat/Makefile.in

@@ -6,10 +6,6 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 @SET_MAKE@
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 CC = @CC@
 LD = @CC@

src/dcc.c

@@ -19,7 +19,6 @@
 #endif
 
 #include "tandem.h"
-#include "md5/md5.h"
 #include <sys/stat.h>
 
 extern char netpass[9];
@@ -377,6 +376,7 @@ static void cont_link(int idx, char *buf, int ii)
     MD5_Update(&ctx, tmp, strlen(tmp));
     MD5_Final(socklist[snum].ikey, &ctx);
     socklist[snum].encstatus = 1;
+    socklist[snum].gz = 1;
   } else {
     lostdcc(idx);
     killsock(dcc[idx].sock);
@@ -1633,6 +1633,7 @@ static void dcc_telnet_pass(int idx, int atr)
       tmp2 = encrypt_string(netpass, initkey);
       putlog(LOG_BOTS, "*", "Sending encrypted link handshake to %s...", dcc[idx].nick);
       socklist[snum].encstatus = 1;
+      socklist[snum].gz = 1;
       dprintf(idx, "elink %s %lu\n", tmp2, socklist[snum].oseed);
       strcpy(socklist[snum].okey, initkey);
       strcpy(socklist[snum].ikey, initkey);

src/eggdrop.h

@@ -128,6 +128,10 @@
 #  include "error_you_need_vsprintf_to_compile_eggdrop"
 #endif
 
+#ifdef HAVE_OPENSSL_SSL_H
+#  define HAVE_SSL
+#endif /* HAVE_OPENSSL_SSL_H */
+
 /* IPv6 sanity checks. */
 #ifdef USE_IPV6
 #  ifndef HAVE_IPV6

src/main.c

@@ -137,7 +137,6 @@ extern struct cfg_entry CFG_FORKINTERVAL;
 
 unsigned char md5out[33];
 char md5string[33];
-#include "md5/md5.h"
 
 /* Traffic stats
  */

src/main.h

@@ -73,6 +73,18 @@
 #include "lang.h"
 #include "eggdrop.h"
 #include "flags.h"
+#ifdef HAVE_ZLIB_H
+#  include <zlib.h>
+#endif /* HAVE_ZLIB_H */
+#ifdef HAVE_OPENSSL_SSL_H
+# ifndef SSL_INC
+//#  include <openssl/rand.h>
+#  include <openssl/ssl.h>
+#  include <openssl/err.h>
+#  include <openssl/md5.h>
+#  define SSL_INC
+# endif /* ! SSL_INC */
+#endif /* HAVE_OPENSSL_SSL_H */
 
 #ifndef MAKING_MODS
 #  include "proto.h"
@@ -132,6 +144,4 @@ extern struct dcc_table DCC_CHAT, DCC_BOT, DCC_LOST, DCC_SCRIPT, DCC_BOT_NEW,
 #endif
 
 
-#include "md5/md5.h"
-
 #endif				/* _EGG_MAIN_H */

src/mod/Makefile.in

@@ -7,10 +7,6 @@ VPATH = @srcdir@
 MOD_UPDIR = @MOD_UPDIR@
 
 @SET_MAKE@
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 CC = @CC@
 LD = @CC@

src/mod/compress.mod/Makefile.in → src/mod/compress.mod/Makefile

@@ -1,6 +1,5 @@
-# Makefile.in for src/mod/compress.mod/
+# Makefile for src/mod/compress.mod/
 
-ZLIB = @ZLIB@
 srcdir = .
 
 
@@ -11,7 +10,6 @@ doofus:
 	@cd ../../../ && make
 
 static: ../compress.o
-	@echo "$(ZLIB)" >> ../mod.xlibs
 
 ../compress.o:
 	@echo -e "Compiling: \033[1mcompress\033[0m"
@@ -24,9 +22,7 @@ depend:
 
 clean:
 	@rm -f .depend *.o *~
-
 distclean: clean
-	@rm -f Makefile config.cache config.log config.status config.h compress_config.h
 
 #safety hash
 ../compress.o: .././compress.mod/compress.c ../../../src/mod/module.h \
@@ -40,5 +36,5 @@ distclean: clean
  ../../../src/compat/memset.h ../../../src/compat/memcpy.h \
  ../../../src/compat/strcasecmp.h ../../../src/compat/strftime.h \
  ../../../src/mod/modvals.h ../../../src/tandem.h \
- ../../../src/mod/share.mod/share.h ../compress.mod/compress_config.h \
+ ../../../src/mod/share.mod/share.h \
  ../compress.mod/compress.h ../compress.mod/tclcompress.c

src/mod/compress.mod/compress.c

@@ -35,7 +35,6 @@
 #include "src/mod/module.h"
 #include "share.mod/share.h"
 
-#include "compress_config.h"
 #ifdef HAVE_MMAP
 #  include <sys/types.h>
 #  include <sys/mman.h>

src/mod/compress.mod/compress_config.h.in

@@ -1,7 +0,0 @@
-/* compress_config.h.in.  Generated automatically from configure.in by autoheader.  */
-
-/* Define if you have a working `mmap' system call.  */
-#undef HAVE_MMAP
-
-/* Define if you have the getpagesize function.  */
-#undef HAVE_GETPAGESIZE

src/mod/compress.mod/configure

@@ -1,1049 +0,0 @@
-#! /bin/sh
-# configure  --  Special configure variant for eggdrop modules based on the
-#                GNU autoconf scripts.
-#
-# Automatically created by src/mod/eggautoconf from `configure.in'
-#
-
-echo "running in eggdrop mode."
-# This tells the code in eggmod.sh to search for the file `compress.c'.
-# That way we can make sure we're started from the correct directory.
-ac_egg_uniquefile=compress.c
-
-# Scan for out source directory
-ac_egg_srcdir=.
-for i in $*; do
-  case "${i}" in
-    --srcdir=*)
-      ac_egg_srcdir=`echo ${i} | sed -e 's/^--srcdir=//'`
-    ;;
-  esac
-done
-if test -r ${ac_egg_srcdir}/../eggmod.sh; then
-	. ${ac_egg_srcdir}/../eggmod.sh
-else
-	echo "$0: error: failed to locate eggmod.sh in ${ac_egg_srcdir}/.." >&2
-	exit 1
-fi
-
-# Standard autoconf commands/tests follow below.
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:559: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:589: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:640: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:672: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext << EOF
-
-#line 683 "configure"
-#include "confdefs.h"
-
-main(){return(0);}
-EOF
-if { (eval echo configure:688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
-  else
-    ac_cv_prog_cc_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
-fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:714: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:719: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:728: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:747: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS="$ac_save_CFLAGS"
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-
-
-echo $ac_n "checking for gzopen in -lz""... $ac_c" 1>&6
-echo "configure:780: checking for gzopen in -lz" >&5
-ac_lib_var=`echo z'_'gzopen | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lz  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 788 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char gzopen();
-
-int main() {
-gzopen()
-; return 0; }
-EOF
-if { (eval echo configure:799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  ZLIB="-lz"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:820: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
-  CPP="${CC-cc} -E"
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 835 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:841: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 852 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-#line 869 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
-fi
-  CPP="$ac_cv_prog_CPP"
-else
-  ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
-ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for zlib.h""... $ac_c" 1>&6
-echo "configure:901: checking for zlib.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 906 "configure"
-#include "confdefs.h"
-#include <zlib.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-# Disable the module if either the header file or the library
-# are missing.
-if test "x${ZLIB}" = x; then
-  cat >&2 <<EOF
-configure: warning:
-
-  Your system does not provide a working zlib compression library. The
-  compress module will therefore be disabled.
-
-EOF
-  ${srcdir}/../../../misc/modconfig -q --top_srcdir=${srcdir}/../../.. --bindir=../../.. del compress
-else
-  if test "${ac_cv_header_zlib_h}" != yes; then
-    cat >&2 <<EOF
-configure: warning:
-
-  Your system does not provide the necessary zlib header files. The
-  compress module will therefore be disabled.
-
-EOF
-    ${srcdir}/../../../misc/modconfig -q --top_srcdir=${srcdir}/../../.. --bindir=../../.. del compress
-  fi
-fi
-for ac_hdr in unistd.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:960: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 965 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:970: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_func in getpagesize
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:999: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1004 "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.  */
-/* 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();
-
-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
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:1027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:1052: checking for working mmap" >&5
-if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_func_mmap_fixed_mapped=no
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1060 "configure"
-#include "confdefs.h"
-
-/* Thanks to Mike Haertel and Jim Avera for this test.
-   Here is a matrix of mmap possibilities:
-	mmap private not fixed
-	mmap private fixed at somewhere currently unmapped
-	mmap private fixed at somewhere already mapped
-	mmap shared not fixed
-	mmap shared fixed at somewhere currently unmapped
-	mmap shared fixed at somewhere already mapped
-   For private mappings, we should verify that changes cannot be read()
-   back from the file, nor mmap's back from the file at a different
-   address.  (There have been systems where private was not correctly
-   implemented like the infamous i386 svr4.0, and systems where the
-   VM page cache was not coherent with the filesystem buffer cache
-   like early versions of FreeBSD and possibly contemporary NetBSD.)
-   For shared mappings, we should conversely verify that changes get
-   propogated back to all the places they're supposed to be.
-
-   Grep wants private fixed already mapped.
-   The main things grep needs to know about mmap are:
-   * does it exist and is it safe to write into the mmap'd area
-   * how to use it (BSD variants)  */
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/mman.h>
-
-/* This mess was copied from the GNU getpagesize.h.  */
-#ifndef HAVE_GETPAGESIZE
-# ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-# endif
-
-/* Assume that all systems that can run configure have sys/param.h.  */
-# ifndef HAVE_SYS_PARAM_H
-#  define HAVE_SYS_PARAM_H 1
-# endif
-
-# ifdef _SC_PAGESIZE
-#  define getpagesize() sysconf(_SC_PAGESIZE)
-# else /* no _SC_PAGESIZE */
-#  ifdef HAVE_SYS_PARAM_H
-#   include <sys/param.h>
-#   ifdef EXEC_PAGESIZE
-#    define getpagesize() EXEC_PAGESIZE
-#   else /* no EXEC_PAGESIZE */
-#    ifdef NBPG
-#     define getpagesize() NBPG * CLSIZE
-#     ifndef CLSIZE
-#      define CLSIZE 1
-#     endif /* no CLSIZE */
-#    else /* no NBPG */
-#     ifdef NBPC
-#      define getpagesize() NBPC
-#     else /* no NBPC */
-#      ifdef PAGESIZE
-#       define getpagesize() PAGESIZE
-#      endif /* PAGESIZE */
-#     endif /* no NBPC */
-#    endif /* no NBPG */
-#   endif /* no EXEC_PAGESIZE */
-#  else /* no HAVE_SYS_PARAM_H */
-#   define getpagesize() 8192	/* punt totally */
-#  endif /* no HAVE_SYS_PARAM_H */
-# endif /* no _SC_PAGESIZE */
-
-#endif /* no HAVE_GETPAGESIZE */
-
-#ifdef __cplusplus
-extern "C" { void *malloc(unsigned); }
-#else
-char *malloc();
-#endif
-
-int
-main()
-{
-	char *data, *data2, *data3;
-	int i, pagesize;
-	int fd;
-
-	pagesize = getpagesize();
-
-	/*
-	 * First, make a file with some known garbage in it.
-	 */
-	data = malloc(pagesize);
-	if (!data)
-		exit(1);
-	for (i = 0; i < pagesize; ++i)
-		*(data + i) = rand();
-	umask(0);
-	fd = creat("conftestmmap", 0600);
-	if (fd < 0)
-		exit(1);
-	if (write(fd, data, pagesize) != pagesize)
-		exit(1);
-	close(fd);
-
-	/*
-	 * Next, try to mmap the file at a fixed address which
-	 * already has something else allocated at it.  If we can,
-	 * also make sure that we see the same garbage.
-	 */
-	fd = open("conftestmmap", O_RDWR);
-	if (fd < 0)
-		exit(1);
-	data2 = malloc(2 * pagesize);
-	if (!data2)
-		exit(1);
-	data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1);
-	if (data2 != mmap(data2, pagesize, PROT_READ | PROT_WRITE,
-	    MAP_PRIVATE | MAP_FIXED, fd, 0L))
-		exit(1);
-	for (i = 0; i < pagesize; ++i)
-		if (*(data + i) != *(data2 + i))
-			exit(1);
-
-	/*
-	 * Finally, make sure that changes to the mapped area
-	 * do not percolate back to the file as seen by read().
-	 * (This is a bug on some variants of i386 svr4.0.)
-	 */
-	for (i = 0; i < pagesize; ++i)
-		*(data2 + i) = *(data2 + i) + 1;
-	data3 = malloc(pagesize);
-	if (!data3)
-		exit(1);
-	if (read(fd, data3, pagesize) != pagesize)
-		exit(1);
-	for (i = 0; i < pagesize; ++i)
-		if (*(data + i) != *(data3 + i))
-			exit(1);
-	close(fd);
-	unlink("conftestmmap");
-	exit(0);
-}
-
-EOF
-if { (eval echo configure:1200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_func_mmap_fixed_mapped=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_func_mmap_fixed_mapped=no
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$ac_cv_func_mmap_fixed_mapped" 1>&6
-if test $ac_cv_func_mmap_fixed_mapped = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_MMAP 1
-EOF
-
-fi
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-DEFS=-DHAVE_CONFIG_H
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-
-trap 'rm -fr `echo "Makefile compress_config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@CC@%$CC%g
-s%@CPP@%$CPP%g
-s%@ZLIB@%$ZLIB%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
-ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
-ac_dC='\3'
-ac_dD='%g'
-# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
-ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-ac_uB='\([ 	]\)%\1#\2define\3'
-ac_uC=' '
-ac_uD='\4%g'
-# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-ac_eB='$%\1#\2define\3'
-ac_eC=' '
-ac_eD='%g'
-
-if test "${CONFIG_HEADERS+set}" != set; then
-EOF
-cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="compress_config.h"
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-fi
-for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  echo creating $ac_file
-
-  rm -f conftest.frag conftest.in conftest.out
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  cat $ac_file_inputs > conftest.in
-
-EOF
-
-# Transform confdefs.h into a sed script conftest.vals that substitutes
-# the proper values into config.h.in to produce config.h.  And first:
-# Protect against being on the right side of a sed subst in config.status.
-# Protect against being in an unquoted here document in config.status.
-rm -f conftest.vals
-cat > conftest.hdr <<\EOF
-s/[\\&%]/\\&/g
-s%[\\$`]%\\&%g
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
-s%ac_d%ac_u%gp
-s%ac_u%ac_e%gp
-EOF
-sed -n -f conftest.hdr confdefs.h > conftest.vals
-rm -f conftest.hdr
-
-# This sed command replaces #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-cat >> conftest.vals <<\EOF
-s%^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
-EOF
-
-# Break up conftest.vals because some shells have a limit on
-# the size of here documents, and old seds have small limits too.
-
-rm -f conftest.tail
-while :
-do
-  ac_lines=`grep -c . conftest.vals`
-  # grep -c gives empty output for an empty file on some AIX systems.
-  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
-  # Write a limited-size here document to conftest.frag.
-  echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
-  echo 'CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-' >> $CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
-  rm -f conftest.vals
-  mv conftest.tail conftest.vals
-done
-rm -f conftest.vals
-
-cat >> $CONFIG_STATUS <<\EOF
-  rm -f conftest.frag conftest.h
-  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
-  cat conftest.in >> conftest.h
-  rm -f conftest.in
-  if cmp -s $ac_file conftest.h 2>/dev/null; then
-    echo "$ac_file is unchanged"
-    rm -f conftest.h
-  else
-    # Remove last slash and all that follows it.  Not all systems have dirname.
-      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-      # The file is in a subdirectory.
-      test ! -d "$ac_dir" && mkdir "$ac_dir"
-    fi
-    rm -f $ac_file
-    mv conftest.h $ac_file
-  fi
-fi; done
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
-

src/mod/compress.mod/configure.in

@@ -1,47 +0,0 @@
-dnl Eggdrop compile-time configuration file for src/mod/compress.mod
-dnl
-
-dnl This file is based on the autoconf m4 macros. Special eggdrop
-dnl macros are used to optimise the size of the resulting configure
-dnl script `./configure'.  Run `../eggautoconf' to update that
-dnl script. You need to have the GNU autoconf package installed
-dnl though.
-
-
-dnl Instead of AC_INIT, we call EGG_INIT().
-sinclude(../eggmod.m4)
-EGG_INIT(compress.c)
-AC_CONFIG_HEADER(compress_config.h)
-
-AC_PROG_CC
-
-AC_CHECK_LIB(z, gzopen, ZLIB="-lz", )
-AC_CHECK_HEADER(zlib.h)
-
-# Disable the module if either the header file or the library
-# are missing.
-if test "x${ZLIB}" = x; then
-  cat >&2 <<EOF
-configure: warning:
-
-  Your system does not provide a working zlib compression library. The
-  compress module will therefore be disabled.
-
-EOF
-  EGG_REMOVE_MOD(compress)
-else
-  if test "${ac_cv_header_zlib_h}" != yes; then
-    cat >&2 <<EOF
-configure: warning:
-
-  Your system does not provide the necessary zlib header files. The
-  compress module will therefore be disabled.
-
-EOF
-    EGG_REMOVE_MOD(compress)
-  fi
-fi
-AC_FUNC_MMAP
-AC_SUBST(ZLIB)
-
-AC_OUTPUT(Makefile)

src/mod/irc.mod/irc.c

@@ -808,7 +808,7 @@ static void maybe_revenge(struct chanset_t *chan, char *whobad,
 
 /* Set the key.
  */
-static void set_key(struct chanset_t *chan, char *k)
+static void setkey(struct chanset_t *chan, char *k)
 {
   nfree(chan->channel.key);
   if (k == NULL) {

src/mod/irc.mod/irc.h

@@ -53,7 +53,7 @@ static void request_op(struct chanset_t *);
 static void request_in(struct chanset_t *);
 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 setkey(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 *);

src/mod/irc.mod/mode.c

@@ -1091,7 +1091,7 @@ Context;
 	  }
 	  check_tcl_mode(nick, from, u, chan->dname, ms2, op);
 	  if (ms2[0] == '+') {
-	    set_key(chan, op);
+	    setkey(chan, op);
 	    if (channel_active(chan))
 	      got_key(chan, nick, from, op);
 	  } else {
@@ -1102,7 +1102,7 @@ Context;
 		       && !chan_master(user))
 		add_mode(chan, '+', 'k', chan->key_prot);
 	    }
-	    set_key(chan, NULL);
+	    setkey(chan, NULL);
 	  }
 	  break;
 	case 'o':

src/net.c

@@ -1379,7 +1379,15 @@ void tputs(register int z, char *s, unsigned int len)
 	return;
       }
       /* Try. */
-      x = write(z, s, len);
+#ifdef HAVE_ZLIB_H
+//      if (socklist[i].gz) { 		/* gzipped links */
+//        FILE *fp;
+//        fp = gzdopen(z, "wb0");
+//        x = gzwrite(fp, s, len);
+//        
+//      } else
+#endif /* HAVE_ZLIB_H */
+        x = write(z, s, len);
       if (x == (-1))
 	x = 0;
       if (x < len) {

src/tclmisc.c

@@ -8,7 +8,6 @@
 #include "main.h"
 #include "modules.h"
 #include "tandem.h"
-#include "md5/md5.h"
 #ifdef HAVE_UNAME
 #include <sys/utsname.h>
 #endif