make runtime.h available to other code.

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

ChangeLog

@@ -1,3 +1,14 @@
+2010-02-20 Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/Makefile.postamble:
+	* Source/GNUmakefile:
+	* configure.ac:
+	* configure:
+	* Headers/Additions/GNUstepBase/GSConfig.h.in:
+	* Headers/Additions/GNUstepBase/GSObjCRuntime.h:
+	Make runtime.h objc2 compatibility header available in installed
+	headers if we are using objc2 compatibility in base.
+
 2010-02-19 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSConcreteNumber.h: Remove unused file

Headers/Additions/GNUstepBase/GSConfig.h.in

@@ -216,5 +216,9 @@ typedef	struct {
   uint8_t	dummy[@GS_SIZEOF_MUTEX_T@];
 } gs_mutex_t;
 
+#define	OBJC2RUNTIME @OBJC2RUNTIME@
+
+#import	<GNUstepBase/preface.h>
+
 #endif	/* included_GSConfig_h */
 

Headers/Additions/GNUstepBase/GSObjCRuntime.h

@@ -31,11 +31,12 @@
 #define __GSObjCRuntime_h_GNUSTEP_BASE_INCLUDE
 
 #include <GNUstepBase/GSVersionMacros.h>
+#include <GNUstepBase/GSConfig.h>
 
 #include <objc/objc.h>
 #include <objc/objc-api.h>
 
-#if	defined(HAVE__OBJC_RUNTIME_H)
+#if	defined(HAVE_OBJC_RUNTIME_H)
 #include <objc/runtime.h>
 #endif
 

Source/GNUmakefile

@@ -65,7 +65,7 @@ ifneq ($(base),no)
 LIBRARY_NAME += libgnustep-base
 endif
 
-ifeq ($(OBJC2RUNTIME),no)
+ifeq ($(OBJC2RUNTIME),0)
 libgnustep-base_SUBPROJECTS = ObjectiveC2
 libgnustep-baseadd_SUBPROJECTS += Additions
 endif
@@ -142,6 +142,12 @@ behavior.h \
 preface.h \
 Additions.h
 
+# If we are using ObjC2 compatibility, we need to include the runtime.h
+# header with all the additional headers.
+ifeq ($(OBJC2RUNTIME),0)
+ADD_HEADERS += runtime.h
+endif
+
 GNU_HEADERS = $(ADD_HEADERS)
 
 # GNUStep source files
@@ -438,9 +444,11 @@ HEADERS_INSTALL = $(GNU_HEADERS) \
 GENERATED_HFILES = \
 dynamic-load.h \
 $(HEADER_DIR_BASE)/preface.h \
+$(HEADER_DIR_BASE)/runtime.h \
 $(GNUSTEP_TARGET_DIR)/config.h \
 $(GNUSTEP_TARGET_DIR)/GNUstepBase/GSConfig.h
 
+
 ifeq ($(HAVE_INET_PTON), no)
 GNU_CFILES += inet_pton.c
 endif
@@ -483,7 +491,7 @@ libgnustep-baseadd_NEEDS_GUI = NO
 # build Additions as a subproject, causing concurrency issues).  If it
 # can be guaranteed that they'll never be built together, this could
 # be removed.
-ifeq ($(OBJC2RUNTIME),no)
+ifeq ($(OBJC2RUNTIME),0)
 SUBPROJECTS = ObjectiveC2
 endif
 SUBPROJECTS += Additions

Source/Makefile.postamble

@@ -95,6 +95,8 @@ before-uninstall::
 # Things to do after cleaning
 after-clean::
 	rm -f libgnustep-base.def
+	rm -f ../Headers/Additions/GNUstep/runtime.h
+	rm -f ../Headers/Foundation/Foundation.h.saved
 
 # Things to do before distcleaning
 # before-distclean::
@@ -140,6 +142,9 @@ $(GNUSTEP_TARGET_DIR)/mframe.h: mframe/config.status
 	-mv mframe/mframe.h $(GNUSTEP_TARGET_DIR)
 	-touch $(GNUSTEP_TARGET_DIR)/mframe.h
 
+$(HEADER_DIR_BASE)/runtime.h: ObjectiveC2/runtime.h
+	cp ObjectiveC2/runtime.h $(HEADER_DIR_BASE)
+
 #
 #       Files where optimisation breaks the code!
 #       These have to filter the optimisation flag out.

configure

@@ -8753,9 +8753,9 @@ fi
 done
 
 if test $ac_cv_func_objc_setProperty = yes ; then
-  OBJC2RUNTIME=yes
+  OBJC2RUNTIME=1
 else
-  OBJC2RUNTIME=no
+  OBJC2RUNTIME=0
 fi
 
 

configure.ac

@@ -663,9 +663,9 @@ AC_CHECK_FUNCS(objc_thread_add)
 #--------------------------------------------------------------------
 AC_CHECK_FUNCS(objc_setProperty)
 if test $ac_cv_func_objc_setProperty = yes ; then
-  OBJC2RUNTIME=yes
+  OBJC2RUNTIME=1
 else
-  OBJC2RUNTIME=no
+  OBJC2RUNTIME=0
 fi
 AC_SUBST(OBJC2RUNTIME)