@@ -49,13 +49,10 @@
 	supports_amiga_lib="yes"
 
 	AS_IF([test x"$enable_amiga_lib" != x"no"], [
 		AC_SUBST(OBJFW_AMIGA_LIB, objfw68k.library)
 		AC_SUBST(OBJFWRT_AMIGA_LIB, objfwrt68k.library)
-		AC_SUBST(SFDC_TARGET, m68k-amigaos)
-		AC_SUBST(SFD_FILE, amigaos3.sfd)
-		AC_SUBST(SFDC_INLINE_H, inline.h)
 		dnl For 68000, GCC emits calls to helper functions that
 		dnl do not work properly in a library.
 		t="-mcpu=68020 -fbaserel32 -noixemul -ffreestanding"
 		AC_SUBST(AMIGA_LIB_CFLAGS, $t)
 		t="$t -resident32 -nostartfiles -nodefaultlibs -ldebug -lc"
@@ -80,16 +77,14 @@
 	LIBS="$LIBS -ldebug"
 
 	enable_files="yes"	# Required for reading ENV:
 	enable_shared="no"
 	supports_amiga_lib="yes"
-	check_pedantic="no"	# Breaks generated inlines
 
 	AS_IF([test x"$enable_amiga_lib" != x"no"], [
 		AC_SUBST(OBJFW_AMIGA_LIB, objfw.library)
 		AC_SUBST(OBJFWRT_AMIGA_LIB, objfwrt.library)
-		AC_SUBST(CVINCLUDE_INLINE_H, inline.h)
 		t="-mresident32 -ffreestanding -noixemul"
 		AC_SUBST(AMIGA_LIB_CFLAGS, $t)
 		t="-mresident32 -nostartfiles -nodefaultlibs -noixemul"
 		t="$t -laboxstubs -labox -lmath -ldebug -lc"
 		AC_SUBST(AMIGA_LIB_LDFLAGS, $t)
@@ -1963,10 +1958,14 @@
 ])
 
 AC_ARG_WITH(fish_completions,
 	AS_HELP_STRING([--with-fish-completions],
 		[install completions for the fish shell]))
+AS_IF([test x"$with_fish_completions" = x""], [
+	AC_CHECK_PROG(FISH, fish, fish)
+	AS_IF([test x"$FISH" != x""], [with_fish_completions="yes"])
+])
 AS_IF([test x"$with_fish_completions" = x"yes"], [
 	AC_SUBST(FISH_COMPLETIONS, fish)
 ])
 
 dnl We don't call AC_PROG_CPP, but only AC_PROG_OBJCPP and set CPP to OBJCPP