Fix bugs exposed by hikari's update to configure.in.