Revert "THRIFT-2045: C++ compiler warning and build cleanup"

This reverts commit 282e440c6de219b7b8f32b01cc7eb599f534f33f.

This change had unintended autoconf side effects.