[Merge][CMake] Block revision r7117

Initial message was : Make autotools the default build system. 

One can select CMake using the --use-cmake switch. This prepares
the merge to the trunk.


[[Imported from SVN: r7346]]