full support for either C++11 (or not) builds
Merge branch 'ac_fix'