Lots of cosmetic fixes. Reduced the number of chained if-else statements by using elif in more places. Rev: src/configure.in:1.1091