Bug#397542: #397542: libxt6: Should include %l_%t.%c, %l.%c and %l_%t in FileSearchPathDefault

[Samuel Thibault <samuel.thibault@ens-lyon.org>]

Hi,

Drew Parsons, le Tue 18 Sep 2007 22:55:25 +1000, a écrit :
> I can't easily evaluate if it now meets your needs or not.  I think we
> do still need the patch, since the .c entries are still missing.

It doesn't indeed

> Would it be possibly for you to review the current setting of
> XFILESEARCHPATHDEFAULT and prepare a fresh patch if required?  I'll
> apply the new patch straight away if no one else objects.

Uh, the variable got pretty big.

More formally, it's just a matter of, where %L is used, to also use
%l_%t.%c, %l.%c and %l_%t.

In a bash-like notation, that would be a matter of replacing %L with
{%L,%l_%t.%c,%l.%c,%l_%t}. The result is:

XFILESEARCHPATHDEFAULT='$(sysconfdir)/X11/%L/%T/%N%C%S:$(sysconfdir)/X11/%l_%t.%c/%T/%N%C%S:$(sysconfdir)/X11/%l.%c/%T/%N%C%S:$(sysconfdir)/X11/%l_%t/%T/%N%C%S:$(sysconfdir)/X11/%l/%T/%N%C%S:$(sysconfdir)/X11/%T/%N%C%S:$(sysconfdir)/X11/%L/%T/%N%S:$(sysconfdir)/X11/%l_%t.%c/%T/%N%S:$(sysconfdir)/X11/%l.%c/%T/%N%S:$(sysconfdir)/X11/%l_%t/%T/%N%S:$(sysconfdir)/X11/%l/%T/%N%S:$(sysconfdir)/X11/%T/%N%S:$(datadir)/X11/%L/%T/%N%C%S:$(datadir)/X11/%l_%t.%c/%T/%N%C%S:$(datadir)/X11/%l.%c/%T/%N%C%S:$(datadir)/X11/%l_%t/%T/%N%C%S:$(datadir)/X11/%l/%T/%N%C%S:$(datadir)/X11/%T/%N%C%S:$(datadir)/X11/%L/%T/%N%S:$(datadir)/X11/%l_%t.%c/%T/%N%S:$(datadir)/X11/%l.%c/%T/%N%S:$(datadir)/X11/%l_%t/%T/%N%S:$(datadir)/X11/%l/%T/%N%S:$(datadir)/X11/%T/%N%S:$(libdir)/X11/%L/%T/%N%C%S:$(libdir)/X11/%l_%t.%c/%T/%N%C%S:$(libdir)/X11/%l.%c/%T/%N%C%S:$(libdir)/X11/%l_%t/%T/%N%C%S:$(libdir)/X11/%l/%T/%N%C%S:$(libdir)/X11/%T/%N%C%S:$(libdir)/X11/%L/%T/%N%S:$(libdir)/X11/%l_%t.%c/%T/%N%S:$(libdir)/X11/%l.%c/%T/%N%S:$(libdir)/X11/%l_%t/%T/%N%S:$(libdir)/X11/%l/%T/%N%S:$(libdir)/X11/%T/%N%S'


All things considered, maybe XFILESEARCHPATHDEFAULT could be set this
way instead, much more readable:

XFILESEARCHPATHDEFAULT=
for i in "$(sysconfdir)" "$(datadir)" "$(libdir)"; do
  for j in %N%C%S %N%S ; do
    for k in %L/ %l_%t.%c/ %l.%c/ %l_%t/ %l/ "" ; do
      XFILESEARCHPATHDEFAULT="${XFILESEARCHPATHDEFAULT:+$XFILESEARCHPATHDEFAULT:}$i/X11/$k%T/$j"
    done
  done
done

(which is actually the way I generated the bloat above)
(not tested within autoconf's quoting crazyness)

Samuel