* Hopefully fixed deps to use gcc/gcc3 accordingly

svn: 622

Makefile.in

@@ -13,6 +13,7 @@ VERSION = @VERSION@
 NUMVER = @NUMVER@
 PACKNAME = @PACKNAME@
 DISTRIB = @PACKNAME@-@VERSION@
+CCDEPMODE = @CCDEPMODE@
 LEAFEXEC = leaf
 HUBEXEC = hub
 DISTROFILES = config.h.in doc/ misc/ scripts/ ChangeLog Makefile.in build configure pack/ src/
@@ -41,31 +42,37 @@ CFLGS = -fno-strict-aliasing
 MAKEFLAGS = -s -j4
 
 MAKE_LEAF = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
+'CCDEPMODE=$(CCDEPMODE)' \
 'STRIP=$(STRIP)' 'CFLGS=$(CFLGS) -DLEAF' \
 'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \
 'XLIBS=$(XLIBS)' 'EGGEXEC=$(LEAFEXEC)' 'EGGBUILD=(leaf)' \
 'MODOBJS=mod/*.o' 
 
 MAKE_DLEAF = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CCDEBUG)' 'LD=$(LDDEBUG) -g' \
+'CCDEPMODE=$(CCDEPMODE)' \
 'STRIP=touch' 'CFLGS=$(DEBCFLAGS) -DLEAF $(CFLGS)' \
 'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLIBS=$(XLIBS)' \
 'EGGEXEC=$(LEAFEXEC)' 'EGGBUILD=(debug leaf)' 'MODOBJS=mod/*.o'
 
 MAKE_HUB = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
+'CCDEPMODE=$(CCDEPMODE)' \
 'STRIP=$(STRIP)' 'CFLGS=$(CFLGS) -DHUB' \
 'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \
 'XLIBS=$(XLIBS)' 'EGGEXEC=$(HUBEXEC)' 'EGGBUILD=(hub)' \
 'MODOBJS=mod/*.o'
 
 MAKE_DHUB = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CCDEBUG)' 'LD=$(LDDEBUG) -g' \
+'CCDEPMODE=$(CCDEPMODE)' \
 'STRIP=touch' 'CFLGS=$(DEBCFLAGS) -DHUB $(CFLGS)' \
 'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLIBS=$(XLIBS)' \
 'EGGEXEC=$(HUBEXEC)' 'EGGBUILD=(debug hub)' 'MODOBJS=mod/*.o'
 
 MAKE_UTILS = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CCDEBUG)' 'STRIP=touch' \
+'CCDEPMODE=$(CCDEPMODE)' \
 'CFLGS=$(DEBCFLAGS) $(CFLGS)' 'XREQS=$(XREQS)' 'XLIBS=$(XLIBS)' 'LD=$(LDDEBUG) -g'
 
 MAKE_UTILS_NR = $(MAKE) 'CC=$(CC)' 'STRIP=touch' \
+'CCDEPMODE=$(CCDEPMODE)' \
 'CFLGS=$(DEBCFLAGS) $(CFLGS)' 'XREQS=$(XREQS)' 'XLIBS=$(XLIBS)' 'LD=$(LD) -g'
 
 MAKE_CONFIG = $(MAKE) 'MAKE=$(MAKE)'

autotools/configure.ac

@@ -26,6 +26,8 @@ AC_CACHE_SAVE
 # Speedup compile
 EGG_CHECK_CCPIPE
 
+EGG_CHECK_DEPMODE
+
 # Create static binaries
 EGG_CHECK_CCSTATIC
 AC_SUBST(CCDEBUG)dnl

autotools/includes/depend.m4

@@ -1,5 +1,18 @@
 # DO_DEPS
 # ------------------------------
+
+
+dnl  EGG_CHECK_DEPMODE()
+dnl
+AC_DEFUN(EGG_CHECK_DEPMODE, [dnl
+CCDEPMODE=gcc
+num=`gcc -dumpversion | sed "s/^\\\(.\\\).*/\\\1/"`
+if test $num = "3"; then
+  CCDEPMODE=gcc3
+fi
+AC_SUBST(CCDEPMODE)dnl
+])dnl
+
 AC_DEFUN([DO_DEPS],
 [
 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"

configure

@@ -313,7 +313,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CCDEBUG SET_MAKE HEAD_1 STRIP AWK BASENAME CCACHE UNAME ZLIB SSL LIBOBJS TCLLIB TCLLIBFN TCLINC TCLINCFN TCL_REQS TCL_LIBS VERSION NUMVER PACKNAME MOD_UPDIR LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CCDEPMODE CCDEBUG SET_MAKE HEAD_1 STRIP AWK BASENAME CCACHE UNAME ZLIB SSL LIBOBJS TCLLIB TCLLIBFN TCLINC TCLINCFN TCL_REQS TCL_LIBS VERSION NUMVER PACKNAME MOD_UPDIR LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -3147,6 +3147,13 @@ echo "${ECHO_T}$egg_cv_var_ccpipe" >&6
 fi
 
 
+CCDEPMODE=gcc
+num=`gcc -dumpversion | sed "s/^\\\(.\\\).*/\\\1/"`
+if test $num = "3"; then
+  CCDEPMODE=gcc3
+fi
+
+
 # Create static binaries
 if test -z "$no_static"
 then
@@ -12980,6 +12987,7 @@ s,@EXEEXT@,$EXEEXT,;t t
 s,@OBJEXT@,$OBJEXT,;t t
 s,@CPP@,$CPP,;t t
 s,@EGREP@,$EGREP,;t t
+s,@CCDEPMODE@,$CCDEPMODE,;t t
 s,@CCDEBUG@,$CCDEBUG,;t t
 s,@SET_MAKE@,$SET_MAKE,;t t
 s,@HEAD_1@,$HEAD_1,;t t

src/Makefile.in

@@ -8,9 +8,6 @@ depcomp = /bin/sh $(top_srcdir)/autotools/depcomp
 
 @SET_MAKE@
 
-#CC = @CC@
-#LD = @CC@
-#STRIP = @STRIP@
 CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) -I$(top_srcdir)/pack @DEFS@ $(CFLGS)
 CPPFLAGS = @CPPFLAGS@
 
@@ -44,7 +41,7 @@ OBJS = auth.o \
 	userrec.o \
 	users.o
 
-MAKE_GENERIC = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' 'STRIP=$(STRIP)' 'CFLGS=$(CFLGS)'
+MAKE_GENERIC = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' 'STRIP=$(STRIP)' 'CFLGS=$(CFLGS)' 'CCDEPMODE=$(CCDEPMODE)'
 
 blah:
 	@echo ""
@@ -107,7 +104,7 @@ include ./.deps/includes
 .c.o: stringfix
 	@echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
 	@./stringfix $< _$< || cp -f $< _$<
-	@source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=gcc3 $(depcomp) \
+	@source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c _$<  -o `basename $< .c`.o
 #        $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
 

src/compat/Makefile.in

@@ -40,7 +40,7 @@ include ./.deps/includes
 
 .c.o:
 	@echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
-	@source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=gcc3 $(depcomp) \
+	@source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
 	$(CC) $(CFLAGS) -I../.. -I$(top_srcdir) -I$(top_srcdir)/src $(CPPFLAGS) -c $< 
 
 

src/mod/Makefile.in

@@ -28,6 +28,7 @@ modconfig = $(top_srcdir)/misc/modconfig --bindir=../.. \
 egg_ac_parameters = @egg_ac_parameters@
 
 MAKE_MOD = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
+'CCDEPMODE=$(CCDEPMODE)' \
 'STRIP=$(STRIP)' 'CFLAGS=$(MOD_CFLAGS)' 'CPPFLAGS=$(MOD_CPPFLAGS)' \
 'XLIBS=$(XLIBS)' 'SHELL=$(SHELL)'
 

src/mod/channels.mod/Makefile

@@ -18,7 +18,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=gcc3 $(depcomp) \
+	@source='channels.c' object='$@' depfile='.deps/channels.Po' tmpdepfile='.deps/channels.TPo' depmode=$(CCDEPMODE) $(depcomp) \
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/channels.c
 	@rm -f ../channels.o
 	@mv channels.o ../

src/mod/compress.mod/Makefile

@@ -18,7 +18,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=gcc3 $(depcomp) \
+	@source='compress.c' object='$@' depfile='.deps/compress.Po' tmpdepfile='.deps/compress.TPo' depmode=$(CCDEPMODE) $(depcomp) \
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/compress.c
 	@rm -f ../compress.o
 	@mv compress.o ../

src/mod/console.mod/Makefile

@@ -18,7 +18,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=gcc3 $(depcomp) \
+	@source='console.c' object='$@' depfile='.deps/console.Po' tmpdepfile='.deps/console.TPo' depmode=$(CCDEPMODE) $(depcomp) \
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/console.c
 	@rm -f ../console.o
 	@mv console.o ../

src/mod/ctcp.mod/Makefile

@@ -18,7 +18,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=gcc3 $(depcomp) \
+	@source='ctcp.c' object='$@' depfile='.deps/ctcp.Po' tmpdepfile='.deps/ctcp.TPo' depmode=$(CCDEPMODE) $(depcomp) \
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/ctcp.c
 	@rm -f ../ctcp.o
 	@mv ctcp.o ../

src/mod/dns.mod/Makefile.in

@@ -21,7 +21,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=gcc3 $(depcomp) \
+	 @source='dns.c' object='$@' depfile='.deps/dns.Po' tmpdepfile='.deps/dns.TPo' depmode=$(CCDEPMODE) $(depcomp) \
 	$(CC) $(CFLAGS) $(CPPFLAGS) $(RESINCLUDE) -DMAKING_MODS -c $(srcdir)/dns.c
 	@rm -f ../dns.o
 	@mv dns.o ../

src/mod/irc.mod/Makefile

@@ -19,7 +19,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=gcc3 $(depcomp) \
+	@source='irc.c' object='$@' depfile='.deps/irc.Po' tmpdepfile='.deps/irc.TPo' depmode=$(CCDEPMODE) $(depcomp) \
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/irc.c
 	@rm -f ../irc.o
 	@mv irc.o ../

src/mod/notes.mod/Makefile

@@ -18,7 +18,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=gcc3 $(depcomp) \
+	@source='notes.c' object='$@' depfile='.deps/notes.Po' tmpdepfile='.deps/notes.TPo' depmode=$(CCDEPMODE) $(depcomp) \
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/notes.c
 	@rm -f ../notes.o
 	@mv notes.o ../

src/mod/server.mod/Makefile

@@ -18,7 +18,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=gcc3 $(depcomp) \
+	@source='server.c' object='$@' depfile='.deps/server.Po' tmpdepfile='.deps/server.TPo' depmode=$(CCDEPMODE) $(depcomp) \
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/server.c
 	@rm -f ../server.o
 	@mv server.o ../

src/mod/share.mod/Makefile

@@ -18,7 +18,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=gcc3 $(depcomp) \
+	@source='share.c' object='$@' depfile='.deps/share.Po' tmpdepfile='.deps/share.TPo' depmode=$(CCDEPMODE) $(depcomp) \
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/share.c
 	@rm -f ../share.o
 	@mv share.o ../

src/mod/transfer.mod/Makefile

@@ -18,7 +18,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=gcc3 $(depcomp) \
+	@source='transfer.c' object='$@' depfile='.deps/transfer.Po' tmpdepfile='.deps/transfer.TPo' depmode=$(CCDEPMODE) $(depcomp) \
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/transfer.c
 	@rm -f ../transfer.o
 	@mv transfer.o ../

src/mod/update.mod/Makefile

@@ -18,7 +18,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=gcc3 $(depcomp) \
+	@source='update.c' object='$@' depfile='.deps/update.Po' tmpdepfile='.deps/update.TPo' depmode=$(CCDEPMODE) $(depcomp) \
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/update.c
 	@rm -f ../update.o
 	@mv update.o ../