autoreconf'd on the laptop because the autoconfig stuff there is better.  Otherwise this would've gone with the last commits.