@@ -1,6 +1,6 @@
-AC_INIT(ObjFW, 1.1-dev, js@nil.im)
+AC_INIT(ObjFW, 1.1dev, js@nil.im)
 AC_CONFIG_SRCDIR(src)
 AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_MACRO_DIR(build-aux/m4)
 
 AC_DEFINE(OBJFW_VERSION_MAJOR, 1, [The major version of ObjFW])
@@ -47,11 +47,12 @@
 	enable_files="yes"	# Required for reading ENV:
 	enable_shared="no"
 	supports_amiga_lib="yes"
 
 	AS_IF([test x"$enable_amiga_lib" != x"no"], [
-		AC_SUBST(OBJFWRT_AMIGA_LIB, objfwrt68k.library)
+		AC_SUBST(OBJFWRT_AMIGA_LIB,
+			['objfwrt${OBJFWRT_LIB_MAJOR}.library'])
 		dnl For 68000, GCC emits calls to helper functions that
 		dnl do not work properly in a library.
 		t="-mcpu=68020 -fbaserel -noixemul -ffreestanding"
 		AC_SUBST(AMIGA_LIB_CFLAGS, $t)
 		t="$t -resident -nostartfiles -nodefaultlibs -ldebug -lc"
@@ -78,11 +79,12 @@
 	enable_files="yes"	# Required for reading ENV:
 	enable_shared="no"
 	supports_amiga_lib="yes"
 
 	AS_IF([test x"$enable_amiga_lib" != x"no"], [
-		AC_SUBST(OBJFWRT_AMIGA_LIB, objfwrt.library)
+		AC_SUBST(OBJFWRT_AMIGA_LIB,
+			['objfwrt${OBJFW_LIB_MAJOR}ppc.library'])
 		t="-mresident32 -ffreestanding -noixemul"
 		AC_SUBST(AMIGA_LIB_CFLAGS, $t)
 		t="-mresident32 -nostartfiles -nodefaultlibs -noixemul -ldebug"
 		AC_SUBST(AMIGA_LIB_LDFLAGS, "$t -lc")
 	])
@@ -258,19 +260,10 @@
 		;;
 	i?86-*-darwin* | x86_64-*-darwin*)
 		dnl Don't use -no-integrated-as on Darwin. It breaks building
 		dnl for the iOS simulator.
 		;;
-	i?86-*-* | x86_64-*-*)
-		dnl Many older Clang versions don't support jmp short.
-		ASFLAGS="$ASFLAGS -no-integrated-as"
-		;;
-	*-*-mingw*)
-		dnl Clang's assembler on Windows is not complete yet and cannot
-		dnl compile all .S files.
-		ASFLAGS="$ASFLAGS -no-integrated-as"
-		;;
 	sparc64-*-*openbsd*)
 		dnl Clang generates assembly output on SPARC64 that OpenBSD's
 		dnl assembler does not accept.
 		flag="-integrated-as"
 		OBJCFLAGS="$OBJCFLAGS $flag"
@@ -977,10 +970,11 @@
 		;;
 	esac
 
 	AC_DEFINE(OF_HAVE_THREADS, 1, [Whether we have threads])
 	AC_SUBST(USE_SRCS_THREADS, '${SRCS_THREADS}')
+	AC_SUBST(OBJC_SYNC, objc_sync)
 
 	AC_ARG_ENABLE(compiler-tls,
 		AS_HELP_STRING([--disable-compiler-tls],
 			[disable compiler thread local storage]))
 
@@ -1369,10 +1363,13 @@
 			#endif
 		], [
 			AC_DEFINE(OF_HAVE_IPV6, 1, [Whether we have IPv6])
 		])
 	], [
+		dnl Work around a bug in autoconf 2.61 that creates a broken
+		dnl configure if this branch is empty.
+		:
 	], [
 		#ifdef _WIN32
 		typedef int BOOL;
 		#endif
 
@@ -1839,10 +1836,15 @@
 			__attribute__((__objc_root_class__))
 			# endif
 			#endif
 			@interface Test
 			@end
+
+			/**
+			 * @struct Foo conftest.m conftest.m
+			 */
+			typedef struct {} Foo;
 		])
 	], [
 		AC_MSG_RESULT(yes)
 	], [
 		AC_MSG_RESULT(no)
@@ -1922,11 +1924,10 @@
 		AC_CHECK_PROG(WINE, wine64, wine64)
 		;;
 	esac
 
 	AS_IF([test x"$WINE" != x""], [
-		AC_SUBST(RUN_TESTS, "run")
 		AC_SUBST(WRAPPER, "$WINE")
 	])
 
 	AS_IF([test x"$with_wii" = x"yes"], [
 		dnl Keep this lowercase, as WIILOAD is a variable used by
@@ -1936,12 +1937,10 @@
 
 		AS_IF([test x"$wiiload" != x""], [
 			AC_SUBST(WRAPPER, "$wiiload")
 		])
 	])
-], [
-	AC_SUBST(RUN_TESTS, "run")
 ])
 
 AC_ARG_WITH(fish_completions,
 	AS_HELP_STRING([--with-fish-completions],
 		[install completions for the fish shell]))