79efbf Cherry pick patch from upstream which fixes build system,

Authored and Committed by rjones@redhat.com 12 years ago
    Cherry pick patch from upstream which fixes build system,
    and remove hack.
    
        
file modified
+6 -6