Continuing to try and simplify the build system, calculate the remaining
two autoconf variables from the existing config.mak.
For the moment, leave a configure and configure.ac file in place to
allow any old build systems to continue to function without errors.