Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -126,88 +126,45 @@
 ], [
 	AC_MSG_RESULT(no)
 	OBJCFLAGS="$old_OBJCFLAGS"
 ])
 
-AC_CHECK_HEADERS([objfw-rt.h objc/objc.h])
-
-test x"$ac_cv_header_objfw_rt_h" = x"yes" && objc_runtime="ObjFW-RT"
-
-AC_MSG_CHECKING(which Objective C runtime we use)
-AS_IF([test x"$ac_cv_header_objc_objc_h" = x"yes"], [
-	dnl Only accept it if it's from gcc >= 4.7, as the one in 4.6 is buggy
-	dnl when using the new API.
-	AC_EGREP_CPP(yes, [
-		#import <objc/objc.h>
-		#if defined(__GNU_LIBOBJC__) && __GNU_LIBOBJC__ >= 20110608
-		yes
-		#endif
-	], [
-		test x"$objc_runtime" = x"" && objc_runtime="GNU"
-	], [
-		dnl TODO: This is ugly. Let's think of a better check.
-		AC_EGREP_CPP(yes, [
-			#import <objc/objc.h>
-			#ifdef __objc_INCLUDE_GNU
-			yes
-			#endif
-		], [
-			test x"$objc_runtime" = x"" && objc_runtime="old GNU"
-		], [
-			objc_runtime="Apple"
-		])
+objc_runtime="ObjFW runtime"
+AC_CHECK_HEADER(objc/objc.h)
+AC_MSG_CHECKING(which Objective C runtime to use)
+AS_IF([test x"$ac_cv_header_objc_objc_h" = x"yes"], [
+	dnl TODO: This is ugly. Let's think of a better check.
+	AC_EGREP_CPP(yes, [
+		#import <objc/objc.h>
+		#ifdef __objc_INCLUDE_GNU
+		yes
+		#endif
+	], [
+		dnl We don't want the GNU runtime
+	], [
+		objc_runtime="Apple runtime"
 	])
 ])
 AC_MSG_RESULT($objc_runtime)
 
 case $objc_runtime in
-	ObjFW-RT)
+	"ObjFW runtime")
 		AC_DEFINE(OF_OBJFW_RUNTIME, 1,
 			[Whether we use the ObjFW runtime])
 		AC_SUBST(GNU_RUNTIME, "-fgnu-runtime")
 		OBJCFLAGS="$OBJCFLAGS -fgnu-runtime"
-
-		AC_CHECK_LIB(objfw-rt, objc_msg_lookup, [
-			LIBS="-lobjfw-rt $LIBS"
-		], [
-			AC_MSG_ERROR([libobjfw-rt not found!])
-		])
 		;;
-	Apple)
+	"Apple runtime")
 		AC_DEFINE(OF_APPLE_RUNTIME, 1,
 			[Whether we use the Apple ObjC runtime])
 
 		AC_CHECK_LIB(objc, objc_msgSend, [
 			LIBS="-lobjc $LIBS"
 		], [
 			AC_MSG_ERROR([libobjc not found!])
 		])
 		;;
-	GNU)
-		AC_DEFINE(OF_GNU_RUNTIME, 1,
-			[Whether we use the GNU ObjC runtime])
-
-		AC_CHECK_LIB(objc, objc_msg_lookup, [
-			LIBS="-lobjc $LIBS"
-		], [
-			AC_MSG_ERROR([libobjc not found!])
-		])
-		;;
-	"old GNU")
-		AC_DEFINE(OF_OLD_GNU_RUNTIME, 1,
-			[Whether we use the old GNU ObjC runtime])
-
-		AC_CHECK_LIB(objc, objc_msg_lookup, [
-			LIBS="-lobjc $LIBS"
-		], [
-			AC_MSG_ERROR([libobjc not found!])
-		])
-		;;
-	*)
-		AC_MSG_RESULT(none)
-		AC_MSG_ERROR(No ObjC runtime found! Please install ObjFW-RT!)
-		;;
 esac
 
 AC_CHECK_FUNC(objc_getProperty,, [
 	AC_DEFINE(NEED_OBJC_PROPERTIES_INIT, 1,
 		[Whether objc_properties_init needs to be called])
@@ -580,11 +537,11 @@
 	])
 ], [
 	AC_MSG_RESULT(no)
 ])
 
-AS_IF([test x"$objc_runtime" = x"Apple"], [
+AS_IF([test x"$objc_runtime" = x"Apple runtime"], [
 	AC_CHECK_HEADER(Foundation/NSObject.h, [
 		AC_SUBST(FOUNDATION_COMPAT_M, "foundation-compat.m")
 	])
 ])