[cvslog] [CVS] Module eggdrop1.6: Change committed

cvs at eggheads.org cvs at eggheads.org
Sun Mar 14 12:22:09 CST 2010


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2010-03-14 18:22:09 UTC
Committer  : Rumen Stoyanov <pseudo at egg6.net>

Modified files:
     Makefile.in aclocal.m4 config.h.in configure configure.ac
     doc/Changes1.6 src/eggdrop.h src/patch.h

Log message:

Added a configure option to set the handlen
Added a configure option to enable dns debugging and made it default for make debug.
Removed obsolete check for broken sscanf from configure.

---------------------- diff included ----------------------
Index: eggdrop1.6/Makefile.in
diff -u eggdrop1.6/Makefile.in:1.42 eggdrop1.6/Makefile.in:1.43
--- eggdrop1.6/Makefile.in:1.42	Thu Jul  3 21:17:25 2008
+++ eggdrop1.6/Makefile.in	Sun Mar 14 12:21:59 2010
@@ -2,7 +2,7 @@
 #  This is the Makefile for EGGDROP (the IRC bot)
 #  You should never need to edit this.
 #
-# $Id: Makefile.in,v 1.42 2008/07/04 03:17:25 tothwolf Exp $
+# $Id: Makefile.in,v 1.43 2010/03/14 18:21:59 pseudo Exp $
 
 SHELL = @SHELL@
 top_srcdir = @top_srcdir@
@@ -25,6 +25,7 @@
 #   -DDEBUG          generic debugging code
 #   -DDEBUG_ASSERT   to enable assert debugging
 #   -DDEBUG_MEM      to be able to debug memory allocation (.debug)
+#   -DDEBUG_DNS      to enable dns.mod extra debugging information
 #
 # Debug defines can be set with configure now.
 # See ./configure --help for more information.
Index: eggdrop1.6/aclocal.m4
diff -u eggdrop1.6/aclocal.m4:1.114 eggdrop1.6/aclocal.m4:1.115
--- eggdrop1.6/aclocal.m4:1.114	Mon Jan 25 21:12:15 2010
+++ eggdrop1.6/aclocal.m4	Sun Mar 14 12:21:59 2010
@@ -16,7 +16,7 @@
 dnl along with this program; if not, write to the Free Software
 dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 dnl
-dnl $Id: aclocal.m4,v 1.114 2010/01/26 03:12:15 tothwolf Exp $
+dnl $Id: aclocal.m4,v 1.115 2010/03/14 18:21:59 pseudo Exp $
 dnl
 
 
@@ -861,39 +861,21 @@
 ])
 
 
-dnl EGG_CHECK_LIBSAFE_SSCANF()
-dnl
-AC_DEFUN([EGG_CHECK_LIBSAFE_SSCANF],
-[
-  AC_CACHE_CHECK([for broken libsafe sscanf], egg_cv_var_libsafe_sscanf, [
-    AC_RUN_IFELSE([[
-      #include <stdio.h>
-
-      int main()
-      {
-        char *src = "0x001,guppyism\n", 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="cross"
-    ])
+dnl EGG_ARG_HANDLEN()
+dnl 
+AC_DEFUN([EGG_ARG_HANDLEN], [
+  AC_ARG_WITH(handlen, [  --with-handlen=VALUE    set the maximum length a handle on the bot can be], [
+    if test -n $withval && test $withval -ge 9 && test $withval -le 32;
+    then
+      AC_DEFINE_UNQUOTED(EGG_HANDLEN, $withval, [
+        Define the maximum length of handles on the bot.
+      ])
+    else
+      AC_MSG_WARN([Invalid handlen given (must be a number between 9 and 32), defaulting to 9.])
+    fi
   ])
-
-  if test "$egg_cv_var_libsafe_sscanf" = yes; then
-    AC_DEFINE(LIBSAFE_HACKS, 1, [Define if you have a version of libsafe with a broken sscanf().])
-  fi
 ])
 
-
 dnl
 dnl Misc checks.
 dnl
@@ -1540,6 +1522,8 @@
   AC_ARG_ENABLE(debug-assert,  [  --disable-debug-assert  disable assert debug code], [enable_debug_assert="$enableval"], [enable_debug_assert="auto"])
   AC_ARG_ENABLE(debug-mem,     [  --enable-debug-mem      enable memory debug code (default for 'make debug')], [enable_debug_mem="$enableval"], [enable_debug_mem="auto"])
   AC_ARG_ENABLE(debug-mem,     [  --disable-debug-mem     disable memory debug code], [enable_debug_mem="$enableval"], [enable_debug_mem="auto"])
+  AC_ARG_ENABLE(debug-dns,     [  --enable-debug-dns      enable dns.mod debug messages (default for 'make debug')], [enable_debug_dns="$enableval"], [enable_debug_dns="auto"])
+  AC_ARG_ENABLE(debug-dns,     [  --disable-debug-dns     disable dns.mod debug messages], [enable_debug_dns="$enableval"], [enable_debug_dns="auto"])
   AC_ARG_ENABLE(debug-context, [  --enable-debug-context  enable context debug code (default)], [enable_debug_context="$enableval"], [enable_debug_context="auto"])
   AC_ARG_ENABLE(debug-context, [  --disable-debug-context disable context debug code], [enable_debug_context="$enableval"], [enable_debug_context="auto"])
 ])
@@ -1556,36 +1540,43 @@
   default_std_debug_assert="no"
   default_std_debug_mem="no"
   default_std_debug_context="yes"
+  default_std_debug_dns="no"
 
   # make: 'debug' or 'sdebug'
   default_deb_debug="yes"
   default_deb_debug_assert="yes"
   default_deb_debug_mem="yes"
   default_deb_debug_context="yes"
+  default_deb_debug_dns="yes"
 
   if test "$DEFAULT_MAKE" = eggdrop || test "$DEFAULT_MAKE" = static; then
     default_debug="$default_std_debug" 
     default_debug_assert="$default_std_debug_assert" 
     default_debug_mem="$default_std_debug_mem" 
     default_debug_context="$default_std_debug_context"
+    default_debug_dns="$default_std_debug_dns"
   else
     default_debug="$default_deb_debug"
     default_debug_assert="$default_deb_debug_assert"
     default_debug_mem="$default_deb_debug_mem"
     default_debug_context="$default_deb_debug_context"
+    default_debug_dns="$default_deb_debug_dns"
   fi
 
-  debug_options="debug debug_assert debug_mem"
+  debug_options="debug debug_assert debug_mem debug_dns"
 
   debug_cflags_debug="-g3 -DDEBUG"
   debug_cflags_debug_assert="-DDEBUG_ASSERT"
   debug_cflags_debug_mem="-DDEBUG_MEM"
+  debug_cflags_debug_dns="-DDEBUG_DNS"
   debug_stdcflags_debug=""
   debug_stdcflags_debug_assert=""
   debug_stdcflags_debug_mem=""
+  debug_stdcflags_debug_dns=""
   debug_debcflags_debug=""
   debug_debcflags_debug_assert=""
   debug_debcflags_debug_mem=""
+  debug_debcflags_debug_dns=""
 ])
 
 
Index: eggdrop1.6/config.h.in
diff -u eggdrop1.6/config.h.in:1.55 eggdrop1.6/config.h.in:1.56
--- eggdrop1.6/config.h.in:1.55	Thu Feb 18 03:52:29 2010
+++ eggdrop1.6/config.h.in	Sun Mar 14 12:21:59 2010
@@ -43,6 +43,9 @@
 /* Define if running on SunOS 4.0. */
 #undef DLOPEN_1
 
+/* Define the maximum length of handles on the bot. */
+#undef EGG_HANDLEN
+
 /* Defines the extension of Eggdrop modules. */
 #undef EGG_MOD_EXT
 
@@ -295,9 +298,6 @@
 /* Define to 1 if you have the <wchar.h> header file. */
 #undef HAVE_WCHAR_H
 
-/* Define if you have a version of libsafe with a broken sscanf(). */
-#undef LIBSAFE_HACKS
-
 /* Define if modules will work on your system. */
 #undef MODULES_OK
 
Index: eggdrop1.6/configure
diff -u eggdrop1.6/configure:1.164 eggdrop1.6/configure:1.165
--- eggdrop1.6/configure:1.164	Thu Feb 18 03:52:29 2010
+++ eggdrop1.6/configure	Sun Mar 14 12:21:59 2010
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.37 .
+# From configure.ac Revision: 1.38 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for Eggdrop 1.6.20.
 #
@@ -703,7 +703,9 @@
 enable_debug
 enable_debug_assert
 enable_debug_mem
+enable_debug_dns
 enable_debug_context
+with_handlen
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1340,8 +1342,11 @@
   --disable-debug-assert  disable assert debug code
   --enable-debug-mem      enable memory debug code (default for 'make debug')
   --disable-debug-mem     disable memory debug code
+  --enable-debug-dns      enable dns.mod debug messages (default for 'make debug')
+  --disable-debug-dns     disable dns.mod debug messages
   --enable-debug-context  enable context debug code (default)
   --disable-debug-context disable context debug code
+  --with-handlen=VALUE    set the maximum length a handle on the bot can be
 
 Some influential environment variables:
   CC          C compiler command
@@ -6886,62 +6891,6 @@
 
 
 
-# Make sure we are using the correct result from a broken libsafe sscanf().
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken libsafe sscanf" >&5
-$as_echo_n "checking for broken libsafe sscanf... " >&6; }
-if test "${egg_cv_var_libsafe_sscanf+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    if test "$cross_compiling" = yes; then :
-
-      egg_cv_var_libsafe_sscanf="cross"
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-      #include <stdio.h>
-
-      int main()
-      {
-        char *src = "0x001,guppyism\n", dst[10];
-        int idx;
-
-        if (sscanf(src, "0x%x,%10c", &idx, dst) == 1)
-          exit(1);
-
-        return(0);
-      }
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-      egg_cv_var_libsafe_sscanf="no"
-
-else
-
-      egg_cv_var_libsafe_sscanf="yes"
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $egg_cv_var_libsafe_sscanf" >&5
-$as_echo "$egg_cv_var_libsafe_sscanf" >&6; }
-
-  if test "$egg_cv_var_libsafe_sscanf" = yes; then
-
-$as_echo "#define LIBSAFE_HACKS 1" >>confdefs.h
-
-  fi
-
-
-
 # Tcl version to recommend if no Tcl is found, and the site where it can be
 # found for download.
 tclrecommendver="8.5.X"
@@ -7685,6 +7634,20 @@
   enable_debug_mem="auto"
 fi
 
+  # Check whether --enable-debug-dns was given.
+if test "${enable_debug_dns+set}" = set; then :
+  enableval=$enable_debug_dns; enable_debug_dns="$enableval"
+else
+  enable_debug_dns="auto"
+fi
+
+  # Check whether --enable-debug-dns was given.
+if test "${enable_debug_dns+set}" = set; then :
+  enableval=$enable_debug_dns; enable_debug_dns="$enableval"
+else
+  enable_debug_dns="auto"
+fi
+
   # Check whether --enable-debug-context was given.
 if test "${enable_debug_context+set}" = set; then :
   enableval=$enable_debug_context; enable_debug_context="$enableval"
@@ -7708,36 +7671,43 @@
   default_std_debug_assert="no"
   default_std_debug_mem="no"
   default_std_debug_context="yes"
+  default_std_debug_dns="no"
 
   # make: 'debug' or 'sdebug'
   default_deb_debug="yes"
   default_deb_debug_assert="yes"
   default_deb_debug_mem="yes"
   default_deb_debug_context="yes"
+  default_deb_debug_dns="yes"
 
   if test "$DEFAULT_MAKE" = eggdrop || test "$DEFAULT_MAKE" = static; then
     default_debug="$default_std_debug"
     default_debug_assert="$default_std_debug_assert"
     default_debug_mem="$default_std_debug_mem"
     default_debug_context="$default_std_debug_context"
+    default_debug_dns="$default_std_debug_dns"
   else
     default_debug="$default_deb_debug"
     default_debug_assert="$default_deb_debug_assert"
     default_debug_mem="$default_deb_debug_mem"
     default_debug_context="$default_deb_debug_context"
+    default_debug_dns="$default_deb_debug_dns"
   fi
 
-  debug_options="debug debug_assert debug_mem"
+  debug_options="debug debug_assert debug_mem debug_dns"
 
   debug_cflags_debug="-g3 -DDEBUG"
   debug_cflags_debug_assert="-DDEBUG_ASSERT"
   debug_cflags_debug_mem="-DDEBUG_MEM"
+  debug_cflags_debug_dns="-DDEBUG_DNS"
   debug_stdcflags_debug=""
   debug_stdcflags_debug_assert=""
   debug_stdcflags_debug_mem=""
+  debug_stdcflags_debug_dns=""
   debug_debcflags_debug=""
   debug_debcflags_debug_assert=""
   debug_debcflags_debug_mem=""
+  debug_debcflags_debug_dns=""
 
 
   for enable_option in $debug_options; do
@@ -7847,6 +7817,27 @@
   fi
 
 
+# Let the user set the handlen with a configure option
+
+
+# Check whether --with-handlen was given.
+if test "${with_handlen+set}" = set; then :
+  withval=$with_handlen;
+    if test -n $withval && test $withval -ge 9 && test $withval -le 32;
+    then
+
+cat >>confdefs.h <<_ACEOF
+#define EGG_HANDLEN $withval
+_ACEOF
+
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Invalid handlen given (must be a number between 9 and 32), defaulting to 9." >&5
+$as_echo "$as_me: WARNING: Invalid handlen given (must be a number between 9 and 32), defaulting to 9." >&2;}
+    fi
+
+fi
+
+
 
 # Substitute Makefile variables.
 
Index: eggdrop1.6/configure.ac
diff -u eggdrop1.6/configure.ac:1.38 eggdrop1.6/configure.ac:1.39
--- eggdrop1.6/configure.ac:1.38	Thu Feb 18 03:52:29 2010
+++ eggdrop1.6/configure.ac	Sun Mar 14 12:21:59 2010
@@ -1,11 +1,11 @@
 dnl configure.ac: this file is processed by autoconf to produce ./configure.
 dnl
-dnl $Id: configure.ac,v 1.38 2010/02/18 09:52:29 pseudo Exp $
+dnl $Id: configure.ac,v 1.39 2010/03/14 18:21:59 pseudo Exp $
 
 AC_PREREQ(2.60)
 AC_INIT([Eggdrop],[1.6.20],[bugs at eggheads.org])
 AC_COPYRIGHT([Copyright (C) 1999 - 2010 Eggheads Development Team])
-AC_REVISION($Revision: 1.38 $)
+AC_REVISION($Revision: 1.39 $)
 AC_CONFIG_SRCDIR(src/eggdrop.h)
 AC_CONFIG_AUX_DIR(misc)
 AC_CONFIG_HEADER(config.h)
@@ -120,10 +120,6 @@
 AC_FUNC_MMAP
 
 
-# Make sure we are using the correct result from a broken libsafe sscanf().
-EGG_CHECK_LIBSAFE_SSCANF
-
-
 # Tcl version to recommend if no Tcl is found, and the site where it can be
 # found for download.
 tclrecommendver="8.5.X"
@@ -185,6 +181,8 @@
 EGG_DEBUG_CFLAGS
 EGG_ENABLE_DEBUG_CONTEXT
 
+# Let the user set the handlen with a configure option
+EGG_ARG_HANDLEN
 
 # Substitute Makefile variables.
 EGG_SUBST_EGGVERSION
Index: eggdrop1.6/doc/Changes1.6
diff -u eggdrop1.6/doc/Changes1.6:1.72 eggdrop1.6/doc/Changes1.6:1.73
--- eggdrop1.6/doc/Changes1.6:1.72	Sat Mar 13 16:49:38 2010
+++ eggdrop1.6/doc/Changes1.6	Sun Mar 14 12:21:59 2010
@@ -1,4 +1,4 @@
-$Id: Changes1.6,v 1.72 2010/03/13 22:49:38 pseudo Exp $
+$Id: Changes1.6,v 1.73 2010/03/14 18:21:59 pseudo Exp $
 
 Eggdrop Changes (since version 1.6.0)
 
@@ -6,6 +6,13 @@
 
 1.6.20 (CVS):
 
+  - Added a configure option to set the handlen while keeping compatibility with
+    the older method of editing eggdrop.h directly.
+  - Added a configure option to enable dns debugging and made it default for
+    make debug.
+  - Removed obsolete check for broken sscanf from configure.
+    Patch by: pseudo
+
   - Added missing mod-transfer.html
     Patch by: mike.ds
 
Index: eggdrop1.6/src/eggdrop.h
diff -u eggdrop1.6/src/eggdrop.h:1.76 eggdrop1.6/src/eggdrop.h:1.77
--- eggdrop1.6/src/eggdrop.h:1.76	Thu Feb 18 03:52:29 2010
+++ eggdrop1.6/src/eggdrop.h	Sun Mar 14 12:21:59 2010
@@ -4,7 +4,7 @@
  *
  *   IF YOU ALTER THIS FILE, YOU NEED TO RECOMPILE THE BOT.
  *
- * $Id: eggdrop.h,v 1.76 2010/02/18 09:52:29 pseudo Exp $
+ * $Id: eggdrop.h,v 1.77 2010/03/14 18:21:59 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -147,6 +147,11 @@
 #  endif
 #endif
 
+#ifdef EGG_HANDLEN
+#  undef HANDLEN
+#  define HANDLEN EGG_HANDLEN
+#endif
+
 #if (NICKMAX < 9) || (NICKMAX > 32)
 #  include "Error: Invalid NICKMAX value."
 #endif
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.1240 eggdrop1.6/src/patch.h:1.1241
--- eggdrop1.6/src/patch.h:1.1240	Mon Mar  8 14:52:56 2010
+++ eggdrop1.6/src/patch.h	Sun Mar 14 12:21:59 2010
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1240 2010/03/08 20:52:56 pseudo Exp $
+ * $Id: patch.h,v 1.1241 2010/03/14 18:21:59 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1268078010");            /* current unixtime */
+patch("1268590469");            /* current unixtime */
 /*
  *
  *
  */
-patch("bindlog");
+patch("acdnshandlen");
 /*
  *
  *
----------------------- End of diff -----------------------


More information about the Changes mailing list