* C++ configure changes

svn: 1327

Makefile.in

@@ -23,21 +23,22 @@ EXCLUDES = pack/pack.cfg misc/ind doc/DEVEL src/Makefile src/compat/Makefile src
            misc/plainh misc/grep misc/cp.sh
 
 # defaults
-CC = @DISTCC@ @CC@
-LD = @DISTCC@ @CC@ @WRAP@
+CXX = @DISTCC@ @CXX@
+LD = @DISTCC@ @CXX@
 CCDEBUG = @DISTCC@ @CCDEBUG@
-LDDEBUG = @DISTCC@ @CCDEBUG@ @WRAP@
+LDDEBUG = @DISTCC@ @CCDEBUG@
 STRIP = @STRIP@
 
 #LIBS = @LIBS@ @ZLIB@ @SSL@ @RESLIB@
 LIBS = @LIBS@ @ZLIB@ @RESLIB@
 
-DEBCFLAGS = -DDEBUG_ASSERT -DDEBUG_MEM -Dinline= -fno-inline -g3 -ggdb3
-CFLGS = -fno-strict-aliasing -W -Wformat \
--Wshadow -Wnested-externs -Wno-format-y2k \
--Wlarger-than-6608 -Wpointer-arith -Wcast-align \
--Waggrepate-return -Wbad-function-cast \
--Wlong-long @GCC3@
+DEBCXXFLAGS = -DDEBUG_ASSERT -DDEBUG_MEM -Dinline= -fno-inline -g3 -ggdb3
+CFLGS = -W -Wno-unused-parameter -fpermissive -Wdisabled-optimization -Wmissing-format-attribute
+_CFLGS = -fno-strict-aliasing -W -Wformat \
+#-Wshadow -Wnested-externs -Wno-format-y2k \
+#-Wlarger-than-6608 -Wpointer-arith -Wcast-align \
+#-Waggrepate-return -Wbad-function-cast \
+#-Wlong-long @GCC3@
 
 #-Wmissing-noreturn
 #-Wunused-parameter
@@ -47,33 +48,33 @@ CFLGS = -fno-strict-aliasing -W -Wformat \
 
 MAKEFLAGS = -s -j4
 
-MAKE_LEAF = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
+MAKE_LEAF = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CXX)' 'LD=$(LD)' \
 'CCDEPMODE=$(CCDEPMODE)' \
 'STRIP=$(STRIP)' 'CFLGS=$(CFLGS) -DLEAF' \
 'LIBS=$(LIBS)' 'EGGEXEC=$(LEAFEXEC)' 'EGGBUILD=(leaf)'
 
-MAKE_DLEAF = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CCDEBUG)' 'LD=$(LDDEBUG) -g' \
+MAKE_DLEAF = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CCDEBUG)' 'LD=$(LDDEBUG) -g' \
 'CCDEPMODE=$(CCDEPMODE)' \
-'STRIP=touch' 'CFLGS=$(DEBCFLAGS) -DLEAF $(CFLGS)' \
+'STRIP=touch' 'CFLGS=$(DEBCXXFLAGS) -DLEAF $(CFLGS)' \
 'LIBS=$(LIBS)' 'EGGEXEC=$(LEAFEXEC)' 'EGGBUILD=(debug leaf)' 
 
-MAKE_HUB = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
+MAKE_HUB = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CXX)' 'LD=$(LD)' \
 'CCDEPMODE=$(CCDEPMODE)' \
 'STRIP=$(STRIP)' 'CFLGS=$(CFLGS) -DHUB' \
 'LIBS=$(LIBS)' 'EGGEXEC=$(HUBEXEC)' 'EGGBUILD=(hub)' 
 
-MAKE_DHUB = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CCDEBUG)' 'LD=$(LDDEBUG) -g' \
+MAKE_DHUB = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CCDEBUG)' 'LD=$(LDDEBUG) -g' \
 'CCDEPMODE=$(CCDEPMODE)' \
-'STRIP=touch' 'CFLGS=$(DEBCFLAGS) -DHUB $(CFLGS)' \
+'STRIP=touch' 'CFLGS=$(DEBCXXFLAGS) -DHUB $(CFLGS)' \
 'LIBS=$(LIBS)' 'EGGEXEC=$(HUBEXEC)' 'EGGBUILD=(debug hub)'
 
-MAKE_UTILS = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CCDEBUG)' 'STRIP=touch' \
+MAKE_UTILS = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CCDEBUG)' 'STRIP=touch' \
 'CCDEPMODE=$(CCDEPMODE)' \
-'CFLGS=$(DEBCFLAGS) $(CFLGS)' 'LIBS=$(LIBS)' 'LD=$(LDDEBUG) -g'
+'CFLGS=$(DEBCXXFLAGS) $(CFLGS)' 'LIBS=$(LIBS)' 'LD=$(LDDEBUG) -g'
 
-MAKE_UTILS_NR = $(MAKE) 'CC=$(CC)' 'STRIP=touch' \
+MAKE_UTILS_NR = $(MAKE) 'CXX=$(CXX)' 'STRIP=touch' \
 'CCDEPMODE=$(CCDEPMODE)' \
-'CFLGS=$(DEBCFLAGS) $(CFLGS)' 'LIBS=$(LIBS)' 'LD=$(LD) -g'
+'CFLGS=$(DEBCXXFLAGS) $(CFLGS)' 'LIBS=$(LIBS)' 'LD=$(LD) -g'
 
 MAKE_CONFIG = $(MAKE) 'MAKE=$(MAKE)'
 

autotools/configure.ac

@@ -13,7 +13,10 @@ EGG_SAVE_PARAMETERS
 
 # Setup build environment
 dnl Search for newer gcc versions before older
-AC_PROG_CC([gcc34 gcc33 gcc3 gcc-3.4 gcc-3.3 gcc cc c1])
+#AC_REQUIRE_CPP
+AC_LANG(C++)
+AC_PROG_CXX
+dnl AC_PROG_CC([gcc34 gcc33 gcc3 gcc-3.4 gcc-3.3 gcc cc c1])
 EGG_CHECK_CC
 
 # Crazy machines
@@ -90,13 +93,13 @@ AC_TYPE_SIZE_T
 AC_TYPE_UID_T
 
 
-AC_C_CONST
+#AC_C_CONST
 AC_C_VOLATILE
 AC_C_BIGENDIAN
-AC_C_INLINE
+#AC_C_INLINE
 AC_C_CHAR_UNSIGNED
-AC_C_STRINGIZE
-AC_C_PROTOTYPES
+#AC_C_STRINGIZE
+#AC_C_PROTOTYPES
 
 #checkpoint
 AC_CACHE_SAVE 
@@ -107,7 +110,6 @@ AC_CHECK_SIZEOF(long, 0)
 AC_CHECK_SIZEOF(long long,0)
 
 
-AC_PROG_GCC_TRADITIONAL
 AC_STRUCT_TIMEZONE
 AC_STRUCT_TM
 
@@ -148,7 +150,7 @@ EGG_HEADER_STDC
 AC_CACHE_SAVE 
 
 EGG_SUBST_VERSION
-FIND_WRAPS
+#FIND_WRAPS
 EGG_SUBST_MOD_UPDIR
 DO_DEPS
 

autotools/includes/acinclude.m4

@@ -18,8 +18,8 @@ EOF
   exit 1
 fi
 
-if test -n "$GCC"; then
-  CFLAGS="$CFLAGS -O3"
+if test -n "$GXX"; then
+  CXXFLAGS="$CXXFLAGS -O3"
 fi
 
 ])dnl
@@ -83,10 +83,10 @@ dnl which speeds up the compilation.
 dnl
 AC_DEFUN([EGG_CHECK_CCPIPE],
 [
-  if test -n "$GCC" && test -z "$no_pipe"; then
+  if test -n "$GXX" && test -z "$no_pipe"; then
     AC_CACHE_CHECK([whether the compiler understands -pipe], egg_cv_var_ccpipe, [
-        ac_old_CC="$CC"
-        CC="$CC -pipe"
+        ac_old_CXX="$CXX"
+        CXX="$CXX -pipe"
         AC_COMPILE_IFELSE([[
           int main ()
           {
@@ -97,11 +97,11 @@ AC_DEFUN([EGG_CHECK_CCPIPE],
         ], [
           egg_cv_var_ccpipe="no"
         ])
-        CC="$ac_old_CC"
+        CXX="$ac_old_CXX"
     ])
 
     if test "$egg_cv_var_ccpipe" = "yes"; then
-      CC="$CC -pipe"
+      CXX="$CXX -pipe"
     fi
   fi
 ])
@@ -112,10 +112,10 @@ dnl See if the compiler supports -Wall.
 dnl
 AC_DEFUN([EGG_CHECK_CCWALL],
 [
-  if test -n "$GCC" && test -z "$no_wall"; then
+  if test -n "$GXX" && test -z "$no_wall"; then
     AC_CACHE_CHECK([whether the compiler understands -Wall], egg_cv_var_ccwall, [
-      ac_old_CFLAGS="$CFLAGS"
-      CFLAGS="$CFLAGS -Wall"
+      ac_old_CXXFLAGS="$CXXFLAGS"
+      CXXFLAGS="$CXXFLAGS -Wall"
        AC_COMPILE_IFELSE([[
          int main ()
          {
@@ -126,11 +126,11 @@ AC_DEFUN([EGG_CHECK_CCWALL],
        ], [
          egg_cv_var_ccwall="no"
        ])
-      CFLAGS="$ac_old_CFLAGS"
+      CXXFLAGS="$ac_old_CXXFLAGS"
     ])
 
     if test "$egg_cv_var_ccwall" = "yes"; then
-      CFLAGS="$CFLAGS -Wall"
+      CXXFLAGS="$CXXFLAGS -Wall"
     fi
   fi
 ])
@@ -141,19 +141,19 @@ dnl  Checks whether the compiler supports the `-static' flag.
 AC_DEFUN(EGG_CHECK_CCSTATIC, [dnl
 if test -z "$no_static"
 then
-  if test -n "$GCC"
+  if test -n "$GXX"
   then
     AC_CACHE_CHECK(whether the compiler understands -static, egg_cv_var_ccstatic, [dnl
-      ac_old_CC="$CC"
-      CC="$CC -static"
+      ac_old_CXX="$CXX"
+      CXX="$CXX -static"
       AC_TRY_COMPILE(,, egg_cv_var_ccstatic="yes", egg_cv_var_ccstatic="no")
-      CC="$ac_old_CC"
+      CXX="$ac_old_CXX"
       
     ])
     if test "$egg_cv_var_ccstatic" = "yes"
     then
-      CCDEBUG="$CC"
-      CC="$CC -static"
+      CCDEBUG="$CXX"
+      CXX="$CXX -static"
     else
       cat << 'EOF' >&2
 configure: error:
@@ -266,7 +266,7 @@ case "$egg_cv_var_system_type" in
   ;;
   CYGWI*)
     AC_PROG_CC_WIN32
-    CC="$CC $WIN32FLAGS"
+    CXX="$CXX $WIN32FLAGS"
     EGG_CYGWIN="yes"
     EGG_CYGWIN_BINMODE
     AC_DEFINE(CYGWIN_HACKS, 1, [Define if running under cygwin])
@@ -590,9 +590,9 @@ AC_MSG_RESULT([present by default])
 dnl try -mwin32
 ac_compile_save="$ac_compile"
 dnl we change CC so config.log looks correct
-save_CC="$CC"
+save_CXX="$CXX"
 ac_compile="$ac_compile -mwin32"
-CC="$CC -mwin32"
+CXX="$CXX -mwin32"
 AC_TRY_COMPILE(,[
 #ifndef WIN32
 # ifndef _WIN32
@@ -602,11 +602,11 @@ AC_TRY_COMPILE(,[
 dnl found windows.h using -mwin32
 AC_MSG_RESULT([found via -mwin32])
 ac_compile="$ac_compile_save"
-CC="$save_CC"
+CXX="$save_CC"
 WIN32FLAGS="-mwin32"
 ], [
 ac_compile="$ac_compile_save"
-CC="$save_CC"
+CXX="$save_CC"
 AC_MSG_RESULT([not found])
 ])
 ])

autotools/includes/depend.m4

@@ -6,7 +6,7 @@ dnl  EGG_CHECK_DEPMODE()
 dnl
 AC_DEFUN(EGG_CHECK_DEPMODE, [dnl
 CCDEPMODE=gcc
-num=`$CC -dumpversion | sed "s/^\\\(.\\\).*/\\\1/"`
+num=`$CXX -dumpversion | sed "s/^\\\(.\\\).*/\\\1/"`
 if test $num = "3"; then
   CCDEPMODE=gcc3
 #  GCC3="-Wpadded -Wpacked -Wno-unused-parameter -Wmissing-format-attribute -Wdisabled-optimization"

config.h.in

@@ -132,9 +132,6 @@
 /* Define to 1 if you have the `strftime' function. */
 #undef HAVE_STRFTIME
 
-/* Define to 1 if cpp supports the ANSI # stringizing operator. */
-#undef HAVE_STRINGIZE
-
 /* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 
@@ -236,9 +233,6 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Define to 1 if the C compiler supports function prototypes. */
-#undef PROTOTYPES
-
 /* The size of a `int', as computed by sizeof. */
 #undef SIZEOF_INT
 
@@ -298,21 +292,9 @@
 # undef __CHAR_UNSIGNED__
 #endif
 
-/* Define like PROTOTYPES; this can be used by system headers. */
-#undef __PROTOTYPES
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
 /* Define to `int' if <sys/types.h> doesn't define. */
 #undef gid_t
 
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#undef inline
-#endif
-
 /* Define to rpl_malloc if the replacement function should be used. */
 #undef malloc
 

src/Makefile.in

@@ -8,7 +8,7 @@ depcomp = /bin/sh $(top_srcdir)/autotools/depcomp
 
 @SET_MAKE@
 
-CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) -I$(top_srcdir)/pack @DEFS@ $(CFLGS)
+CXXFLAGS = @CXXFLAGS@ -I.. -I$(top_srcdir) -I$(top_srcdir)/pack @DEFS@ $(CFLGS)
 CPPFLAGS = @CPPFLAGS@
 
 OBJCOPY = @OBJCOPY@
@@ -59,7 +59,7 @@ MODOBJS = mod/channels.o \
         mod/update.o
 
 
-MAKE_GENERIC = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' 'STRIP=$(STRIP)' 'CFLGS=$(CFLGS)' 'CCDEPMODE=$(CCDEPMODE)'
+MAKE_GENERIC = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CXX)' 'LD=$(LD)' 'STRIP=$(STRIP)' 'CFLGS=$(CFLGS)' 'CCDEPMODE=$(CCDEPMODE)'
 
 blah:
 	@echo ""
@@ -68,22 +68,22 @@ blah:
 
 makeres: makeres.c
 	@echo -e "Compiling: \033[1mmakeres\033[0m"
-	@$(CC) $(CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) makeres.c -o makeres
+	@$(CXX) $(CXXFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) makeres.c -o makeres
 	@$(STRIP) makeres
 
 makehelp: makehelp.c
 	@echo -e "Compiling: \033[1mmakehelp\033[0m"
-	@$(CC) $(CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) makehelp.c -o makehelp
+	@$(CXX) $(CXXFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) makehelp.c -o makehelp
 	@$(STRIP) makehelp
 
 sorthelp: sorthelp.c
 	@echo -e "Compiling: \033[1msorthelp\033[0m"
-	@$(CC) $(CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) sorthelp.c -o sorthelp
+	@$(CXX) $(CXXFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) sorthelp.c -o sorthelp
 	@$(STRIP) sorthelp
 
 stringfix: stringfix.c common.h ../config.h eggdrop.h
 	@echo -e "Compiling: \033[1mstringfix\033[0m"
-	@$(CC) $(CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) stringfix.c -o stringfix
+	@$(CXX) $(CXXFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) stringfix.c -o stringfix
 	@$(STRIP) stringfix
 
 ../$(EGGEXEC): build_msg $(OBJS) mycrypto compatability
@@ -122,7 +122,7 @@ include ./.deps/includes
 	@echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
 	@./stringfix $< _$< || cp -f $< _$<
 	@source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c _$<  -o `basename $< .c`.o
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c _$<  -o `basename $< .c`.o
 #        $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
 
 

src/compat/Makefile.in

@@ -8,10 +8,10 @@ depcomp = /bin/sh $(top_srcdir)/autotools/depcomp
 
 @SET_MAKE@
 
-CC = @CC@
-LD = @CC@
+CXX = @CXX@
+LD = @CXX@
 STRIP = @STRIP@
-CFLAGS = @CFLAGS@ -I../.. -I$(top_srcdir) -I$(top_srcdir)/src @DEFS@ $(CFLGS)
+CXXFLAGS = @CXXFLAGS@ -I../.. -I$(top_srcdir) -I$(top_srcdir)/src @DEFS@ $(CFLGS)
 CPPFLAGS = @CPPFLAGS@
 
 OBJS = dirname.o \
@@ -43,7 +43,7 @@ include ./.deps/includes
 .c.o:
 	@echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
 	@source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CC) $(CFLAGS) -I../.. -I$(top_srcdir) -I$(top_srcdir)/src $(CPPFLAGS) -c $< 
+	$(CXX) $(CXXFLAGS) -I../.. -I$(top_srcdir) -I$(top_srcdir)/src $(CPPFLAGS) -c $< 
 
 
 #safety hash

src/compat/memutil.c

@@ -3,50 +3,6 @@
 #include "memcpy.h"
 #include "src/main.h"
 
-/*
-extern void * __real_malloc(size_t);
-extern void * __real_realloc(void *, size_t);
-
-void *
-__wrap_malloc(size_t size)
-{
-  void *x = NULL;
-
-  x = (void *) __real_malloc(size);
-  if (x == NULL)
-    fatal("Memory allocation failed", 0);
-
-  return x;
-}
-
-void *
-__wrap_realloc(void *ptr, size_t size)
-{
-  void *x = NULL;
-
-  if (ptr == NULL)
-    return malloc(size);
-
-  x = (void *) __real_realloc(ptr, size);
-  if (x == NULL && size > 0)
-    fatal("Memory re-allocation failed", 0);
-
-  return x;
-}
-
-void *
-__wrap_calloc(size_t nmemb, size_t size)
-{
-  void *x = NULL;
-
-  x = (void *) malloc(nmemb * size);
-  if (x)
-    egg_bzero(x, nmemb * size);
-
-  return x;
-}
-*/
-
 void 
 str_redup(char **str, const char *newstr)
 {
@@ -63,11 +19,11 @@ str_redup(char **str, const char *newstr)
 }
 
 char *
-__wrap_strdup(const char *entry)
+strdup(const char *entry)
 {
-  char *target = (char*)calloc(1, strlen(entry) + 1);
-  if (target == 0) return 0;
-  strcpy(target, entry);
-  return target;
+  size_t len = strlen(entry) + 1;
+  char *target = (char *) calloc(1, len);
+  if (target == NULL) return NULL;
+  return (char *) egg_memcpy(target, entry, len);
 }
 

src/compat/memutil.h

@@ -1,21 +1,10 @@
 #ifndef _MEMUTIL_H
 #define _MEMUTIL_H
 
-/*
-#undef malloc
-#undef realloc
-#undef calloc
-void *malloc(size_t);
-void *realloc(void *, size_t);
-void *calloc(size_t, size_t);
-*/
-
-#ifdef str_redup
 #undef str_redup
-#endif /* str_redup */
 #undef strdup
 
 void str_redup(char **, const char *);
-char *strdup(const char *);
+char * strdup(const char *);
 
 #endif /* !_MEMUTIL_H */

src/crypto/Makefile.in

@@ -3,10 +3,10 @@ top_srcdir = @top_srcdir@
 srcdir = @srcdir@
 
 SHELL = @SHELL@
-CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) -I$(top_srcdir)/pack @DEFS@ $(CFLGS)
+CXXFLAGS = @CXXFLAGS@ -I.. -I$(top_srcdir) -I$(top_srcdir)/pack @DEFS@ $(CFLGS)
 CPPFLAGS = @CPPFLAGS@
-CC = @CC@
-LD = @CC@
+CXX = @CXX@
+LD = @CXX@
 STRIP = @STRIP@
 
 VPATH = @srcdir@
@@ -38,7 +38,7 @@ include ./.deps/includes
 .c.o:
 	@echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
 	@source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CC) $(CFLAGS) -I../.. -I$(top_srcdir) -I$(top_srcdir)/src $(CPPFLAGS) -c $<
+	$(CXX) $(CXXFLAGS) -I../.. -I$(top_srcdir) -I$(top_srcdir)/src $(CPPFLAGS) -c $<
 
 
 

src/mod/Makefile.in

@@ -8,12 +8,12 @@ MOD_UPDIR = @MOD_UPDIR@
 
 @SET_MAKE@
 
-CC = @CC@
-LD = @CC@
+CXX = @CXX@
+LD = @CXX@
 STRIP = @STRIP@
-CFLAGS = @CFLAGS@ -I../.. -I$(top_srcdir) @DEFS@ $(CFLGS)
+CXXFLAGS = @CXXFLAGS@ -I../.. -I$(top_srcdir) @DEFS@ $(CFLGS)
 CPPFLAGS = @CPPFLAGS@
-MOD_CFLAGS = @CFLAGS@ -I. -I../../.. -I$(MOD_UPDIR)$(top_srcdir) \
+MOD_CXXFLAGS = @CXXFLAGS@ -I. -I../../.. -I$(MOD_UPDIR)$(top_srcdir) \
   -I$(MOD_UPDIR)$(top_srcdir)/src/mod -I$(top_srcdir)/pack @DEFS@ $(CFLGS)
 MOD_CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
@@ -43,9 +43,9 @@ mod_objs = channels.mod_o \
 
 egg_ac_parameters = @egg_ac_parameters@
 
-MAKE_MOD = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
+MAKE_MOD = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CXX)' 'LD=$(LD)' \
 'CCDEPMODE=$(CCDEPMODE)' \
-'STRIP=$(STRIP)' 'CFLAGS=$(MOD_CFLAGS)' 'CPPFLAGS=$(MOD_CPPFLAGS)' \
+'STRIP=$(STRIP)' 'CXXFLAGS=$(MOD_CXXFLAGS)' 'CPPFLAGS=$(MOD_CPPFLAGS)' \
 'LIBS=$(LIBS)' 'SHELL=$(SHELL)'
 
 

src/mod/channels.mod/Makefile

@@ -19,7 +19,7 @@ static: ../channels.o
 ../channels.o:
 	@echo -e "Compiling: \033[1mchannels\033[0m"
 	@source='channels.c' object='$@' depfile='.deps/channels.Po' tmpdepfile='.deps/channels.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/channels.c
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/channels.c
 	@rm -f ../channels.o
 	@mv channels.o ../
 

src/mod/compress.mod/Makefile

@@ -19,7 +19,7 @@ static: ../compress.o
 ../compress.o:
 	@echo -e "Compiling: \033[1mcompress\033[0m"
 	@source='compress.c' object='$@' depfile='.deps/compress.Po' tmpdepfile='.deps/compress.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/compress.c
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/compress.c
 	@rm -f ../compress.o
 	@mv compress.o ../
 

src/mod/console.mod/Makefile

@@ -19,7 +19,7 @@ static: ../console.o
 ../console.o:
 	@echo -e "Compiling: \033[1mconsole\033[0m"
 	@source='console.c' object='$@' depfile='.deps/console.Po' tmpdepfile='.deps/console.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/console.c
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/console.c
 	@rm -f ../console.o
 	@mv console.o ../
 

src/mod/ctcp.mod/Makefile

@@ -19,7 +19,7 @@ static: ../ctcp.o
 ../ctcp.o:
 	@echo -e "Compiling: \033[1mctcp\033[0m"
 	@source='ctcp.c' object='$@' depfile='.deps/ctcp.Po' tmpdepfile='.deps/ctcp.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/ctcp.c
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/ctcp.c
 	@rm -f ../ctcp.o
 	@mv ctcp.o ../
 

src/mod/dns.mod/Makefile.in

@@ -20,7 +20,7 @@ static: ../dns.o
 ../dns.o:
 	@echo -e "Compiling: \033[1mdns\033[0m"
 	 @source='dns.c' object='$@' depfile='.deps/dns.Po' tmpdepfile='.deps/dns.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CC) $(CFLAGS) $(CPPFLAGS) $(RESINCLUDE) -c $(srcdir)/dns.c
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(RESINCLUDE) -c $(srcdir)/dns.c
 	@rm -f ../dns.o
 	@mv dns.o ../
 

src/mod/irc.mod/Makefile

@@ -20,7 +20,7 @@ static: ../irc.o
 ../irc.o:
 	@echo -e "Compiling: \033[1mirc\033[0m"
 	@source='irc.c' object='$@' depfile='.deps/irc.Po' tmpdepfile='.deps/irc.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/irc.c
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/irc.c
 	@rm -f ../irc.o
 	@mv irc.o ../
 

src/mod/notes.mod/Makefile

@@ -19,7 +19,7 @@ static: ../notes.o
 ../notes.o:
 	@echo -e "Compiling: \033[1mnotes\033[0m"
 	@source='notes.c' object='$@' depfile='.deps/notes.Po' tmpdepfile='.deps/notes.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/notes.c
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/notes.c
 	@rm -f ../notes.o
 	@mv notes.o ../
 

src/mod/server.mod/Makefile

@@ -19,7 +19,7 @@ static: ../server.o
 ../server.o:
 	@echo -e "Compiling: \033[1mserver\033[0m"
 	@source='server.c' object='$@' depfile='.deps/server.Po' tmpdepfile='.deps/server.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/server.c
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/server.c
 	@rm -f ../server.o
 	@mv server.o ../
 

src/mod/share.mod/Makefile

@@ -19,7 +19,7 @@ static: ../share.o
 ../share.o:
 	@echo -e "Compiling: \033[1mshare\033[0m"
 	@source='share.c' object='$@' depfile='.deps/share.Po' tmpdepfile='.deps/share.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/share.c
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/share.c
 	@rm -f ../share.o
 	@mv share.o ../
 

src/mod/transfer.mod/Makefile

@@ -19,7 +19,7 @@ static: ../transfer.o
 ../transfer.o:
 	@echo -e "Compiling: \033[1mtransfer\033[0m"
 	@source='transfer.c' object='$@' depfile='.deps/transfer.Po' tmpdepfile='.deps/transfer.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/transfer.c
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/transfer.c
 	@rm -f ../transfer.o
 	@mv transfer.o ../
 

src/mod/update.mod/Makefile

@@ -19,7 +19,7 @@ static: ../update.o
 ../update.o:
 	@echo -e "Compiling: \033[1mupdate\033[0m"
 	@source='update.c' object='$@' depfile='.deps/update.Po' tmpdepfile='.deps/update.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/update.c
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/update.c
 	@rm -f ../update.o
 	@mv update.o ../