412582 - Remove MOZ_ENABLE_CAIRO_GFX from the build system

Status: RESOLVED FIXED

Description

[Peter Weilbacher]

While looking at bug 376790 and bug 376791 again I noticed that there are still quite a few checks of MOZ_ENABLE_CAIRO_GFX in our build system. I guess they can be removed by now.

Comment 1

[Ted Mielczarek [:ted.mielczarek]]

I noticed some cruft in the libxul makefiles the other day:
http://lxr.mozilla.org/mozilla/source/toolkit/library/libxul-config.mk#286

Comment 2

[Peter Weilbacher]

Created attachment 297352 [details] [diff] [review]
patch

Ted, yes, that stuff is what prompted me to file this bug. :-)

Well, this patch does what I had in mind. It kind of robs the "cairo-" (in front of the platform toolkit names in configure.in) of its purpose, but it seems to work, at least I can still compile SeaMonkey on Linux and it runs afterwards. Maybe a case for the try server?

Comment 3

[Ted Mielczarek [:ted.mielczarek]]

Comment on attachment 297352 [details] [diff] [review]
patch

r=me as long as you ran a tryserver build with this.

Do you have a followup on removing MOZ_CAIRO_GFX?  (Or did you already do that?)

Comment 4

[Peter Weilbacher]

Comment on attachment 297352 [details] [diff] [review]
patch

Yes, I did a try server run (with a patch that included this one).

The one on MOZ_CAIRO_GFX is bug 413632.

Comment 5

[Mike Beltzner [:beltzner, not reading bugmail]]

Comment on attachment 297352 [details] [diff] [review]
patch

a=beltzner for 1.9

Comment 6

[Peter Weilbacher]

Patch checked into trunk.

Comment 7

[Peter Weilbacher]

Just committed the change to config/static-config.mk that I had apparently forgotten last night.