To comment on the following update, log in, then open the issue:
http://www.openoffice.org/issues/show_bug.cgi?id=93007





------- Additional comments from [EMAIL PROTECTED] Fri Aug 22 08:17:40 +0000 
2008 -------
I believe this comes from...

a) first cmcfixes48 made a change to scp2 as in

cvs diff -u -r1.304 -r1.305 source/ooo/file_library_ooo.scp

to add a "libmozbootstrap" library when building with system-mozilla
or building without mozilla. The original situation that with mozilla
bundled mozab *except under mac* remained.

b) dba31a made another change.

merging in the cvs diff -u -r1.305 -r1.306 source/ooo/file_library_ooo.scp
changed the ifdef to now mean.

"if building with system-mozilla, or building without mozilla, or "always on the
mac" then bundle mozab, otherwise bundle the libmozbootstrap library which
quite different logic

So its a merge conflict, attached is a patch to do the right thing

---------------------------------------------------------------------
Please do not reply to this automatically generated notification from
Issue Tracker. Please log onto the website and enter your comments.
http://qa.openoffice.org/issue_handling/project_issues.html#notification

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to