Improved configure.in: