Merge a couple of configure script checks in from team/russell/events. This adds