Revert r901778, as it was a change to work around a problem in the build system which gets confused by an older installed copy of the libraries. Deleting the installed libraries was sufficient to solve the problem.
Revert r901778, as it was a change to work around a problem in the
build system which gets confused by an older installed copy of the
libraries. Deleting the installed libraries was sufficient to solve
the problem.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion