* Renamed main.h to eggmain.h (temp, will clear it all out later)

* Fixed a small bug in depend.m4


svn: 615

autotools/includes/depend.m4

@@ -2,7 +2,7 @@
 # ------------------------------
 AC_DEFUN([DO_DEPS],
 [
-files="src/Makefile src/compat/Makefile src/mod/channels.mod/Makefile src/mod/compress.mod/Makefile src/mod/console.mod/Makefile src/mod/ctcp.mod/Makefile src/mod/dns.mod/Makefile.in src/mod/irc.mod/Makefile src/mod/notes.mod/Makefile src/mod/server.mod/Makefile src/mod/share.mod/Makefile src/mod/transfer.mod/Makefile src/mod/update.mod/Makefile"
+files="src/Makefile.in src/compat/Makefile.in src/mod/channels.mod/Makefile src/mod/compress.mod/Makefile src/mod/console.mod/Makefile src/mod/ctcp.mod/Makefile src/mod/dns.mod/Makefile.in src/mod/irc.mod/Makefile src/mod/notes.mod/Makefile src/mod/server.mod/Makefile src/mod/share.mod/Makefile src/mod/transfer.mod/Makefile src/mod/update.mod/Makefile"
 for mf in $files; do
   # Strip MF so we end up with the name of the file.
 #  echo "MF: $mf"

configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.1 .
+# From configure.ac Revision: 1.2 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -12253,7 +12253,7 @@ esac
 
 
 
-files="src/Makefile src/compat/Makefile src/mod/channels.mod/Makefile src/mod/compress.mod/Makefile src/mod/console.mod/Makefile src/mod/ctcp.mod/Makefile src/mod/dns.mod/Makefile.in src/mod/irc.mod/Makefile src/mod/notes.mod/Makefile src/mod/server.mod/Makefile src/mod/share.mod/Makefile src/mod/transfer.mod/Makefile src/mod/update.mod/Makefile"
+files="src/Makefile.in src/compat/Makefile.in src/mod/channels.mod/Makefile src/mod/compress.mod/Makefile src/mod/console.mod/Makefile src/mod/ctcp.mod/Makefile src/mod/dns.mod/Makefile.in src/mod/irc.mod/Makefile src/mod/notes.mod/Makefile src/mod/server.mod/Makefile src/mod/share.mod/Makefile src/mod/transfer.mod/Makefile src/mod/update.mod/Makefile"
 for mf in $files; do
   # Strip MF so we end up with the name of the file.
 #  echo "MF: $mf"

misc/grep

@@ -1,3 +1,3 @@
 #!/bin/sh
 grep=`which grep` 
-grep "$@" | grep -v "^Binary" | grep -v "src/_" | grep -v "help."
+grep "$@" | grep -v "^Binary" | grep -v "src/_" | grep -v "help." | grep -v "CVS"

src/Makefile.in

@@ -66,7 +66,7 @@ makesettings: makesettings.c
 	@$(CC) $(CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) makesettings.c -o makesettings
 	@$(STRIP) makesettings
 
-stringfix: stringfix.c main.h ../config.h ../pack/pack.cfg eggdrop.h
+stringfix: stringfix.c eggmain.h ../config.h ../pack/pack.cfg eggdrop.h
 	@echo -e "Compiling: \033[1mstringfix\033[0m"
 	@$(CC) $(CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) stringfix.c -o stringfix
 	@$(STRIP) stringfix

src/auth.c

@@ -4,7 +4,7 @@
  *   auth system hooks
  */
 
-#include "main.h"
+#include "eggmain.h"
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>

src/bg.c

@@ -5,7 +5,7 @@
  *
  */
 
-#include "main.h"
+#include "eggmain.h"
 #include <signal.h>
 
 

src/botcmd.c

@@ -5,7 +5,7 @@
  *
  */
 
-#include "main.h"
+#include "eggmain.h"
 #include "tandem.h"
 #include "users.h"
 #include "chan.h"

src/botmsg.c

@@ -7,7 +7,7 @@
  *
  */
 
-#include "main.h"
+#include "eggmain.h"
 #include "tandem.h"
 #include "core_binds.h"
 

src/botnet.c

@@ -9,7 +9,7 @@
  *
  */
 
-#include "main.h"
+#include "eggmain.h"
 #include "tandem.h"
 #include "core_binds.h"
 

src/chanprog.c

@@ -9,7 +9,7 @@
  *
  */
 
-#include "main.h"
+#include "eggmain.h"
 #if HAVE_GETRUSAGE
 #include <sys/resource.h>
 #if HAVE_SYS_RUSAGE_H

src/cmds.c

@@ -5,7 +5,7 @@
  *
  */
 
-#include "main.h"
+#include "eggmain.h"
 #include "tandem.h"
 #include "modules.h"
 #include "help.h"

src/compat/inet_aton.c

@@ -3,7 +3,7 @@
  *
  */
 
-#include "main.h"
+#include "eggmain.h"
 #include "inet_aton.h"
 
 #ifndef HAVE_ISASCII

src/compat/inet_aton.h

@@ -7,7 +7,7 @@
 #ifndef _EGG_COMPAT_INET_ATON_H
 #define _EGG_COMPAT_INET_ATON_H
 
-#include "src/main.h"
+#include "src/eggmain.h"
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

src/compat/inet_ntop.c

@@ -5,7 +5,7 @@
  */
 
 
-#include "main.h"
+#include "eggmain.h"
 #include "inet_ntop.h"
 
 #if defined(USE_IPV6) && !defined(HAVE_INET_NTOP)

src/compat/inet_ntop.h

@@ -7,7 +7,7 @@
 #ifndef _EGG_COMPAT_INET_NTOP_H
 #define _EGG_COMPAT_INET_NTOP_H
 
-#include "src/main.h"
+#include "src/eggmain.h"
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>

src/compat/memcpy.c

@@ -3,7 +3,7 @@
  *
  */
 
-#include "main.h"
+#include "eggmain.h"
 #include "memcpy.h"
 
 #ifndef HAVE_MEMCPY

src/compat/memcpy.h

@@ -7,7 +7,7 @@
 #ifndef _EGG_COMPAT_MEMCPY_H
 #define _EGG_COMPAT_MEMCPY_H
 
-#include "src/main.h"
+#include "src/eggmain.h"
 #include <string.h>
 
 #ifndef HAVE_MEMCPY

src/compat/memset.c

@@ -2,7 +2,7 @@
  * memset.c -- provides memset() if necessary.
  *
  */
-#include "main.h"
+#include "eggmain.h"
 #include "memset.h"
 
 #ifndef HAVE_MEMSET

src/compat/memset.h

@@ -7,7 +7,7 @@
 #ifndef _EGG_COMPAT_MEMSET_H
 #define _EGG_COMPAT_MEMSET_H
 
-#include "src/main.h"
+#include "src/eggmain.h"
 #include <string.h>
 
 #ifndef HAVE_MEMSET

src/compat/snprintf.c

@@ -2,7 +2,7 @@
  *
  */
 
-#include "main.h"
+#include "eggmain.h"
 #include "snprintf.h"
 
 

src/compat/snprintf.h

@@ -7,7 +7,7 @@
 #ifndef _EGG_COMPAT_SNPRINTF_H_
 #define _EGG_COMPAT_SNPRINTF_H_
 
-#include "src/main.h"
+#include "src/eggmain.h"
 #include <stdio.h>
 
 /* Check for broken snprintf versions */

src/compat/strcasecmp.c

@@ -3,7 +3,7 @@
  *
  */
 
-#include "main.h"
+#include "eggmain.h"
 #include "memcpy.h"
 
 #ifndef HAVE_STRCASECMP

src/compat/strcasecmp.h

@@ -7,7 +7,7 @@
 #ifndef _EGG_COMPAT_STRCASECMP_H
 #define _EGG_COMPAT_STRCASECMP_H
 
-#include "src/main.h"
+#include "src/eggmain.h"
 #include <ctype.h>
 
 

src/compat/strftime.c

@@ -4,7 +4,7 @@
  *
  */
 
-#include "src/main.h"
+#include "src/eggmain.h"
 #include "strftime.h"
 
 #ifndef HAVE_STRFTIME

src/compat/strftime.h

@@ -7,7 +7,7 @@
 #ifndef _EGG_COMPAT_STRFTIME_H_
 #define _EGG_COMPAT_STRFTIME_H_
 
-#include "src/main.h"
+#include "src/eggmain.h"
 #include <time.h>
 
 /* Use the system libraries version of strftime() if available. Otherwise

src/config.c

@@ -4,7 +4,7 @@
  *   cmdpass functions
  */
 
-#include "main.h"
+#include "eggmain.h"
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>

src/core_binds.c

@@ -1,4 +1,4 @@
-#include "main.h"
+#include "eggmain.h"
 
 extern cmd_t C_dcc[];
 extern struct dcc_t *dcc;

src/crypt.c

@@ -6,7 +6,7 @@
  */
 
 
-#include "main.h"
+#include "eggmain.h"
 
 #define CRYPT_BLOCKSIZE AES_BLOCK_SIZE
 #define CRYPT_KEYBITS 256

src/dcc.c

@@ -6,7 +6,7 @@
  *
  */
 
-#include "main.h"
+#include "eggmain.h"
 #include <ctype.h>
 #include <errno.h>
 #include "modules.h"

src/dccutil.c

@@ -9,7 +9,7 @@
  */
 
 #include <sys/stat.h>
-#include "main.h"
+#include "eggmain.h"
 #include <errno.h>
 #include "chan.h"
 #include "modules.h"

src/debug.c

@@ -7,7 +7,7 @@
  */
 
 
-#include "main.h"
+#include "eggmain.h"
 #include <setjmp.h>
 #include <signal.h>
 #include <sys/types.h>

src/dns.c

@@ -6,7 +6,7 @@
  *
  */
 
-#include "main.h"
+#include "eggmain.h"
 #include <netdb.h>
 #include <setjmp.h>
 #include <sys/socket.h>

src/egg_timer.c

@@ -1,6 +1,6 @@
 #include <stdio.h> /* For NULL */
 #include <sys/time.h> /* For gettimeofday() */
-#include "main.h"
+#include "eggmain.h"
 
 #include "egg_timer.h"
 

src/main.h → src/eggmain.h

@@ -1,5 +1,5 @@
 /*
- * main.h
+ * eggmain.h
  *   include file to include most other include files
  *
  */

src/flags.c

@@ -4,7 +4,7 @@
  *
  */
 
-#include "main.h"
+#include "eggmain.h"
 
 extern int		 use_console_r, debug_output, noshare,
 			 allow_dk_cmds;

src/main.c

@@ -6,7 +6,7 @@
  *
  */
 
-#include "main.h"
+#include "eggmain.h"
 #include "build.h"
 #include <libgen.h>
 #include <time.h>

src/makesettings.c

@@ -419,7 +419,7 @@ fprintf(f, " \
 #include <stdio.h> \n\
 #include <stdlib.h> \n\
 #include <string.h> \n\
-#include \"main.h\"\n\
+#include \"eggmain.h\"\n\
 \n\
 char packname[512], shellhash[33], bdhash[33], dcc_prefix[2], *owners, *hubs, *owneremail;\n\n\
 char *progname() {\n\

src/match.c

@@ -21,7 +21,7 @@
  * I hereby release this code into the public domain
  *
  */
-#include "main.h"
+#include "eggmain.h"
 
 #define QUOTE '\\' /* quoting character (overrides wildcards) */
 #define WILDS '*'  /* matches 0 or more characters (including spaces) */

src/mem.c

@@ -5,7 +5,7 @@
  *
  */
 
-#include "main.h"
+#include "eggmain.h"
 
 
 #define STR(x) x

src/misc.c

@@ -7,7 +7,7 @@
  *
  */
 
-#include "main.h"
+#include "eggmain.h"
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>

src/misc_file.c

@@ -4,7 +4,7 @@
  *
  */
 
-#include "main.h"
+#include "eggmain.h"
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>

src/mod/module.h

@@ -25,7 +25,7 @@
 #define _EGG_MOD_MODULE_H
 
 /* Just include *all* the include files...it's slower but EASIER */
-#include "src/main.h"
+#include "src/eggmain.h"
 #include "modvals.h"
 #include "src/tandem.h"
 

src/modules.c

@@ -6,7 +6,7 @@
  * 
  */
 
-#include "main.h"
+#include "eggmain.h"
 #include "modules.h"
 #include "tandem.h"
 #include <ctype.h>

src/net.c

@@ -5,7 +5,7 @@
  */
 
 #include <fcntl.h>
-#include "main.h"
+#include "eggmain.h"
 #include "proto.h"
 #include "traffic.h" /* egg_traffic_t */
 #include <limits.h>

src/rfc1459.c

@@ -24,7 +24,7 @@
  * --+ Dagmar
  */
 
-#include "main.h"
+#include "eggmain.h"
 
 int _rfc_casecmp(const char *s1, const char *s2)
 {

src/tcl.c

@@ -8,7 +8,7 @@
 
 #include <stdlib.h>		/* getenv()				*/
 #include <locale.h>		/* setlocale()				*/
-#include "main.h"
+#include "eggmain.h"
 #include <sys/stat.h>
 
 

src/tclhash.c

@@ -9,7 +9,7 @@
  *
  */
 
-#include "main.h"
+#include "eggmain.h"
 #include "chan.h"
 #include "users.h"
 #include "match.c"

src/userent.c

@@ -4,7 +4,7 @@
  *
  */
 
-#include "main.h"
+#include "eggmain.h"
 #include "users.h"
 
 extern int		 noshare, cfg_noshare, cfg_count;

src/userrec.c

@@ -7,7 +7,7 @@
  */
 
 #include <sys/stat.h>
-#include "main.h"
+#include "eggmain.h"
 #include "users.h"
 #include "chan.h"
 #include "modules.h"

src/users.c

@@ -12,7 +12,7 @@
  *
  */
 
-#include "main.h"
+#include "eggmain.h"
 #include "users.h"
 #include "chan.h"
 #include "modules.h"