Temporary (hopefully) reversion to the previously used hack to

allow --prefix to work for now.  This means that part of the Apache
layout is duplicated in configure.in again.

There are a _LOT_ of inconsistencies in different places about what
items in config.layout are actually used and how they can be set.

Also, change the couple of other things that are necessary to make
/usr/local/apache2 the default prefix when using this way of doing
things.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88704 13f79535-47bb-0310-9956-ffa450edef68