From 505d3e4a8b87ec261038f6cfe28399d29751b456 Mon Sep 17 00:00:00 2001
From: Richard Frith-MacDonald <rfm@gnu.org>
Date: Sat, 19 Jun 2010 10:48:21 +0000
Subject: [PATCH] tweak warning

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@30784 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog               |  5 +++++
 Makefile.postamble      |  4 +---
 Source/NSUserDefaults.m | 44 ++++++++++++++++++++---------------------
 3 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2995ddd91..673385b5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-19  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSUserDefaults.m: Remove inappropriate warning (when library
+	used without resources).
+
 2010-06-16  Sergey Golovin
 
 	* Source/NSTimeZone.m: find timezone from localtime file when it's
diff --git a/Makefile.postamble b/Makefile.postamble
index 13826c11a..5951034f5 100644
--- a/Makefile.postamble
+++ b/Makefile.postamble
@@ -88,8 +88,6 @@ after-distclean::
 # why we can't guess what the ./configure arguments were last time
 # ./configure was called - make distclean cleans the sources
 # completely, wiping out any memory of specific configuration.
-base.make: base.make.in Version configure
+config.mak base.make: config.mak.in base.make.in Version configure
 	./configure
 
-config.mak: config.mak.in configure
-	./configure
diff --git a/Source/NSUserDefaults.m b/Source/NSUserDefaults.m
index b8c27bec4..caaa57730 100644
--- a/Source/NSUserDefaults.m
+++ b/Source/NSUserDefaults.m
@@ -588,14 +588,14 @@ static BOOL setSharedDefaults = NO;     /* Flag to prevent infinite recursion */
          */
         NSFileManager *fm = [NSFileManager defaultManager];
         NSString *tail = [[[[[@"Libraries" 
-			       stringByAppendingPathComponent: @"gnustep-base"]
-			      stringByAppendingPathComponent: @"Versions"]
-			     stringByAppendingPathComponent: 
-			       OBJC_STRINGIFY(GNUSTEP_BASE_MAJOR_VERSION.GNUSTEP_BASE_MINOR_VERSION)]
-			    stringByAppendingPathComponent: @"Resources"]
-		           stringByAppendingPathComponent: @"Languages"];
-        NSArray *paths = NSSearchPathForDirectoriesInDomains (NSLibraryDirectory,
-							      NSAllDomainsMask, YES);
+	  stringByAppendingPathComponent: @"gnustep-base"]
+	  stringByAppendingPathComponent: @"Versions"]
+	  stringByAppendingPathComponent: 
+	  OBJC_STRINGIFY(GNUSTEP_BASE_MAJOR_VERSION.GNUSTEP_BASE_MINOR_VERSION)]
+	  stringByAppendingPathComponent: @"Resources"]
+	  stringByAppendingPathComponent: @"Languages"];
+        NSArray *paths = NSSearchPathForDirectoriesInDomains
+	  (NSLibraryDirectory, NSAllDomainsMask, YES);
         
         added_lang = NO;
         added_locale = NO;
@@ -603,8 +603,8 @@ static BOOL setSharedDefaults = NO;     /* Flag to prevent infinite recursion */
         while ((lang = [enumerator nextObject]))
           {
 	    NSDictionary	*dict = nil;
-	    NSString	*path = nil;
-	    NSEnumerator *pathEnumerator = [paths objectEnumerator];
+	    NSString		*path = nil;
+	    NSEnumerator	*pathEnumerator = [paths objectEnumerator];
 
 	    while ((path = [pathEnumerator nextObject]) != nil)
 	      {
@@ -664,15 +664,12 @@ static BOOL setSharedDefaults = NO;     /* Flag to prevent infinite recursion */
 		        dict = GSDomainFromDefaultLocale ();
 		        if (dict != nil)
 		          {
-			    [sharedDefaults setVolatileDomain: dict forName: lang];
+			    [sharedDefaults setVolatileDomain: dict
+						      forName: lang];
 			
 			    /* We do not set added_lang to YES here
-			     * because we want the improper installation
-			     * warning to be printed below if our own
-			     * English language dictionary is not found,
-			     * and we want the basic hardcoded defaults to
-			     * be used in that case.  (FIXME: Review this
-			     * decision).
+			     * because we want the basic hardcoded defaults
+			     * to be used in that case.
 			     */
 		          }
 		      }
@@ -683,9 +680,10 @@ static BOOL setSharedDefaults = NO;     /* Flag to prevent infinite recursion */
     
       if (added_lang == NO)
         {
-          /* Ack! We should never get here.  */
-          NSWarnMLog(@"Improper installation: No language locale found");
-    
+          /* No language information found ... probably because the base
+	   * library is being used 'standalone' without resources.
+	   * We need to use hard-coded defaults.
+	   */
           /* FIXME - should we set this as volatile domain for English ? */
           [sharedDefaults registerDefaults: [self _unlocalizedDefaults]];
         }
@@ -1442,7 +1440,7 @@ static BOOL isPlistObject(id o)
       if (dict != nil)
         {
           [NSException raise: NSInvalidArgumentException
-		      format: @"a volatile domain called %@ exists", domainName];
+	    format: @"a volatile domain called %@ exists", domainName];
         }
       domain = [domain mutableCopy];
       [_persDomains setObject: domain forKey: domainName];
@@ -1840,13 +1838,13 @@ NSLog(@"Creating empty user defaults database");
       if (dict != nil)
         {
           [NSException raise: NSInvalidArgumentException
-		      format: @"a persistent domain called %@ exists", domainName];
+	    format: @"a persistent domain called %@ exists", domainName];
         }
       dict = [_tempDomains objectForKey: domainName];
       if (dict != nil)
         {
           [NSException raise: NSInvalidArgumentException
-		      format: @"the volatile domain %@ already exists", domainName];
+	    format: @"the volatile domain %@ already exists", domainName];
         }
 
       DESTROY(_dictionaryRep);