fix for bug #29203

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

ChangeLog

@@ -1,3 +1,11 @@
+2010-03-18 Richard Frith-Macdonald <rfm@gnu.org>
+
+	* configure.ac:
+	* config.mak.in:
+	* Source/ObjectiveC2/GNUmakefile:
+	Only build objc synchronisation compatibility code if it is not
+	already in runtime.
+
 2010-03-17 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/Additions/GSMime.m:

Source/NSDecimalNumber.m

@@ -197,7 +197,7 @@ static NSDecimalNumber *one;
   // Reuse the handler from the class NSDecimalNumberHandler
   // Might give interessting result on this class as behavior may came
   // from a different class
-  ASSIGN(handler, behavior);
+  ASSIGN(handler, (id)behavior);
 }
 
 + (NSDecimalNumber*) maximumDecimalNumber

Source/ObjectiveC2/GNUmakefile

@@ -34,7 +34,11 @@ SUBPROJECT_NAME = ObjectiveC2
 ObjectiveC2_OBJC_FILES = \
 	blocks_runtime.m\
 	properties.m\
-	sync.m
+
+
+ifeq ($(OBJCSYNC), 0)
+ObjectiveC2_OBJC_FILES += sync.m
+endif
 
 ObjectiveC2_C_FILES = \
 	runtime.c

config.mak.in

@@ -19,6 +19,7 @@ WITH_FFI=@WITH_FFI@
 NX_CONST_STRING_CLASS=@NX_CONST_STRING_CLASS@
 OBJCFLAGS+=@OBJCFLAGS@
 OBJC2RUNTIME=@OBJC2RUNTIME@
+OBJCSYNC=@OBJCSYNC@
 WARN_FLAGS=@WARN_FLAGS@
 
 HAVE_INET_PTON=@HAVE_INET_PTON@

configure.ac

@@ -671,6 +671,17 @@ fi
 #--------------------------------------------------------------------
 AC_CHECK_FUNCS(objc_thread_add)
 
+#--------------------------------------------------------------------
+# Check for thread synchronisation support in runtime
+#--------------------------------------------------------------------
+AC_CHECK_FUNCS(objc_sync_enter)
+if test $ac_cv_func_objc_sync_enter = yes ; then
+  OBJCSYNC=1
+else
+  OBJCSYNC=0
+fi
+AC_SUBST(OBJCSYNC)
+
 #--------------------------------------------------------------------
 # Check for ObjC2 support in runtime
 #--------------------------------------------------------------------