Re: X11/XlibConf.h missing

["Jeremy C. Reed" <reed%reedmedia.net@localhost>]

On Sat, 3 Jan 2009, Georg Schwarz wrote:

> .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)?

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.


  Jeremy C. Reed