@@ -264,19 +264,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"
@@ -1392,10 +1383,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
 
@@ -1853,10 +1847,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)
@@ -1936,11 +1935,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
@@ -1950,12 +1948,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]))