diff --git a/ChangeLog b/ChangeLog
index 2dc325a7a..b826b4887 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-10-03  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Version: Bump to version for next release.
+	* configure.ac: Check for utsname
+	* configure: Regenerate
+	* Headers/Additions/GNUstepBase/config.h.in: Regenerate
+	* Headers/Foundation/NSObject.h: Small documentaion improvement
+	* Headers/Foundation/NSProcessInfo.h: Add documentation and update.
+	* Source/NSProcessInfo.m: Moved documentation to header, clean up
+	and complete operating system code.
+	* Testing/nsprocessinfo.m: Trivial test updates.  Avoid use of cString
+
 2006-10-02  Nicola Pero <nicola.pero@meta-innovation.com>
 
 	More work on having the default flattened gnustep build with just
diff --git a/Headers/Additions/GNUstepBase/config.h.in b/Headers/Additions/GNUstepBase/config.h.in
index 642748fd9..942326052 100644
--- a/Headers/Additions/GNUstepBase/config.h.in
+++ b/Headers/Additions/GNUstepBase/config.h.in
@@ -330,6 +330,9 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
+/* Define to 1 if you have the <sys/utsname.h> header file. */
+#undef HAVE_SYS_UTSNAME_H
+
 /* Define to 1 if you have the <sys/vfs.h> header file. */
 #undef HAVE_SYS_VFS_H
 
@@ -414,25 +417,25 @@
 /* Define to 1 if the `setpgrp' function takes no argument. */
 #undef SETPGRP_VOID
 
-/* The size of a `double', as computed by sizeof. */
+/* The size of `double', as computed by sizeof. */
 #undef SIZEOF_DOUBLE
 
-/* The size of a `float', as computed by sizeof. */
+/* The size of `float', as computed by sizeof. */
 #undef SIZEOF_FLOAT
 
-/* The size of a `int', as computed by sizeof. */
+/* The size of `int', as computed by sizeof. */
 #undef SIZEOF_INT
 
-/* The size of a `long', as computed by sizeof. */
+/* The size of `long', as computed by sizeof. */
 #undef SIZEOF_LONG
 
-/* The size of a `long long', as computed by sizeof. */
+/* The size of `long long', as computed by sizeof. */
 #undef SIZEOF_LONG_LONG
 
-/* The size of a `short', as computed by sizeof. */
+/* The size of `short', as computed by sizeof. */
 #undef SIZEOF_SHORT
 
-/* The size of a `void*', as computed by sizeof. */
+/* The size of `void*', as computed by sizeof. */
 #undef SIZEOF_VOIDP
 
 /* Define to 1 if you have the ANSI C header files. */
@@ -460,5 +463,5 @@
 #undef inline
 #endif
 
-/* Define to `unsigned' if <sys/types.h> does not define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
diff --git a/Headers/Foundation/NSObject.h b/Headers/Foundation/NSObject.h
index 803fe3998..1808bc801 100644
--- a/Headers/Foundation/NSObject.h
+++ b/Headers/Foundation/NSObject.h
@@ -114,8 +114,10 @@ extern "C" {
   (!defined(GS_OPENSTEP_V) || (GS_OPENSTEP_V >= ADD && GS_OPENSTEP_V < REM))
 
 /**
- * A constant to represent a feature which is not present in any version.
- * Use this to say a feature is not present in an API.<br />
+ * A constant which is the lowest possible version number (0) so that
+ * when used as the removal version (second argument of the GS_API_VERSION
+ * or OS_API_VERSION macro) represents a feature which is not present in
+ * any version.<br />
  * eg.<br />
  * #if <ref type="macro" id="OS_API_VERSION">OS_API_VERSION</ref>
  * (GS_API_NONE, GS_API_NONE)<br />
diff --git a/Headers/Foundation/NSProcessInfo.h b/Headers/Foundation/NSProcessInfo.h
index c9c952ff3..3fbadf96b 100644
--- a/Headers/Foundation/NSProcessInfo.h
+++ b/Headers/Foundation/NSProcessInfo.h
@@ -39,12 +39,14 @@ extern "C" {
 @class NSData;
 @class NSMutableSet;
 
-#ifndef	STRICT_OPENSTEP
-/*
- * Constants returned by -operatingSystem
+#if OS_API_VERSION(GS_API_MACOSX,GS_API_LATEST)
+
+/**
+ * Constants returned by the -operatingSystem method.
  * NB. The presence of a constant in this list does *NOT* imply that
  * the named operating system is supported.  Some values are provided
- * for MacOS-X compatibility only.
+ * for MacOS-X compatibility or are obsolete and provided for
+ * backward compatibility.
  */
 enum {
   NSWindowsNTOperatingSystem = 1,
@@ -54,52 +56,200 @@ enum {
   NSMACHOperatingSystem,
   NSSunOSOperatingSystem,
   NSOSF1OperatingSystem,
-  NSGNULinuxOperatingSystem = 100,
-  NSBSDOperatingSystem,
-  NSBeOperatingSystem,
-  NSCygwinOperatingSystem
+#if OS_API_VERSION(GS_API_NONE,GS_API_NONE)
+  GSGNULinuxOperatingSystem = 100,
+  GSBSDOperatingSystem,
+  GSBeOperatingSystem,
+  GSCygwinOperatingSystem
+
+#if GS_API_VERSION(0,011500)
+// Defines of deprecated constants for backward compatibility
+#define	NSGNULinuxOperatingSystem	GSGNULinuxOperatingSystem
+#define	NSBSDOperatingSystem		GSBSDOperatingSystem
+#define	NSBeOperatingSystem		GSBeOperatingSystem
+#define	NSCygwinOperatingSystem		GSCygwinOperatingSystem
+#endif	/* GS_API_VERSION(0,011500) */
+
+#endif	/* OS_API_VERSION(GS_API_NONE,GS_API_NONE) */
 };
-#endif
+#endif	/* OS_API_VERSION(GS_API_MACOSX,GS_API_LATEST) */
 
 
 @interface NSProcessInfo: NSObject
 
+/**
+ * Returns the shared NSProcessInfo object for the current process.
+ */
 + (NSProcessInfo*) processInfo;
 
+/**
+ * Returns an array containing the arguments supplied to start this
+ * process.<br />
+ * NB. In GNUstep, any arguments of the form --GNU-Debug=...
+ * are <em>not</em> included in this array ... they are part of the
+ * debug mechanism, and are hidden so that setting debug variables
+ * will not effect the normal operation of the program.<br />
+ * Please note, the special <code>--GNU-Debug=...</code> syntax differs from
+ * that which is used to specify values for the [NSUserDefaults] system.<br />
+ * User defaults are set on the command line by specifying the default name
+ * (with a leading hyphen) as one argument, and the default value as the
+ * following argument.  The arguments used to set user defaults are
+ * present in the array returned by this method.
+ */
 - (NSArray*) arguments;
+
+/**
+ * Returns a dictionary giving the environment variables which were
+ * provided for the process to use.
+ */
 - (NSDictionary*) environment;
+
+/**
+ * Returns a string which may be used as a globally unique identifier.<br />
+ * The string contains the host name, the process ID, a timestamp and a
+ * counter.<br />
+ * The first three values identify the process in which the string is
+ * generated, while the fourth ensures that multiple strings generated
+ * within the same process are unique.
+ */
 - (NSString*) globallyUniqueString;
+
+/**
+ * Returns the name of the machine on which this process is running.
+ */
 - (NSString*) hostName;
-#ifndef	STRICT_OPENSTEP
+
+#if OS_API_VERSION(GS_API_MACOSX,GS_API_LATEST)
+
+/**
+ * Return a number representing the operating system type.<br />
+ * The known types are listed in the header file, but not all of the
+ * listed types are actually implemented ... some are present for
+ * MacOS-X compatibility only.<br />
+ * <list>
+ * <item>NSWindowsNTOperatingSystem - used for Windows NT, and later</item>
+ * <item>NSWindows95OperatingSystem - probably never to be implemented</item>
+ * <item>NSSolarisOperatingSystem - used for Sun Solaris</item>
+ * <item>NSHPUXOperatingSystem - used for HP/UX</item>
+ * <item>NSMACHOperatingSystem - MacOSX and perhaps Hurd in future?</item>
+ * <item>NSSunOSOperatingSystem - Used for Sun Sun/OS</item>
+ * <item>NSOSF1OperatingSystem - Used for OSF/1 (probably obsolete)</item>
+ * <item>GSGNULinuxOperatingSystem - the GNUstep 'standard'</item>
+ * <item>GSBSDOperatingSystem - BSD derived operating systems</item>
+ * <item>GSBeperatingSystem - Used for Be-OS (probably obsolete)</item>
+ * <item>GSCygwinOperatingSystem - cygwin unix-like environment</item>
+ * </list>
+ */
 - (unsigned int) operatingSystem;
+
+/**
+ * Return a human readable string representing the operating system type.<br />
+ * The supported types are -
+ * <list>
+ * <item>NSWindowsNTOperatingSystem - used for Windows NT, and later</item>
+ * <item>NSWindows95OperatingSystem - probably never to be implemented</item>
+ * <item>NSSolarisOperatingSystem - used for Sun Solaris</item>
+ * <item>NSHPUXOperatingSystem - used for HP/UX</item>
+ * <item>NSMACHOperatingSystem - MacOSX and perhaps Hurd in future?</item>
+ * <item>NSSunOSOperatingSystem - Used for Sun Sun/OS</item>
+ * <item>NSOSF1OperatingSystem - Used for OSF/1 (probably obsolete)</item>
+ * <item>GSGNULinuxOperatingSystem - the GNUstep 'standard'</item>
+ * <item>GSBSDOperatingSystem - BSD derived operating systems</item>
+ * <item>GSBeperatingSystem - Used for Be-OS (probably obsolete)</item>
+ * <item>GSCygwinOperatingSystem - cygwin unix-like environment</item>
+ * </list>
+ */
 - (NSString*) operatingSystemName;
+
+/**
+ * Returns a human readable version string for the current operating system
+ * version.
+ */
+#if OS_API_VERSION(100200,GS_API_LATEST)
+- (NSString *) operatingSystemVersionString;
+#endif
+
+/**
+ * Returns the process identifier number which uniquely identifies
+ * this process on this machine.
+ */
 - (int) processIdentifier;
 #endif
+
+/**
+ * Returns the process name for this process. This may have been set using
+ * the -setProcessName: method, or may be the default process name (the
+ * file name of the binary being executed).
+ */
 - (NSString*) processName;
 
+/**
+ * Change the name of the current process to newName.
+ */
 - (void) setProcessName: (NSString*)newName;
 
 @end
 
-#ifndef	NO_GNUSTEP
+#if OS_API_VERSION(GS_API_NONE,GS_API_NONE)
 
+/**
+ * Provides GNUstep-specific methods for controlled debug logging (a GNUstep
+ * facility) and an internal/developer-related method.
+ */
 @interface	NSProcessInfo (GNUstep)
+
+/**
+ * Returns a indication of whether debug logging is enabled.
+ * This returns YES unless a call to -setDebugLoggingEnabled: has
+ * been used to turn logging off.
+ */
 - (BOOL) debugLoggingEnabled;
+
+/**
+ * This method returns a set of debug levels set using the
+ * --GNU-Debug=... command line option and/or the GNU-Debug
+ * user default.<br />
+ * You can modify this set to change the debug logging under
+ * your programs control ... but such modifications are not
+ * thread-safe.
+ */
 - (NSMutableSet*) debugSet;
+
+/**
+ * This method permits you to turn all debug logging on or off
+ * without modifying the set of debug levels in use.
+ */
 - (void) setDebugLoggingEnabled: (BOOL)flag;
+
+/**
+ * Set the file to which NSLog output should be directed.<br />
+ * Returns YES on success, NO on failure.<br />
+ * By default logging goes to standard error.
+ */
 - (BOOL) setLogFile: (NSString*)path;
+
+/**
+ * Fallback/override method. The developer must call this method to initialize
+ * the NSProcessInfo system if none of the system-specific hacks to
+ * auto-initialize it are working.<br />
+ * It is also safe to call this method to override the effects
+ * of the automatic initialisation, which some applications may need
+ * to do when using GNUstep libraries embeddedm within other frameworks.
+ */
 + (void) initializeWithArguments: (char**)argv
                            count: (int)argc
                      environment: (char**)env;
 @end
 
-/*
- * This function determines if the specified debug level is present in the
- * set of active debug levels.
+/**
+ * Function for rapid testing to see if a debug level is set.<br />
+ * This is used by the debugging macros.<br />
+ * If debug logging has been turned off, this returns NO even if
+ * the specified level exists in the set of debug levels.
  */
 GS_EXPORT BOOL GSDebugSet(NSString *level);
 
-#endif
+#endif	/* GS_API_NONE */
 
 #if	defined(__cplusplus)
 }
diff --git a/Source/NSProcessInfo.m b/Source/NSProcessInfo.m
index 50411bc12..d1925a6b2 100644
--- a/Source/NSProcessInfo.m
+++ b/Source/NSProcessInfo.m
@@ -71,6 +71,9 @@
 #ifdef HAVE_SYS_FCNTL_H
 #include <sys/fcntl.h>
 #endif
+#ifdef HAVE_SYS_UTSNAME_H
+#include <sys/utsname.h>
+#endif
 
 #ifdef HAVE_KVM_ENV
 #include <kvm.h>
@@ -97,6 +100,7 @@
 #include "Foundation/NSAutoreleasePool.h"
 #include "Foundation/NSHost.h"
 #include "Foundation/NSLock.h"
+#include "Foundation/NSDebug.h"
 #include "GNUstepBase/GSCategories.h"
 
 #include "GSPrivate.h"
@@ -194,11 +198,17 @@ static NSArray		*_gnu_arguments = nil;
 // Dictionary of environment vars and their values
 static NSMutableDictionary	*_gnu_environment = nil;
 
+// The operating system we are using.
+static unsigned int	_operatingSystem = 0;
+static NSString		*_operatingSystemName = nil;
+static NSString		*_operatingSystemVersion = nil;
+
 // Array of debug levels set.
 static NSMutableSet	*_debug_set = nil;
 
 // Flag to indicate that fallbackInitialisation was executed.
 static BOOL	fallbackInitialisation = NO;
+
 /*************************************************************************
  *** Implementing the gnustep_base_user_main function
  *************************************************************************/
@@ -874,9 +884,6 @@ int main(int argc, char *argv[], char *env[])
 
 #endif /* HAS_LOAD_METHOD && HAS_PROCFS */
 
-/**
- * Returns the shared NSProcessInfo object for the current process.
- */
 + (NSProcessInfo *) processInfo
 {
   // Check if the main() function was successfully called
@@ -895,42 +902,16 @@ int main(int argc, char *argv[], char *env[])
   return _gnu_sharedProcessInfoObject;
 }
 
-/**
- * Returns an array containing the arguments supplied to start this
- * process.<br />
- * NB. In GNUstep, any arguments of the form --GNU-Debug=...
- * are <em>not</em> included in this array ... they are part of the
- * debug mechanism, and are hidden so that setting debug variables
- * will not effect the normal operation of the program.<br />
- * Please note, the special <code>--GNU-Debug=...</code> syntax differs from
- * that which is used to specify values for the [NSUserDefaults] system.<br />
- * User defaults are set on the command line by specifying the default name
- * (with a leading hyphen) as one argument, and the default value as the
- * following argument.  The arguments used to set user defaults are
- * present in the array returned by this method.
- */
 - (NSArray *) arguments
 {
   return _gnu_arguments;
 }
 
-/**
- * Returns a dictionary giving the environment variables which were
- * provided for the process to use.
- */
 - (NSDictionary *) environment
 {
   return _gnu_environment;
 }
 
-/**
- * Returns a string which may be used as a globally unique identifier.<br />
- * The string contains the host name, the process ID, a timestamp and a
- * counter.<br />
- * The first three values identify the process in which the string is
- * generated, while the fourth ensures that multiple strings generated
- * within the same process are unique.
- */
 - (NSString *) globallyUniqueString
 {
   static unsigned long	counter = 0;
@@ -958,9 +939,6 @@ int main(int argc, char *argv[], char *env[])
     host, pid, start, count];
 }
 
-/**
- * Returns the name of the machine on which this process is running.
- */
 - (NSString *) hostName
 {
   if (!_gnu_hostName)
@@ -970,152 +948,138 @@ int main(int argc, char *argv[], char *env[])
   return _gnu_hostName;
 }
 
-/**
- * Return a number representing the operating system type.<br />
- * The known types are listed in the header file, but not all of the
- * listed types are actually implemented ... some are present for
- * MacOS-X compatibility only.<br />
- * <list>
- * <item>NSWindowsNTOperatingSystem - used for windows NT, 2000, XP</item>
- * <item>NSWindows95OperatingSystem - probably never to be implemented</item>
- * <item>NSSolarisOperatingSystem - not yet recognised</item>
- * <item>NSHPUXOperatingSystem - not implemented</item>
- * <item>NSMACHOperatingSystem - perhaps the HURD in future?</item>
- * <item>NSSunOSOperatingSystem - probably never to be implemented</item>
- * <item>NSOSF1OperatingSystem - probably never to be implemented</item>
- * <item>NSGNULinuxOperatingSystem - the GNUstep 'standard'</item>
- * <item>NSBSDOperatingSystem - BSD derived operating systems</item>
- * <item>NSCygwinOperatingSystem - cygwin unix-like environment</item>
- * </list>
- */
-- (unsigned int) operatingSystem
+static void determineOperatingSystem()
 {
-  static unsigned int	os = 0;
-
-  if (os == 0)
+  if (_operatingSystem == 0)
     {
-      NSString	*n = [self operatingSystemName];
+      NSString	*os = [NSBundle _gnustep_target_os];
 
-      if ([n isEqualToString: @"NSGNULinuxOperatingSystem"] == YES)
-        {
-	  os = NSGNULinuxOperatingSystem;
-	}
-      else if ([n isEqualToString: @"NSWindowsNTOperatingSystem"] == YES)
-        {
-	  os = NSWindowsNTOperatingSystem;
-	}
-      else if ([n isEqualToString: @"NSWindows95OperatingSystem"] == YES)
-        {
-	  os = NSWindows95OperatingSystem;
-	}
-      else if ([n isEqualToString: @"NSCygwinOperatingSystem"] == YES)
-        {
-	  os = NSCygwinOperatingSystem;
-	}
-      else if ([n isEqualToString: @"NSBSDOperatingSystem"] == YES)
-        {
-	  os = NSBSDOperatingSystem;
-	}
-      else if ([n isEqualToString: @"NSBeOperatingSystem"] == YES)
-	{
-          os = NSBeOperatingSystem;
-        }
-      else if ([n isEqualToString: @"NSMACHOperatingSystem"] == YES)
-	{
-          os = NSMACHOperatingSystem;
-        }
-      else if ([n isEqualToString: @"NSSolarisOperatingSystem"] == YES)
-	{
-          os = NSSolarisOperatingSystem;
-        }
-      else if ([n isEqualToString: @"NSHPUXOperatingSystem"] == YES)
-	{
-          os = NSHPUXOperatingSystem;
-	}
-      else if ([n isEqualToString: @"NSSunOSOperatingSystem"] == YES)
-	{
-          os = NSSunOSOperatingSystem;
-	}
-      else if ([n isEqualToString: @"NSOSF1OperatingSystem"] == YES)
-	{
-          os = NSOSF1OperatingSystem;
-        }
-      else
-        {
-	  NSLog(@"Unable to determine O/S ... assuming GNU/Linux");
-	  os = NSGNULinuxOperatingSystem;
-	}
-    }
-  return os;
-}
+#if	defined(__MINGW32__)
+      OSVERSIONINFOW	osver;
 
-/**
- * Returns the name of the operating system in use.
- */
-- (NSString*) operatingSystemName
-{
-  static NSString	*os = nil;
+      osver.dwOSVersionInfoSize = sizeof(osver);
+      GetVersionExW (&osver);
+      /* Hmm, we could use this to determine operating system version, but
+       * that would not distinguish between mingw and cygwin, so we just
+       * use the information from NSBundle and only get the version info
+       * here.
+       */
+      _operatingSystemVersion = [[NSString alloc] initWithFormat: @"%d.%d",
+        osver.dwMajorVersion, osver.dwMinorVersion];
+#else
+#if	defined(HAVE_SYS_UTSNAME_H)
+      struct utsname uts;
 
-  if (os == nil)
-    {
-      os = [NSBundle _gnustep_target_os];
+      /* The system supports uname, so we can use it rather than the
+       * value determined at configure/compile time.
+       * That's good if the binary is running on a system other than
+       * the one it was built for (rare, but can happen).
+       */
+      if (uname(&uts) == 0)
+	{
+	  os = [NSString stringWithCString: uts.sysname                                                           encoding: [NSString defaultCStringEncoding]];
+	  _operatingSystemVersion = [[NSString alloc]
+	    initWithCString: uts.version
+	    encoding: [NSString defaultCStringEncoding]];
+	}
+#endif	/* HAVE_SYS_UTSNAME_H */
+#endif	/* __MINGW32__ */
+
+      if (_operatingSystemVersion == nil)
+        {
+	  NSWarnFLog(@"Unable to determine system version, using 0.0");
+	  _operatingSystemVersion = @"0.0";
+	}
 
       if ([os hasPrefix: @"linux"] == YES)
         {
-	  os = @"NSGNULinuxOperatingSystem";
+	  _operatingSystemName = @"GSGNULinuxOperatingSystem";
+	  _operatingSystem = GSGNULinuxOperatingSystem;
 	}
       else if ([os hasPrefix: @"mingw"] == YES)
         {
-	  os = @"NSWindowsNTOperatingSystem";
+	  _operatingSystemName = @"NSWindowsNTOperatingSystem";
+	  _operatingSystem = NSWindowsNTOperatingSystem;
 	}
       else if ([os isEqualToString: @"cygwin"] == YES)
         {
-	  os = @"NSCygwinOperatingSystem";
+	  _operatingSystemName = @"GSCygwinOperatingSystem";
+	  _operatingSystem = GSCygwinOperatingSystem;
 	}
       else if ([os hasPrefix: @"bsd"] == YES
 	|| [os hasPrefix: @"freebsd"] == YES
 	|| [os hasPrefix: @"netbsd"] == YES
 	|| [os hasPrefix: @"openbsd"] == YES)
         {
-	  os = @"NSBSDOperatingSystem";
+	  _operatingSystemName = @"GSBSDOperatingSystem";
+	  _operatingSystem = GSBSDOperatingSystem;
 	}
       else if ([os hasPrefix: @"beos"] == YES)
 	{
-          os = @"NSBeOperatingSystem";
+          _operatingSystemName = @"GSBeOperatingSystem";
+	  _operatingSystem = GSBeOperatingSystem;
         }
       else if ([os hasPrefix: @"darwin"] == YES)
 	{
-          os = @"NSMACHOperatingSystem";
+          _operatingSystemName = @"NSMACHOperatingSystem";
+	  _operatingSystem = NSMACHOperatingSystem;
         }
       else if ([os hasPrefix: @"solaris"] == YES)
 	{
-          os = @"NSSolarisOperatingSystem";
+          _operatingSystemName = @"NSSolarisOperatingSystem";
+	  _operatingSystem = NSSolarisOperatingSystem;
         }
       else if ([os hasPrefix: @"hpux"] == YES)
 	{
-          os = @"NSHPUXOperatingSystem";
+          _operatingSystemName = @"NSHPUXOperatingSystem";
+	  _operatingSystem = NSHPUXOperatingSystem;
         }
       else if ([os hasPrefix: @"sunos"] == YES)
 	{
-          os = @"NSSunOSOperatingSystem";
+          _operatingSystemName = @"NSSunOSOperatingSystem";
+	  _operatingSystem = NSSunOSOperatingSystem;
 	}
       else if ([os hasPrefix: @"osf"] == YES)
 	{
-          os = @"NSOSF10OperatingSystem";
+          _operatingSystemName = @"NSOSF1OperatingSystem";
+	  _operatingSystem = NSOSF1OperatingSystem;
         }
       else
         {
-	  NSLog(@"Unable to determine O/S ... assuming GNU/Linux");
-	  os = @"NSGNULinuxOperatingSystem";
+	  NSWarnFLog(@"Unable to determine O/S ... assuming GNU/Linux");
+	  _operatingSystemName = @"GSGNULinuxOperatingSystem";
+	  _operatingSystem = GSGNULinuxOperatingSystem;
 	}
     }
-  return os;
 }
 
-/**
- * Returns the process identifier number which identifies this process
- * on this machine.
- */
+- (unsigned int) operatingSystem
+{
+  if (_operatingSystem == 0)
+    {
+      determineOperatingSystem();
+    }
+  return _operatingSystem;
+}
+
+- (NSString*) operatingSystemName
+{
+  if (_operatingSystemName == 0)
+    {
+      determineOperatingSystem();
+    }
+  return _operatingSystemName;
+}
+
+- (NSString *) operatingSystemVersionString
+{
+  if (_operatingSystemVersion == nil)
+    {
+      determineOperatingSystem();
+    }
+  return _operatingSystemVersion;
+}
+
 - (int) processIdentifier
 {
   int	pid;
@@ -1128,19 +1092,11 @@ int main(int argc, char *argv[], char *env[])
   return pid;
 }
 
-/**
- * Returns the process name for this process. This may have been set using
- * the -setProcessName: method, or may be the default process name (the
- * file name of the binary being executed).
- */
 - (NSString *) processName
 {
   return _gnu_processName;
 }
 
-/**
- * Change the name of the current process to newName.
- */
 - (void) setProcessName: (NSString *)newName
 {
   if (newName && [newName length]) {
@@ -1152,21 +1108,10 @@ int main(int argc, char *argv[], char *env[])
 
 @end
 
-/**
- * Provides GNUstep-specific methods for controlled debug logging (a GNUstep
- * facility) and an internal/developer-related method.
- */
 @implementation	NSProcessInfo (GNUstep)
 
 static BOOL	debugTemporarilyDisabled = NO;
 
-/**
- * Fallback method. The developer must call this method to initialize
- * the NSProcessInfo system if none of the system-specific hacks to
- * auto-initialize it are working.<br />
- * It should also be safe to call this method to override the effects
- * of the automatic initialisation.
- */
 + (void) initializeWithArguments: (char**)argv
                            count: (int)argc
                      environment: (char**)env
@@ -1177,11 +1122,6 @@ static BOOL	debugTemporarilyDisabled = NO;
   [gnustep_global_lock unlock];
 }
 
-/**
- * Returns a indication of whether debug logging is enabled.
- * This returns YES unless a call to -setDebugLoggingEnabled: has
- * been used to turn logging off.
- */
 - (BOOL) debugLoggingEnabled
 {
   if (debugTemporarilyDisabled == YES)
@@ -1194,23 +1134,11 @@ static BOOL	debugTemporarilyDisabled = NO;
     }
 }
 
-/**
- * This method returns a set of debug levels set using the
- * --GNU-Debug=... command line option and/or the GNU-Debug
- * user default.<br />
- * You can modify this set to change the debug logging under
- * your programs control ... but such modifications are not
- * thread-safe.
- */
 - (NSMutableSet*) debugSet
 {
   return _debug_set;
 }
 
-/**
- * This method permits you to turn all debug logging on or off
- * without modifying the set of debug levels in use.
- */
 - (void) setDebugLoggingEnabled: (BOOL)flag
 {
   if (flag == NO)
@@ -1223,11 +1151,6 @@ static BOOL	debugTemporarilyDisabled = NO;
     }
 }
 
-/**
- * Set the file to which NSLog output should be directed.<br />
- * Returns YES on success, NO on failure.<br />
- * By default logging goes to standard error.
- */
 - (BOOL) setLogFile: (NSString*)path
 {
   extern int	_NSLogDescriptor;
@@ -1251,12 +1174,6 @@ static BOOL	debugTemporarilyDisabled = NO;
 }
 @end
 
-/**
- * Function for rapid testing to see if a debug level is set.<br />
- * This is used by the debugging macros.<br />
- * If debug logging has been turned off, this returns NO even if
- * the specified level exists in the set of debug levels.
- */
 BOOL GSDebugSet(NSString *level)
 {
   static IMP debugImp = 0;
@@ -1282,7 +1199,9 @@ BOOL GSDebugSet(NSString *level)
   return YES;
 }
 
-
+/**
+ * Internal function for GNUstep base library
+ */
 BOOL
 GSEnvironmentFlag(const char *name, BOOL def)
 {
@@ -1312,6 +1231,7 @@ GSEnvironmentFlag(const char *name, BOOL def)
 }
 
 /**
+ * Internal function for GNUstep base library.
  * Used by NSException uncaught exception handler - must not call any
  * methods/functions which might cause a recursive exception.
  */
diff --git a/Testing/nsprocessinfo.m b/Testing/nsprocessinfo.m
index ff1c239c8..e3aeac72f 100644
--- a/Testing/nsprocessinfo.m
+++ b/Testing/nsprocessinfo.m
@@ -23,24 +23,25 @@ int main(int argc, char *argv[])
   NSString* aKey;
   NSEnumerator* enumerator;
 
-  printf("Host name: %s\n",[[pi hostName] cString]);
+  printf("Host name: %s\n",[[pi hostName] UTF8String]);
   printf("Operating system: %d\n",[pi operatingSystem]);
-  printf("Operating system name: %s\n",[[pi operatingSystemName] cString]);
-  printf("Process Name: %s\n",[[pi processName] cString]);
-  printf("Globally Unique String: %s\n",[[pi globallyUniqueString] cString]);
+  printf("Operating system name: %s\n",[[pi operatingSystemName] UTF8String]);
+  printf("Operating system version: %s\n",[[pi operatingSystemVersionString] UTF8String]);
+  printf("Process Name: %s\n",[[pi processName] UTF8String]);
+  printf("Globally Unique String: %s\n",[[pi globallyUniqueString] UTF8String]);
 
   printf("\nProcess arguments\n");
   printf("%d argument(s)\n", [[pi arguments] count]);
   enumerator = [[pi arguments] objectEnumerator];
   while ((aString = [enumerator nextObject]))
-    printf("-->%s\n",[aString cString]);
+    printf("-->%s\n",[aString UTF8String]);
 
   printf("\nProcess environment\n");
   printf("%d environment variables(s)\n", [[pi environment] count]);
   enumerator = [[pi environment] keyEnumerator];
   while ((aKey = [enumerator nextObject]))
-    printf("++>%s=%s\n",[aKey cString],[[[pi environment]
-				       objectForKey:aKey] cString]);
+    printf("++>%s=%s\n",[aKey UTF8String],[[[pi environment]
+				       objectForKey:aKey] UTF8String]);
 
   [arp release];
   exit(0);
diff --git a/Version b/Version
index e5f40d7c9..e6359e59c 100644
--- a/Version
+++ b/Version
@@ -6,10 +6,10 @@ GCC_VERSION=2.9.5
 
 # The version number of this release.
 MAJOR_VERSION=1
-MINOR_VERSION=13
+MINOR_VERSION=14
 SUBMINOR_VERSION=0
 # numeric value should match above
-VERSION_NUMBER=113.0
+VERSION_NUMBER=114.0
 GNUSTEP_BASE_VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${SUBMINOR_VERSION}
 VERSION=${GNUSTEP_BASE_VERSION}
 
diff --git a/configure b/configure
index ac5a799eb..c1724eba0 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59e.
+# Generated by GNU Autoconf 2.60.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -230,8 +230,8 @@ IFS=$as_save_IFS
 
 
       for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells which exist, to save several forks.
-	 if test -f "$as_shell" &&
+	 # Try only shells that exist, to save several forks.
+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
 		{ ("$as_shell") 2> /dev/null <<\_ASEOF
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -1354,7 +1354,7 @@ Optional Packages:
 				If a trailing '/' is specified, the path is
 				used for locating domains but no GNUstep
 				config file is read at runtime.
-  --with-default-config=PATH    Specify path to a GNUstep config file to be
+  --with-default-config=PATH   Specify path to a GNUstep config file to be
 				imported at configure time (now) and used to
 				provide default values for the base library
 				to use at runtime if no GNUstep config file
@@ -1445,7 +1445,7 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.59e
+generated by GNU Autoconf 2.60
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1459,7 +1459,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.59e.  Invocation command line was
+generated by GNU Autoconf 2.60.  Invocation command line was
 
   $ $0 $@
 
@@ -2004,6 +2004,7 @@ if test "$GNUSTEP_MAKE_CONFIG"  = ""; then
   GNUSTEP_MAKE_CONFIG=`grep '^GNUSTEP_CONFIG_FILE *=' $GNUSTEP_MAKEFILES/config.make | sed -e 's/GNUSTEP_CONFIG_FILE *= *\(.*\)/\1/'`
 fi
 
+
 # Check whether --with-config-file was given.
 if test "${with_config_file+set}" = set; then
   withval=$with_config_file; result="$withval"
@@ -2215,7 +2216,7 @@ _ACEOF
 #
 if test ! -f "$GNUSTEP_MAKE_CONFIG"; then
   { echo "$as_me:$LINENO: Could not find make-specified config file. Either make was installed incorrectly or you are using an old version of gnustep-make. Ignoring this for now... but it will probably fail later on" >&5
-echo "$as_me: Could not find make-specified config file. Either make was installed incorrectly or you are using an old version of gnustep-make. Ignoring this for now..." >&6;}
+echo "$as_me: Could not find make-specified config file. Either make was installed incorrectly or you are using an old version of gnustep-make. Ignoring this for now... but it will probably fail later on" >&6;}
 else
   . "$GNUSTEP_MAKE_CONFIG"
 fi
@@ -2881,7 +2882,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_compiler_gnu=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
@@ -3067,13 +3068,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
@@ -3138,6 +3139,11 @@ static char *f (char * (*g) (char **, int), char **p, ...)
    that's true only with -std.  */
 int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
@@ -3198,7 +3204,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
 
-rm -f conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
 rm -f conftest.$ac_ext
@@ -3881,7 +3887,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_header_stdc=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
@@ -4077,7 +4083,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_Header=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_Header'}'`
 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -4160,7 +4166,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
@@ -4332,7 +4338,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	sa_len=0
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 if test $sa_len = 1; then
   { echo "$as_me:$LINENO: result: found" >&5
 echo "${ECHO_T}found" >&6; }
@@ -4558,7 +4564,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_c_bigendian=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -4639,7 +4645,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4700,7 +4706,7 @@ fi
 
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
 echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
@@ -4797,7 +4803,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_type_voidp=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_type_voidp" >&5
 echo "${ECHO_T}$ac_cv_type_voidp" >&6; }
@@ -4933,7 +4939,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 			ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
@@ -5058,7 +5064,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 			ac_mid=`expr 2 '*' $ac_mid`
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
@@ -5067,10 +5073,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_lo= ac_hi=
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
@@ -5134,7 +5140,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_voidp=$ac_lo;;
@@ -5303,7 +5309,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_type_short=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
 echo "${ECHO_T}$ac_cv_type_short" >&6; }
@@ -5439,7 +5445,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 			ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
@@ -5564,7 +5570,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 			ac_mid=`expr 2 '*' $ac_mid`
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
@@ -5573,10 +5579,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_lo= ac_hi=
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
@@ -5640,7 +5646,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_short=$ac_lo;;
@@ -5805,7 +5811,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_type_int=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6; }
@@ -5941,7 +5947,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 			ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
@@ -6066,7 +6072,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 			ac_mid=`expr 2 '*' $ac_mid`
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
@@ -6075,10 +6081,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_lo= ac_hi=
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
@@ -6142,7 +6148,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_int=$ac_lo;;
@@ -6307,7 +6313,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_type_long=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
 echo "${ECHO_T}$ac_cv_type_long" >&6; }
@@ -6443,7 +6449,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 			ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
@@ -6568,7 +6574,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 			ac_mid=`expr 2 '*' $ac_mid`
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
@@ -6577,10 +6583,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_lo= ac_hi=
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
@@ -6644,7 +6650,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_long=$ac_lo;;
@@ -6809,7 +6815,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_type_long_long=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
 echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
@@ -6945,7 +6951,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 			ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
@@ -7070,7 +7076,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 			ac_mid=`expr 2 '*' $ac_mid`
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
@@ -7079,10 +7085,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_lo= ac_hi=
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
@@ -7146,7 +7152,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_long_long=$ac_lo;;
@@ -7311,7 +7317,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_type_float=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_type_float" >&5
 echo "${ECHO_T}$ac_cv_type_float" >&6; }
@@ -7447,7 +7453,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 			ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
@@ -7572,7 +7578,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 			ac_mid=`expr 2 '*' $ac_mid`
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
@@ -7581,10 +7587,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_lo= ac_hi=
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
@@ -7648,7 +7654,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_float=$ac_lo;;
@@ -7813,7 +7819,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_type_double=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_type_double" >&5
 echo "${ECHO_T}$ac_cv_type_double" >&6; }
@@ -7949,7 +7955,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 			ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
@@ -8074,7 +8080,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 			ac_mid=`expr 2 '*' $ac_mid`
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
@@ -8083,10 +8089,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_lo= ac_hi=
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
@@ -8150,7 +8156,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_double=$ac_lo;;
@@ -8594,7 +8600,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
@@ -8749,7 +8755,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
@@ -8905,7 +8911,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
@@ -9061,7 +9067,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
@@ -9234,7 +9240,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_dl_dladdr=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -9594,7 +9600,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -9701,7 +9707,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_type_size_t=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
@@ -9777,7 +9783,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   test "$ac_cv_c_inline" != no && break
 done
 
@@ -9871,7 +9877,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_header_stdc=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
@@ -10065,7 +10071,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
@@ -10233,7 +10239,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
@@ -10406,7 +10412,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
@@ -10571,7 +10577,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
@@ -10735,7 +10741,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_Header=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_Header'}'`
 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -10820,7 +10826,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
@@ -10983,7 +10989,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_m_main=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -11104,7 +11110,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -11196,7 +11202,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
@@ -11390,7 +11396,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -11500,7 +11506,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
@@ -11668,7 +11674,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
@@ -11836,7 +11842,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_iberty_dyn_string_append=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -11923,7 +11929,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_bfd_bfd_openr=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -12010,7 +12016,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
@@ -12202,7 +12208,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -12288,7 +12294,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
@@ -12480,7 +12486,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -12598,7 +12604,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
@@ -12800,7 +12806,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -13016,7 +13022,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -13103,7 +13109,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_Header=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_Header'}'`
 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -13196,7 +13202,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext
   if test "${ac_cv_search_opendir+set}" = set; then
   break
@@ -13296,7 +13302,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext
   if test "${ac_cv_search_opendir+set}" = set; then
   break
@@ -13392,7 +13398,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
@@ -13588,7 +13594,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -13702,7 +13708,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -13816,7 +13822,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -13926,7 +13932,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -14036,7 +14042,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -14152,7 +14158,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -14336,7 +14342,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
@@ -14581,7 +14587,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -14664,7 +14670,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
@@ -14832,7 +14838,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_z_gzseek=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -14957,7 +14963,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -15071,7 +15077,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -15155,7 +15161,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_type_uintmax_t=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_type_uintmax_t" >&5
 echo "${ECHO_T}$ac_cv_type_uintmax_t" >&6; }
@@ -15373,7 +15379,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
@@ -15627,7 +15633,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_func_register_printf_function=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_func_register_printf_function" >&5
@@ -15791,7 +15797,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
@@ -15882,6 +15888,174 @@ else
 echo "${ECHO_T}no" >&6; }
 fi
 
+#--------------------------------------------------------------------
+# Check for uname header used by NSProcessInfo.m
+#--------------------------------------------------------------------
+
+for ac_header in sys/utsname.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
 #--------------------------------------------------------------------
 # Defines HAVE_PROCFS if the kernel supports the /proc filesystem.
 # Needed by NSProcessInfo.m
@@ -15954,7 +16128,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
@@ -16348,7 +16522,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_kvm_kvm_getenvv=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -16658,7 +16832,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
@@ -16819,7 +16993,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
@@ -16978,7 +17152,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	have_forward_hook=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { echo "$as_me:$LINENO: result: $have_forward_hook" >&5
 echo "${ECHO_T}$have_forward_hook" >&6; }
 if test $have_forward_hook = no; then
@@ -17055,7 +17229,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ffi_ok="no"
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
   if test $ffi_ok = yes; then
     { echo "$as_me:$LINENO: result: libffi" >&5
@@ -17126,7 +17300,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ffi_ok="no"
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
   if test $ffi_ok = yes; then
     { echo "$as_me:$LINENO: result: ffcall" >&5
@@ -17241,7 +17415,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 
 if test $found_iconv = no ; then
@@ -17329,7 +17503,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -17400,7 +17574,7 @@ echo "${ECHO_T}no" >&6; }
 
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -17894,7 +18068,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
@@ -18073,7 +18247,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_xslt_xsltApplyStylesheet=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -18149,7 +18323,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
@@ -18398,7 +18572,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
@@ -18566,7 +18740,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_gmp_mpf_abs=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -18650,7 +18824,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_gmp___gmpf_abs=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
@@ -18737,7 +18911,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	am_cv_langinfo_codeset=no
 fi
 
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 
 fi
@@ -19192,7 +19366,7 @@ exec 6>&1
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59e.  Invocation command line was
+generated by GNU Autoconf 2.60.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -19241,7 +19415,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.59e,
+configured by $0, generated by GNU Autoconf 2.60,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright (C) 2006 Free Software Foundation, Inc.
@@ -19863,6 +20037,7 @@ $ac_datarootdir_hack
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
   { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
 echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
diff --git a/configure.ac b/configure.ac
index 154d5175c..7e4ee0d52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1101,6 +1101,11 @@ else
   AC_MSG_RESULT(no)
 fi
 
+#--------------------------------------------------------------------
+# Check for uname header used by NSProcessInfo.m 
+#--------------------------------------------------------------------
+AC_CHECK_HEADERS(sys/utsname.h)
+
 #--------------------------------------------------------------------
 # Defines HAVE_PROCFS if the kernel supports the /proc filesystem. 
 # Needed by NSProcessInfo.m