Fixes for port to MacOS X on Intel.

git-svn-id: http://root.cern.ch/svn/root/trunk@13907 27541ba8-7e3a-0410-8455-c3a389f83636

base/inc/RConfig.h

-/* @(#)root/base:$Name:  $:$Id: RConfig.h,v 1.84 2005/06/22 17:04:45 brun Exp $ */
+/* @(#)root/base:$Name:  $:$Id: RConfig.h,v 1.85 2005/07/29 08:44:36 brun Exp $ */
 
 /*************************************************************************
  * Copyright (C) 1995-2002, Rene Brun and Fons Rademakers.               *
@@ -254,7 +254,7 @@
 #   endif
 #endif
 
-#if defined(__MACH__) && defined(__i386__)
+#if defined(__MACH__) && defined(__i386__) && !defined(__APPLE__)
 #   define R__HURD
 #   define f2cFortran   /* cfortran.h does not know HURD - sigh */
 #   define R__UNIX
@@ -292,7 +292,7 @@
 #   define R__THROWNEWDELETE /* new/delete throw exceptions */
 #endif
 
-#if defined(__APPLE__)     /* MacOS X support, initially following FreeBSD */
+#if defined(__APPLE__)       /* MacOS X support, initially following FreeBSD */
 #   include <AvailabilityMacros.h>
 #   define R__MACOSX
 #   define R__UNIX

configure

@@ -614,7 +614,7 @@ guess_architecture () {
         openbsd*:*:*)          arch=openbsd         ;;
         lynx:*:*)              arch=lynxos          ;;
         darwin:power*:*)       arch=macosx          ;;
-        darwin:x86*:*)         arch=macosx          ;;
+        darwin:*86*:*)         arch=macosx          ;;
         irix*:sgi*:*)          arch=sgicc           ;;
         sunos:sun*:6*)         arch=solarisCC5      ;;
         sunos:sun*:5*)         arch=solarisCC5      ;;