@@ -46,11 +46,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"
@@ -77,11 +78,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")
 	])
@@ -1361,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
 
@@ -1822,10 +1827,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)