libX11: Changes to 'master'

[Daniel Stone]

On Sat, Jun 02, 2007 at 10:05:55PM -0700, Josh Triplett wrote:
>  include/Makefile.am |    6 ++----
>  1 files changed, 2 insertions(+), 4 deletions(-)
> 
> New commits:
> commit 79fa3d8070d95b960ba486f2439225872471dadd
> Author: Josh Triplett <josh at freedesktop.org>
> Date:   Sat Jun 2 22:05:16 2007 -0700
> 
>     Revert "include: don't distribute XlibConf.h"
>     
>     This reverts commit c9e28e05ae01ce8a29bea09df759b6271865b44c.
>     
>     The installed XlibInt.h includes XlibConf.h , so libX11 should ship
>     XlibConf.h.  (Commit c9e28e05ae01ce8a29bea09df759b6271865b44c didn't actually
>     prevent automake from shipping XlibConf.h, because it used
>     nodist_x11include_HEADERS rather than nodist_HEADERS.)

No, you need to revert this reversion.  nodist means, do not include in
the distributed tarball.  Which makes a hell of a lot of sense, since
XlibConf.h is generated by configure, so any generated XlibConf.h is by
definition useless to everyone else; thus shipping it in the tarball can
only be harmful.

You'll note that the original commit referred to not _distributing_,
rather than not _shipping_.  nodist_x11include_HEADERS was entirely
intentional, rather than accidental: it means 'when make install is run,
put it in $(x11includedir), but when make dist is run, do not put it in
the tarball'.

i.e., the exact behaviour required.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg/attachments/20070603/8b79462f/attachment.pgp>