Big merge on XORG-CURRENT in progress...

[Roland Mainz]

Roland Mainz wrote:
> 
> Hi!
> 
> ----
> 
> I am landing today (e.g. within the next 12 hours, starting from Wed Apr
> 21 00:45:00 MEST 2004, e.g. --->NOW<---) the XPRINT branch on
> XORG-CURRENT. Tracker bug for that work is
> http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=523
> If you find any regressions caused by that work please file a bug, mark
> it as blocker for bug 523 and add roland.mainz at nrubsig.org into the CC:
> field of the bugzilla bug.
> 
> Please AVOID any checkins to XORG-CURRENT during that time, otherwise
> all he*ll may break loose.

I am done with the landing. At least on SuSE Linux 8.2 the tree builds
and "make install" works, I'll to further testing tomorrow when I am
awake again.

Two things went wrong during the merge:
1. The patch for
http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=460 ("xlogo"
does not build without BuildRenderLibrary set to YES") was part of the
Xprint branch and was merged into trunk without a notice in the
Changelog. I'll fix that later.

2. xc/config/cf/linux.cf has set |HasMotif| and |HasMotif2| set to
|YES|:
-- snip --
+#ifndef HasMotif
+# define HasMotif YES
+#endif /* !HasMotif */
+#ifndef HasMotif2
+# define HasMotif2 YES
+#endif /* !HasMotif2 */
-- snip --

This was only thought for testing but I forgot to unroll this... my
fault... ;-(

... but after some thinking it may be not bad. All major Unix versions
ship with Motif... would it be bad to do the same for Linux (this would
only result in a build requirement for libXm.so, not a runtime
requirement unless someone really uses the extra tools which are build
when the |HasMotif*| switches are set to |YES|) ? I would say "no"...
but I cannot make the decision... therefore: Are there any arguments
against keeping |HasMotif| and |HasMotif2| set to |YES| for Linux ? Or
should I undo that change ?

----

Bye,
Roland

-- 
  __ .  . __
 (o.\ \/ /.o) roland.mainz at nrubsig.org
  \__\/\/__/  MPEG specialist, C&&JAVA&&Sun&&Unix programmer
  /O /==\ O\  TEL +49 2426 901568 FAX +49 2426 901569
 (;O/ \/ \O;)