Re: X11/XlibConf.h missing

[Georg Schwarz <georg.schwarz%freenet.de@localhost>]

Am 03.01.2009 um 02:28 schrieb Jeremy C. Reed:

> Let's fix that test so xorg is xorg. See below.
>
> > We could change
> >
> > .elif exists(${X11BASE}/lib/X11/config/xorgversion.def)
> >
> > into
> >
> > .elif exists(${X11BASE}/lib/X11/config/xorgversion.def) ||
> > exists(${X11BASE}/bin/xorgconfig)
> >
> > Other items to trigger for could be the following directories:
> >
> > /usr/X11R6/include/xorg
> > /usr/X11R6/lib/xorg
> > /usr/X11R6/libdata/xorg
> >
> > What do you think would be the correct approach?
>
> Checking for xorgconfig seems good too.
>
> And or include/X11/XlibConf.h (like the subjectof this email)
>
> And or check for one of the include/xorg or lib/xorg directories.
>
> Do that and see if that works for you.

well, it's easy to have x11-links use xorg.mk instead of xfree.mk.
However, as a consequence, since X11_TYPE is native and not  
modular, ../../x11/libX11/buildlink3.mk does not add libX11 to  
BUILDLINK_PACKAGES. Further to that, X11/Xlib.h does not get added to  
x11-links's PLIST which causes e.g. x11/Xfixes to fail to compile,  
although the FreeBSD installation does ship with a /usr/X11R6/include/ 
X11/Xlib.h installed.
As a hack, if one adds

BUILDLINK_PACKAGES:=    ${BUILDLINK_PACKAGES:NlibX11}
BUILDLINK_PACKAGES+=    libX11

to xorg.mk and manually sets IS_BUILTIN.libX11=yes, things work.
This is of course not a fix.
The question thus remains whether xorg.mk is supposed to be used in  
the first place in case X11_TYPE is native, or even more broadly,  
whether it is correct to have X11_TYPE=native on a stock FreeBSD 7  
installation. Depending on that answer, we can develop a correct fix.

The same issue applies to libXext, too, BTW. It appears that xorg.mk  
was not supposed to be used with X11_TYPE!=modular, was it?





--
Georg Schwarz    http://home.pages.de/~schwarz/
georg.schwarz%freenet.de@localhost  +49 151 11559652