diff --git a/base/inc/RConfig.h b/base/inc/RConfig.h
index 7cb2927ddd2ca89b3a1bf4327dc231c71b1ca71c..f785b7aa323c061a3368550ba1b3c771a81a9b97 100644
--- a/base/inc/RConfig.h
+++ b/base/inc/RConfig.h
@@ -1,4 +1,4 @@
-/* @(#)root/base:$Name:  $:$Id: RConfig.h,v 1.21 2001/05/11 17:13:09 rdm Exp $ */
+/* @(#)root/base:$Name:  $:$Id: RConfig.h,v 1.22 2001/06/25 12:54:32 rdm Exp $ */
 
 /*************************************************************************
  * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers.               *
@@ -174,7 +174,7 @@
 #   define R__LINUX
 #   define R__UNIX
 #   define NEED_SIGJMP
-#   if __GNUC_MINOR__ >= 90   /* egcs */
+#   if __GNUC__ >= 3 || __GNUC_MINOR__ >= 90   /* modern egcs/gcc */
 #      define R__PPCEGCS
 #   endif
 #endif
diff --git a/cint/Module.mk b/cint/Module.mk
index f51b210348b36856e281540cb97f6d987d9e26a8..f3874dd759570e3c8e82ea4a254965346ae92c77 100644
--- a/cint/Module.mk
+++ b/cint/Module.mk
@@ -14,11 +14,22 @@ CINTDIRM     := $(CINTDIR)/main
 CINTDIRT     := $(CINTDIR)/tool
 CINTDIRL     := $(CINTDIR)/lib
 
+##### check for gcc v3 #####
+ifeq ($(CXX),g++)
+GCCVERS      := $(shell $(CXX) -v 2>&1 | \
+                        awk '{ if ($$2 == "version") printf("%d\n",$$3) }')
+endif
+
 ##### libCint #####
 CINTH        := $(wildcard $(MODDIRI)/*.h)
 CINTS1       := $(wildcard $(MODDIRS)/*.c)
 CINTS2       := $(wildcard $(MODDIRS)/*.cxx)
 
+CINTS1       += $(CINTDIRM)/G__setup.c
+
+CINTALLO     := $(CINTS1:.c=.o) $(CINTS2:.cxx=.o)
+CINTALLDEP   := $(CINTALLO:.o=.d)
+
 CINTS1       := $(filter-out $(MODDIRS)/sunos.%,$(CINTS1))
 CINTS1       := $(filter-out $(MODDIRS)/dlfcn.%,$(CINTS1))
 CINTS1       := $(filter-out $(MODDIRS)/macos.%,$(CINTS1))
@@ -35,8 +46,6 @@ CINTS2       := $(filter-out $(MODDIRS)/bcstrm.%,$(CINTS2))
 CINTS2       := $(filter-out $(MODDIRS)/vcstrmold.%,$(CINTS2))
 CINTS2       := $(filter-out $(MODDIRS)/Apiifold.%,$(CINTS2))
 
-CINTS1       += $(CINTDIRM)/G__setup.c
-
 ifeq ($(CXX),KCC)
 CINTS2       += $(MODDIRS)/kccstrm.cxx
 else
@@ -171,12 +180,12 @@ $(IOSENUMA):    $(CINTTMP) $(MAKEINFO)
 all-cint:       $(CINTLIB) $(CINT) $(CINTTMP) $(MAKECINT) $(IOSENUM)
 
 clean-cint:
-		@rm -f $(CINTTMPO) $(CINTO) $(CINTEXEO) $(MAKECINTO)
+		@rm -f $(CINTTMPO) $(CINTALLO) $(CINTEXEO) $(MAKECINTO)
 
 clean::         clean-cint
 
 distclean-cint: clean-cint
-		@rm -f $(CINTDEP) $(CINTLIB) $(IOSENUM) $(CINTEXEDEP) \
+		@rm -f $(CINTALLDEP) $(CINTLIB) $(IOSENUM) $(CINTEXEDEP) \
 		   $(CINT) $(CINTTMP) $(MAKECINT)
 
 distclean::     distclean-cint
diff --git a/config/Makefile.linuxegcs b/config/Makefile.linuxegcs
index 80b74629eef0b1d9e745fbce35325b87f7cd410e..f454a1e60a98c826ce5c1f84d2dfac8a55c9f884 100644
--- a/config/Makefile.linuxegcs
+++ b/config/Makefile.linuxegcs
@@ -21,8 +21,6 @@ CINTCXXFLAGS  = -pipe -Wall -Woverloaded-virtual -fPIC $(EXTRA_CXXFLAGS) \
 CINTCFLAGS    = -pipe -Wall -fPIC $(EXTRA_CFLAGS) \
                 -DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
                 -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO
-GCCVERS      := $(shell $(CXX) -v 2>&1 | \
-                        awk '{ if ($$2 == "version") printf("%d\n",$$3) }')
 
 # Linker:
 LD            = g++
diff --git a/config/Makefile.linuxia64gcc b/config/Makefile.linuxia64gcc
index b505f2f4fa028bf86026fd62c0ab2bca88d466ce..02f1248ab282f2bc56f33b3915e64fd067e2d437 100644
--- a/config/Makefile.linuxia64gcc
+++ b/config/Makefile.linuxia64gcc
@@ -21,8 +21,6 @@ CINTCXXFLAGS  = -pipe -Wall -fPIC $(EXTRA_CXXFLAGS) \
 CINTCFLAGS    = -pipe -Wall -fPIC $(EXTRA_CFLAGS) \
                 -DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
                 -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__64BIT
-GCCVERS      := $(shell $(CXX) -v 2>&1 | \
-                        awk '{ if ($$2 == "version") printf("%d\n",$$3) }')
 
 # Linker:
 LD            = g++
diff --git a/rootx/src/rootx.cxx b/rootx/src/rootx.cxx
index af2edffe17567e495d27fcb4dc0b9cd43985f572..7241d8c1139ea6678d8b1b484bba45f213054635 100644
--- a/rootx/src/rootx.cxx
+++ b/rootx/src/rootx.cxx
@@ -1,4 +1,4 @@
-// @(#)root/rootx:$Name:  $:$Id: rootx.cxx,v 1.5 2001/04/06 14:17:42 rdm Exp $
+// @(#)root/rootx:$Name:  $:$Id: rootx.cxx,v 1.6 2001/06/22 16:10:21 rdm Exp $
 // Author: Fons Rademakers   19/02/98
 
 //////////////////////////////////////////////////////////////////////////
@@ -51,7 +51,7 @@
 # include <utmpx.h>
 # define STRUCT_UTMP struct utmpx
 # else
-# if defined(__linux) && defined(__powerpc) && (__GNUC_MINOR__ < 90)
+# if defined(__linux) && defined(__powerpc) && (__GNUC__ == 2) && (__GNUC_MINOR__ < 90)
    extern "C" {
 # endif
 # include <utmp.h>