Another try at this commit.
With gcc-4.5.2, the stuct option defined in option.h
conflicts with an identically named struct in the gcc headers. Renamed the bjam struct to bjam_option in all places where referenced.