Made the configure script ot work again, so that we can conditionally
include unittests.