The handling of --srcdir in the last patch a) didn't actually change
where configure.ac was found b) didn't actualy let the --srcdir argument
through because it was rejected by later code. Fix both.