Apply a fix from Eric Blake that already went into autoconf.