Revert r24655, which inadvertently broke builds which used '--enable-maintainer-mode' but not '--enable-debug'.
Revert r24655, which inadvertently broke builds which used
'--enable-maintainer-mode' but not '--enable-debug'.

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