Additional definitions to compile with apple-apple-apple

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

ChangeLog

@@ -1,3 +1,12 @@
+2009-02-16  Adam Fedor  <fedor@gnu.org>
+
+	* configure.ac: Look in LOCAL for headers/libs
+
+	* Headers/Foundation/NSObjCRuntime.h: Define NSINTEGER_DEFINED.
+	* Headers/Additions/GNUstepBase/GSCategories.h,
+	Headers/Additions/GNUstepBase/GSUnion.h: Additional definitions to compile
+	with apple-apple-apple.
+
 2009-02-16  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/pathconfig/configure.ac: Warn if gnustep-config not found.

Headers/Additions/GNUstepBase/GSCategories.h

@@ -64,10 +64,6 @@ extern "C" {
  * Macros
  */
 
-// Following are also defined in base/Headers/Foundation/NSObject.h
-#define IF_NO_GC(x)	\
-    x
-
 // Following are also defined in base/Headers/Foundation/NSDebug.h
 #ifdef DEBUG
 #define NSDebugLLog(level, format, args...) \
@@ -182,7 +178,17 @@ typedef enum _NSGNUstepStringEncoding
   NSUTF7StringEncoding = 64,		// RFC 2152
   NSGSM0338StringEncoding,		// GSM (mobile phone) default alphabet
   NSBIG5StringEncoding,			// Traditional chinese
-  NSKoreanEUCStringEncoding
+  NSKoreanEUCStringEncoding,
+#if MAC_OS_X_VERSION_10_4 <= MAC_OS_X_VERSION_MAX_ALLOWED
+    NSUTF16BigEndianStringEncoding = 0x90000100,          /* NSUTF16StringEncoding encoding with explicit endianness specified */
+    NSUTF16LittleEndianStringEncoding = 0x94000100,       /* NSUTF16StringEncoding encoding with explicit endianness specified */
+
+    NSUTF32StringEncoding = 0x8c000100,
+    NSUTF32BigEndianStringEncoding = 0x98000100,          /* NSUTF32StringEncoding encoding with explicit endianness specified */
+    NSUTF32LittleEndianStringEncoding = 0x9c000100,        /* NSUTF32StringEncoding encoding with explicit endianness specified */
+#endif
+
+  GSEncodingUnusedLast
 } NSGNUstepStringEncoding;
 
 

Headers/Additions/GNUstepBase/GSUnion.h

@@ -27,6 +27,13 @@
  */
 #import <Foundation/NSObjCRuntime.h>
 
+/* These are not defined in older Mac OS X systems */
+#ifndef NSINTEGER_DEFINED
+typedef int NSInteger;
+typedef unsigned int NSUInteger;
+#define NSINTEGER_DEFINED 1
+#endif
+
 /*
  *	Definitions for bitmap mask of types of element in union.
  */

Headers/Foundation/NSObjCRuntime.h

@@ -37,6 +37,8 @@
 typedef	gsaddr	NSInteger;
 typedef	gsuaddr	NSUInteger;
 
+#define NSINTEGER_DEFINED 1
+
 #import	<GNUstepBase/GSObjCRuntime.h>
 
 #if	defined(__cplusplus)

configure.ac

@@ -115,8 +115,8 @@ fi
 # plain C developer headers/libraries which haver been installed in the
 # GNUstep hierarchy.
 #
-CPPFLAGS="$CPPFLAGS -I$GNUSTEP_SYSTEM_HEADERS"
-LDFLAGS="$LDFLAGS -L$GNUSTEP_SYSTEM_LIBRARIES"
+CPPFLAGS="$CPPFLAGS -I$GNUSTEP_SYSTEM_HEADERS -I$GNUSTEP_LOCAL_HEADERS"
+LDFLAGS="$LDFLAGS -L$GNUSTEP_SYSTEM_LIBRARIES -L$GNUSTEP_LOCAL_LIBRARIES"
 
 #--------------------------------------------------------------------
 # Find the compiler