556253 - Clean up setting of MOZ_MORKREADER/MOZ_MORK definitions in configure.in

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Mark Banner (:standard8)]

During the landing of bug 516758, we realised that the setting of MOZ_MORKREADER and MOZ_MORK was still dependent on the setting of MOZ_PLACES.

Whilst this is somewhat true, it is much better to have the defaults for these explicitly set to what Firefox/xulrunner are heading towards, rather than what everyone else has.

The attached patch removes the awkward set of tests and sets MOZ_MORKREADER on by default (which is what places requires) and turns off MOZ_MORK by default.

I'll also file a blocking bug for setting these correctly for SeaMonkey & Thunderbird according to their current requirements.

Comment 1

[Mark Banner (:standard8)]

Attachment: The fix

Comment 2

[Mark Banner (:standard8)]

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

This seemed to work fine on try, and locally on my Thunderbird build.

Comment 3

[(not currently active) Ted Mielczarek]

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

>+dnl Build Places if required
>+AC_SUBST(MOZ_PLACES)
>+if test "$MOZ_PLACES"; then
>+  AC_DEFINE(MOZ_PLACES)
>+fi

Please leave the AC_SUBST down with the rest of them for consistency.

Thanks for the cleanup!

Comment 4

[Mark Banner (:standard8)]

Checked in with comment addressed: http://hg.mozilla.org/mozilla-central/rev/d1de2b6a604a

Comment 5

[Serge Gautherie (:sgautherie)]

http://hg.mozilla.org/comm-central/rev/3179601351f1
Explicitly set MOZ_MORKREADER and MOZ_MORK for Thunderbird and SeaMonkey, and sync enable places changes from bug 516758.

Comment 6

[Serge Gautherie (:sgautherie)]

(In reply to comment #5)

Sorry, I confused a 3 for a 6.