Re: X11/XlibConf.h missing

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

Am 14.12.2008 um 06:58 schrieb Jeremy C. Reed:

> On Sat, 13 Dec 2008, Jeremy C. Reed wrote:
>
> > On Sun, 14 Dec 2008, Georg Schwarz wrote:
> >
> > > Is it OK to simply include it to that list? Could that turn out a
> > > problem on Xfree versions not containing X11/XlibConf.h?
> >
> > It is okay to add extra files. The symlink simply won't be made if  
> > the
> > target doesn't exist. (Several entries for x11-links are already like
> > that.)
>
>
> Re-read your email again. FreeBSD 7 should be Xorg not XFree86. The  
> change

it is, at least that's what it says on installation of FreeBSD.  
However, pkgsrc for X11_TYPE seems to support either modular or  
native, the latter one being selected by default on FreeBSD. This  
choice is probably right, since it's not modular xorg, is it?


> should be in the xorg related file not "xfree86". I already see it  
> though.
>
> What made it use "xfree86" on your system? We may need to track that
> down instead.

simple: pkgsrc/pkgtools/x11-links/Makefile has

.elif exists(${X11BASE}/lib/X11/config/xorgversion.def)
.  include "xorg.mk"
.else
.  include "xfree.mk"
.endif


so /usr/X11R6/lib/x11/config does not exist on the stock FreeBSD  
installation, so it defaults to include xfree.mk.
Do you think this is incorrect? Should it rather use xorg.mk (even  
though X11_TYPE is native, which is not checked here anyway)?

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?




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