Changes from Scott Christley. See ChangeLog Feb 27 13:46:10

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@2294 72102866-910b-0410-8b05-ffd578937521

Headers/gnustep/base/NSRange.h

@@ -58,7 +58,7 @@ NSLocationInRange(unsigned location, NSRange range)
 
 /* Create an NSRange having the specified LOCATION and LENGTH. */
 extern NSRange
-NSMakeRange(float location, float length);
+NSMakeRange(unsigned int location, unsigned int length);
 
 extern NSRange
 NSUnionRange(NSRange range1, NSRange range2);

Source/Makefile.in

@@ -53,7 +53,7 @@ YACC = bison
 # GNUSTEP_INSTALL_PREFIX must be defined here and not in config.h because
 # the installing person may set it on the `make' command line.
 DEFS= -DGNUSTEP_INSTALL_PREFIX=$(prefix) -DPLATFORM_OS=\"@PLATFORM_OS@\" \
-	-DGNUSTEP_INSTALL_LIBDIR=$(gnustep_libdir) @DEFS@
+	-DGNUSTEP_INSTALL_LIBDIR=\"$(gnustep_libdir)\" @DEFS@
 
 # File name extensions
 OEXT = .o

Source/NSBundle.m

@@ -112,6 +112,12 @@ static NSString* platform =
 #else
   nil;
 #endif
+static NSString* gnustep_libdir =
+#ifdef GNUSTEP_INSTALL_LIBDIR
+  @GNUSTEP_INSTALL_LIBDIR;
+#else
+  nil;
+#endif
 
 /* Declaration from find_exec.c */
 extern char *objc_find_executable(const char *name);
@@ -470,6 +476,8 @@ _bundle_load_callback(Class theClass, Category *theCategory)
      <main bundle>/Resources/<bundlePath>/<language.lproj>
      <main bundle>/<bundlePath>
      <main bundle>/<bundlePath>/<language.lproj>
+     <gnustep library installation directory>/<bundlePath>
+     <gnustep library installation directory>/<bundlePath>/<language.lproj>
 */
 - (NSArray *) _bundleResourcePathsWithDirectory: (NSString *)bundlePath
 {
@@ -479,7 +487,7 @@ _bundle_load_callback(Class theClass, Category *theCategory)
   NSMutableArray* array;
   NSEnumerator* enumerate;
 
-  array = [NSMutableArray arrayWithCapacity: 2];
+  array = [NSMutableArray arrayWithCapacity: 8];
   languages = [NSUserDefaults userLanguages];
 
   primary = [self resourcePath];
@@ -493,6 +501,18 @@ _bundle_load_callback(Class theClass, Category *theCategory)
   enumerate = [languages objectEnumerator];
   while ((language = [enumerate nextObject]))
     [array addObject: _bundle_resource_path(primary, bundlePath, language)];
+
+  if (gnustep_libdir)
+    {
+      primary = [NSString stringWithCString: [gnustep_libdir cString]];
+      [array addObject: _bundle_resource_path(primary, bundlePath, nil)];
+      enumerate = [languages objectEnumerator];
+      while ((language = [enumerate nextObject]))
+	[array addObject: 
+	       _bundle_resource_path(primary, bundlePath, language)];
+    }
+
+
   return array;
 }
 

Source/NSCharacterSet.m

@@ -27,9 +27,7 @@
 #include <Foundation/NSData.h>
 #include <Foundation/NSLock.h>
 
-#ifndef NSCharacterSet_PATH
+static NSString* NSCharacterSet_PATH = @"NSCharacterSets";
-#define NSCharacterSet_PATH OBJC_STRINGIFY(GNUSTEP_INSTALL_LIBDIR) @"/NSCharacterSets"
-#endif
 
 /* A simple array for caching standard bitmap sets */
 #define MAX_STANDARD_SETS 12

Source/NSRange.m

@@ -5,7 +5,7 @@
 #include <Foundation/NSString.h>
 
 NSRange	
-NSMakeRange(float location, float length)
+NSMakeRange(unsigned int location, unsigned int length)
 {
     NSRange range;
     range.location = location;

Source/NSString.m

@@ -1230,7 +1230,7 @@ handle_printf_atsign (FILE *stream,
   NSString *newstring;
 
   range = [self rangeOfString:@"/" options:NSBackwardsSearch];
-  if (range.length != 0 && range.location != [self length] - 1)
+  if (range.length == 0 && range.location != [self length] - 1)
       newstring = [self stringByAppendingString:@"/"];
   else
       newstring = self;
@@ -1247,8 +1247,8 @@ handle_printf_atsign (FILE *stream,
   NSRange  range;
   NSString *newstring;
 
-  range = [aString rangeOfString:@"." options:NSBackwardsSearch];
+  range = [self rangeOfString:@"." options:NSBackwardsSearch];
-  if (range.length != 0 && range.location != [self length] - 1)
+  if ((range.length == 0) && (range.location != ([self length] - 1)))
       newstring = [self stringByAppendingString:@"."];
   else
       newstring = self;

configure.in

@@ -284,7 +284,8 @@ AC_CHECK_LIB(nsl, main)
 #--------------------------------------------------------------------
 # Make a shared library?
 #--------------------------------------------------------------------
-AC_ARG_ENABLE(shared, Build the library as a shared library,
+AC_ARG_ENABLE(shared,
+[  --enable-shared         Build the library as a shared library],
         SHARED_LIBRARY='lib$(LIBRARY_NAME).so.$(VERSION)',
     SHARED_LIBRARY=)
 AC_SUBST(SHARED_LIBRARY)