n the 1.8.x-r1469519-and-friends branch: merge r1481848 from trunk.

Revert changes in configure.ac.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1469519-and-friends@1482494 13f79535-47bb-0310-9956-ffa450edef68
On the 1.8.x-r1469519-and-friends branch: merge r1481870 from trunk.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1469519-and-friends@1482495 13f79535-47bb-0310-9956-ffa450edef68