[srvx-commits] CVS: services/src Makefile.am,1.53,1.54 main.c,1.133,1.134

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv13040/src

Modified Files:
	Makefile.am main.c 
Log Message:
unconditionally compile in modules.c, and be robust against people typing --enable-modules=mod-whatever.c


Index: Makefile.am
===================================================================
RCS file: /cvsroot/srvx/services/src/Makefile.am,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -r1.53 -r1.54
*** Makefile.am	15 Aug 2002 02:49:26 -0000	1.53
--- Makefile.am	17 Aug 2002 14:24:41 -0000	1.54
***************
*** 31,34 ****
--- 31,35 ----
  	md5.c md5.h \
  	modcmd.c modcmd.h \
+ 	modules.c modules.h \
  	nickserv.c nickserv.h \
  	opserv.c opserv.h \

Index: main.c
===================================================================
RCS file: /cvsroot/srvx/services/src/main.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -C2 -r1.133 -r1.134
*** main.c	15 Aug 2002 02:49:26 -0000	1.133
--- main.c	17 Aug 2002 14:24:42 -0000	1.134
***************
*** 54,63 ****
  #include "chanserv.h"
  #include "global.h"
- #include "opserv.h"
- #include "sockcheck.h"
  #include "helpserv.h"
- #ifdef EXTRA_MODULES
  #include "modules.h"
! #endif
  
  extern FILE *replay_file;
--- 54,61 ----
  #include "chanserv.h"
  #include "global.h"
  #include "helpserv.h"
  #include "modules.h"
! #include "opserv.h"
! #include "sockcheck.h"
  
  extern FILE *replay_file;
***************
*** 807,813 ****
      conf_globals();
      conf_rlimits();
- #ifdef EXTRA_MODULES
      modules_init();
- #endif
      modcmd_finalize();
      if (replay_file) log(MAIN_LOG, LOG_INFO, "Beginning replay...\n");
--- 805,809 ----