Revert "OpenCV should be compiled using pkg-config options." -- breaks
compilation on working systems

This reverts commit 4587b2f9043996fed36fc989c00329ec829ecae9.
Merge pull request #1277 from Yangqing/dev

some more namespace cleaning.