@@ -1922,10 +1922,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