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

cvs at eggheads.org cvs at eggheads.org
Sun Oct 10 15:24:53 CST 2010


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.8
Commit time: 2010-10-10 21:24:53 UTC
Committer  : Rumen Stoyanov <pseudo at egg6.net>

Modified files:
     aclocal.m4 config.h.in configure doc/Changes1.8 src/chanprog.c
     src/main.c src/mod/Makefile.in

Log message:

Removed the unrecognized options warning when configuring modules.
Modified -v output and .status display configure options.

---------------------- diff included ----------------------
Index: eggdrop1.8/aclocal.m4
diff -u eggdrop1.8/aclocal.m4:1.5 eggdrop1.8/aclocal.m4:1.6
--- eggdrop1.8/aclocal.m4:1.5	Wed Oct  6 13:07:47 2010
+++ eggdrop1.8/aclocal.m4	Sun Oct 10 15:24:42 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.5 2010/10/06 19:07:47 pseudo Exp $
+dnl $Id: aclocal.m4,v 1.6 2010/10/10 21:24:42 pseudo Exp $
 dnl
 
 
@@ -1770,6 +1770,7 @@
   done
 
   AC_SUBST(egg_ac_parameters)
+  AC_DEFINE_UNQUOTED(EGG_AC_ARGS, "$egg_ac_parameters", [Arguments passed to configure])
 ])
 
 
Index: eggdrop1.8/config.h.in
diff -u eggdrop1.8/config.h.in:1.3 eggdrop1.8/config.h.in:1.4
--- eggdrop1.8/config.h.in:1.3	Wed Aug 11 09:58:19 2010
+++ eggdrop1.8/config.h.in	Sun Oct 10 15:24:43 2010
@@ -43,6 +43,9 @@
 /* Define if running on SunOS 4.0. */
 #undef DLOPEN_1
 
+/* Arguments passed to configure */
+#undef EGG_AC_ARGS
+
 /* Define the maximum length of handles on the bot. */
 #undef EGG_HANDLEN
 
Index: eggdrop1.8/configure
diff -u eggdrop1.8/configure:1.6 eggdrop1.8/configure:1.7
--- eggdrop1.8/configure:1.6	Wed Oct  6 13:07:47 2010
+++ eggdrop1.8/configure	Sun Oct 10 15:24:43 2010
@@ -2552,6 +2552,11 @@
 
 
 
+cat >>confdefs.h <<_ACEOF
+#define EGG_AC_ARGS "$egg_ac_parameters"
+_ACEOF
+
+
 
 
 # Check for a working C compiler
Index: eggdrop1.8/doc/Changes1.8
diff -u eggdrop1.8/doc/Changes1.8:1.16 eggdrop1.8/doc/Changes1.8:1.17
--- eggdrop1.8/doc/Changes1.8:1.16	Sun Oct 10 12:22:47 2010
+++ eggdrop1.8/doc/Changes1.8	Sun Oct 10 15:24:43 2010
@@ -1,4 +1,4 @@
-$Id: Changes1.8,v 1.16 2010/10/10 18:22:47 pseudo Exp $
+$Id: Changes1.8,v 1.17 2010/10/10 21:24:43 pseudo Exp $
 
 Eggdrop Changes (since version 1.8.0)
 
@@ -6,6 +6,10 @@
 
 1.8.0 (CVS):
 
+  - Removed the unrecognized options warning when configuring modules.
+  - Modified -v output and .status display configure options.
+    Patch by: pseudo
+
   - Added the process and parent pids to .status output. Increased the
     precision of cpu time reporting.
   - Added a new Tcl command 'status' to provide access to cpu/memory/cache
Index: eggdrop1.8/src/chanprog.c
diff -u eggdrop1.8/src/chanprog.c:1.2 eggdrop1.8/src/chanprog.c:1.3
--- eggdrop1.8/src/chanprog.c:1.2	Sun Oct 10 12:22:47 2010
+++ eggdrop1.8/src/chanprog.c	Sun Oct 10 15:24:43 2010
@@ -7,7 +7,7 @@
  *   telling the current programmed settings
  *   initializing a lot of stuff and loading the tcl scripts
  *
- * $Id: chanprog.c,v 1.2 2010/10/10 18:22:47 pseudo Exp $
+ * $Id: chanprog.c,v 1.3 2010/10/10 21:24:43 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -343,6 +343,7 @@
           s, s1, s2, MISC_CACHEHIT,
           100.0 * ((float) cache_hit) / ((float) (cache_hit + cache_miss)));
 
+  dprintf(idx, "Configured with: " EGG_AC_ARGS "\n");
   if (admin[0])
     dprintf(idx, "Admin: %s\n", admin);
 
Index: eggdrop1.8/src/main.c
diff -u eggdrop1.8/src/main.c:1.2 eggdrop1.8/src/main.c:1.3
--- eggdrop1.8/src/main.c:1.2	Thu Aug  5 12:12:05 2010
+++ eggdrop1.8/src/main.c	Sun Oct 10 15:24:43 2010
@@ -5,7 +5,7 @@
  *   command line arguments
  *   context and assert debugging
  *
- * $Id: main.c,v 1.2 2010/08/05 18:12:05 pseudo Exp $
+ * $Id: main.c,v 1.3 2010/10/10 21:24:43 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -294,7 +294,13 @@
 
     if (tcl_threaded())
       dprintf(-x, "Tcl is threaded\n");
+#ifdef IPV6
+    dprintf(-x, "Compiled with IPv6 support\n");
+#else
+    dprintf(-x, "Compiled without IPv6 support\n");
+#endif
 
+    dprintf(-x, "Configure flags: %s\n", EGG_AC_ARGS);
 #ifdef CCFLAGS
     dprintf(-x, "Compile flags: %s\n", CCFLAGS);
 #endif
@@ -484,6 +490,12 @@
         printf("%s\n", version);
         if (z[0])
           printf("  (patches: %s)\n", z);
+        printf("Configured with: " EGG_AC_ARGS "\n");
+        printf("Compiled with: ");
+#ifdef IPV6
+        printf("IPv6, ");
+#endif
+        printf("handlen=%d\n", HANDLEN);
         bg_send_quit(BG_ABORT);
         exit(0);
         break;                  /* this should never be reached */
Index: eggdrop1.8/src/mod/Makefile.in
diff -u eggdrop1.8/src/mod/Makefile.in:1.1.1.1 eggdrop1.8/src/mod/Makefile.in:1.2
--- eggdrop1.8/src/mod/Makefile.in:1.1.1.1	Mon Jul 26 15:11:06 2010
+++ eggdrop1.8/src/mod/Makefile.in	Sun Oct 10 15:24:43 2010
@@ -1,5 +1,5 @@
 # Makefile for src/mod/
-# $Id: Makefile.in,v 1.1.1.1 2010/07/26 21:11:06 simple Exp $
+# $Id: Makefile.in,v 1.2 2010/10/10 21:24:43 pseudo Exp $
 
 SHELL = @SHELL@
 top_srcdir = @top_srcdir@
@@ -88,7 +88,7 @@
 			echo ""; \
 			echo "Configuring module '$${modname}'."; \
 			if test ! -d $$i; then mkdir $$i; fi; \
-			(cd $$i && $(MOD_UPDIR)$(srcdir)/$$i/configure $(egg_ac_parameters) --cache-file=../../../config.cache --srcdir=$(MOD_UPDIR)$(top_srcdir)/src/mod/$$i); \
+			(cd $$i && $(MOD_UPDIR)$(srcdir)/$$i/configure --disable-option-checking $(egg_ac_parameters) --cache-file=../../../config.cache --srcdir=$(MOD_UPDIR)$(top_srcdir)/src/mod/$$i); \
 		fi; \
 	done; \
 	echo ""
----------------------- End of diff -----------------------


More information about the Changes mailing list