5c9ec95 Revert "Cherry pick patch from upstream which fixes build system,"

Authored and Committed by rjones 11 years ago
    Revert "Cherry pick patch from upstream which fixes build system,"
    
    This reverts commit 79efbf73dff145d4cdb773996bd7fee10bcee228.
    
    Sorry, this broke the build.
    
        
file modified
+6 -6