[Changes contributed by Olly Betts] - Fix to build against Xapian <= 1.4.1 again, broken by changes in 1.2.25.1. Reported by Jim Lynch.