Index: Changes

===================================================================
RCS file: /home/cmunk/ircsystems/cvsroot/unreal/Changes,v
retrieving revision 1.1.1.1.2.1.2.1.2.2401
diff -u -r1.1.1.1.2.1.2.1.2.2401 Changes
--- Changes	14 May 2007 19:26:07 -0000	1.1.1.1.2.1.2.1.2.2401
+++ Changes	14 May 2007 20:46:34 -0000
@@ -1695,3 +1695,8 @@
 - More cleanup - this may potentially break some OS'es, but let us catch
   this in testing
 - Fixed CommandAdd prototype a bit
+- Made autoconf detect c++ compiler, now availiable in CXX
+- Made the actual ircd be compiled by c++ compiler (linking, not source)
+- Added m_template.cpp and 'make custommodulecpp MODULEFILE=m_template'
+  ability - meaning, C++ modules for Unreal. This is mostly a proof of
+  concept, so please tell me if some OS'es break bigtime.

Changes

@@ -1695,3 +1695,8 @@ MOTDs
 - More cleanup - this may potentially break some OS'es, but let us catch
   this in testing
 - Fixed CommandAdd prototype a bit
+- Made autoconf detect c++ compiler, now availiable in CXX
+- Made the actual ircd be compiled by c++ compiler (linking, not source)
+- Added m_template.cpp and 'make custommodulecpp MODULEFILE=m_template'
+  ability - meaning, C++ modules for Unreal. This is mostly a proof of
+  concept, so please tell me if some OS'es break bigtime.

Makefile.in

@@ -20,6 +20,7 @@
 #*/
 
 CC=@CC@
+CXX=@CXX@
 INCLUDEDIR=../include
 NETWORKSDIR=
 FROMDOS=/home/cmunk/bin/4dos
@@ -132,7 +133,7 @@ MAKEARGS =	'CFLAGS=${CFLAGS}' 'CC=${CC}' 'IRCDLIBS=${IRCDLIBS}' \
 		'SHELL=${SHELL}' 'STRTOUL=${STRTOUL}' \
 		'CRYPTOLIB=${CRYPTOLIB}' \
 		'CRYPTOINCLUDES=${CRYPTOINCLUDES}' \
-		'URL=${URL}'
+		'URL=${URL}' 'CXX=${CXX}'
 
 INSTALL_CONFS = badwords.channel.conf badwords.message.conf \
 		badwords.quit.conf dccallow.conf help.conf \
@@ -144,6 +145,9 @@ INSTALL_DOCS  = doc/Authors doc/example.conf doc/coding-guidelines \
 custommodule:
 	cd src; ${MAKE} ${MAKEARGS} MODULEFILE=${MODULEFILE} 'EXLIBS=${EXLIBS}' custommodule
 
+custommodulecpp:
+	cd src; ${MAKE} ${MAKEARGS} MODULEFILE=${MODULEFILE} 'EXLIBS=${EXLIBS}' custommodulecpp
+
 server:
 build:
 	-@if [ ! -f include/setup.h ] ; then \

autoconf/configure.in

@@ -33,7 +33,7 @@ dnl to enable this without -Wall should be shot on sight.
 case "`$CC -v --help 2>&1`" in
 	*-Wpointer-sign* ) CFLAGS="$CFLAGS -Wno-pointer-sign" ;;
 esac
-
+AC_PROG_CXX 
 AC_PATH_PROG(RM,rm)
 AC_PATH_PROG(CP,cp)
 AC_PATH_PROG(TOUCH,touch)

m_template.cpp

@@ -0,0 +1,84 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/%FILE%
+ *   (C) 2005 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+extern "C"
+{
+#include "config.h"
+#include "struct.h"
+#include "common.h"
+#include "sys.h"
+#include "numeric.h"
+#include "msg.h"
+#include "proto.h"
+#include "channel.h"
+#include <time.h>
+#include <sys/stat.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef _WIN32
+#include <io.h>
+#endif
+#include <fcntl.h>
+#include "h.h"
+#ifdef STRIPBADWORDS
+#include "badwords.h"
+#endif
+#ifdef _WIN32
+#include "version.h"
+#endif
+}
+extern "C" DLLFUNC CMD_FUNC(m_COMMAND);
+
+#define MSG_UCOMMAND 	"UCOMMAND"	
+#define TOK_UCOMMAND 	"%%"	
+
+ModuleHeader MOD_HEADER(m_COMMAND)
+  = {
+	"m_COMMAND",
+	"$Id$",
+	"command /COMMAND", 
+	"3.2-b8-1",
+	NULL 
+    };
+
+extern "C" DLLFUNC int MOD_INIT(m_COMMAND)(ModuleInfo *modinfo)
+{
+	CommandAdd(modinfo->handle, MSG_UCOMMAND, TOK_UCOMMAND, m_COMMAND, MAXPARA, M_USER|M_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+extern "C" DLLFUNC int MOD_LOAD(m_COMMAND)(int module_load)
+{
+	return MOD_SUCCESS;
+}
+
+extern "C" DLLFUNC int MOD_UNLOAD(m_COMMAND)(int module_unload)
+{
+	return MOD_SUCCESS;
+}
+
+extern "C" DLLFUNC CMD_FUNC(m_COMMAND) 
+{
+	return 0;
+}
+

src/Makefile

@@ -38,7 +38,7 @@ MAKEARGS =	'CFLAGS=${CFLAGS}' 'CC=${CC}' 'IRCDLIBS=${IRCDLIBS}' \
 		'INCLUDEDIR=${INCLUDEDIR}' 'IRCDDIR=${IRCDDIR}' \
 		'MANDIR=${MANDIR}' 'RM=${RM}' 'CP=${CP}' 'TOUCH=${TOUCH}' \
 		'RES=${RES}' 'SHELL=${SHELL}' 'STRTOUL=${STRTOUL}' \
-		'CRYPTOLIB=${CRYPTOLIB}' \
+		'CRYPTOLIB=${CRYPTOLIB}' 'CXX=${CXX}' \
 		'CRYPTOINCLUDES=${CRYPTOINCLUDES}' 'URL=${URL}' \
 
 MAKE = make $(MAKEARGS)
@@ -66,10 +66,10 @@ custommodulecpp:
 	cd modules; $(MAKE) MODULEFILE=$(MODULEFILE) 'EXLIBS=$(EXLIBS)' custommodulecpp
 
 ircd: $(OBJS)
-	$(CC) $(CFLAGS) $(CRYPTOLIB) -o ircd $(OBJS) $(LDFLAGS) $(IRCDLIBS) $(CRYPTOLIB)
+	${CXX} $(CFLAGS) $(CRYPTOLIB) -o ircd $(OBJS) $(LDFLAGS) $(IRCDLIBS) $(CRYPTOLIB)
 
 staticircd: $(OBJS)
-	$(CC) $(CFLAGS) $(CRYPTOLIB) -DSTATIC_LINKING -o ircd.static $(OBJS) \
+	$(CXX) $(CFLAGS) $(CRYPTOLIB) -DSTATIC_LINKING -o ircd.static $(OBJS) \
 	modules/l_commands.c \
 	modules/m_sethost.c \
 	modules/m_chghost.c \

src/modules/Makefile.in

@@ -93,6 +93,11 @@ custommodule: $(MODULEFILE).c
 	$(CC) $(CFLAGS) $(MODULEFLAGS) $(EXLIBS) -DDYNAMIC_LINKING \
 		-o $(MODULEFILE).so $(MODULEFILE).c		
 
+custommodulecpp: $(MODULEFILE).cpp
+	$(CXX) $(CFLAGS) $(MODULEFLAGS) $(EXLIBS) -DDYNAMIC_LINKING \
+		-o $(MODULEFILE).so $(MODULEFILE).cpp		
+
+
 commands.so: l_commands.c $(COMMANDS) $(INCLUDES)
 	$(CC) $(CFLAGS) $(MODULEFLAGS) -o commands.so l_commands.c \
 	$(COMMANDS)