598613 - Allow Mork to be included/registered in libxul even when places is turned on

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Mark Banner (:standard8)]

The current libxul mechanism says that when places is enabled, Mork doesn't get registered within libxul:

http://hg.mozilla.org/mozilla-central/annotate/6a3efef10e69/toolkit/library/libxul-config.mk#l258

Historically, I think it was done this way because places replaced mork and history in Firefox. Now SeaMonkey wants to be libxul, the current set-up is invalid.

SeaMonkey's configuration for the last few months has been to build with MOZ_PLACES, MOZ_MORK and MOZ_MORKREADER enabled, so I don't think there are any conflicts there.

I'll do a patch to fix this, which we can get in at some stage as we've worked around it in SeaMonkey config for now.

Comment 1

[Mark Banner (:standard8)]

Attachment: The fix

This will allow mork to be properly linked into libxul separate regardless of whether or not places is enabled.

Comment 2

[Mark Banner (:standard8)]

Attachment: Remove the workaround from SeaMonkey

This removes the current workaround that SeaMonkey has. These patches will need landing at the same time.

Comment 3

[Kyle Huey (Exited; not receiving bugmail, old account, do not use)]

Comment on attachment 478758 [details] [diff] [review]
The fix

Any idea why the mork stuff is ifdef MOZ_XUL?

This is good. r=me.

Comment 4

[Mark Banner (:standard8)]

(In reply to comment #3)
> Any idea why the mork stuff is ifdef MOZ_XUL?

Nope, but I also wonder why we still have MOZ_XUL anyway.

Comment 5

[Kyle Huey (Exited; not receiving bugmail, old account, do not use)]

Camino I presume.

Comment 6

[Mark Banner (:standard8)]

Comment on attachment 478758 [details] [diff] [review]
The fix

Requesting 2.0 approval for when the tree reopens to land this simple patch that corrects the logic of building mork into libxul for those that need it.

Comment 7

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

Comment on attachment 478758 [details] [diff] [review]
The fix

a=beltzner

Comment 8

[Mark Banner (:standard8)]

Both patches checked in:

http://hg.mozilla.org/mozilla-central/rev/19029b83e6e7
http://hg.mozilla.org/comm-central/rev/edb0b0b8fd43