libXft: Changes to 'master'

[Jeremy Huddleston]

It looks like the dac73a51981632908ce86cff26af5b0bcfcdd770 isn't doing  
what it should be here on my system... the version numbers are not in  
the generated Xft.h ... interestingly, they are in config.h ... ???

/* include/X11/Xft/Xft.h.  Generated from Xft.h.in by configure.  */
...
/*
  * Current Xft version number, set from version in the Xft  
configure.ac file.
  */

#undef XFT_MAJOR        /* Will be substituted by configure */
#undef XFT_MINOR        /* Will be substituted by configure */
#undef XFT_REVISION     /* Will be substituted by configure */

#define XFT_VERSION     ((XFT_MAJOR * 10000) + (XFT_MINOR * 100) +  
(XFT_REVISION))
#define XftVersion      XFT_VERSION



On Oct 6, 2009, at 01:06, Alan Coopersmith wrote:

> NEWS                     |   53 ++++
> README                   |   59 +---
> configure.ac             |   28 +-
> include/X11/Xft/Xft.h    |  618  
> -----------------------------------------------
> include/X11/Xft/Xft.h.in |  617 +++++++++++++++++++++++++++++++++++++ 
> +++++++++
> 5 files changed, 711 insertions(+), 664 deletions(-)
>
> New commits:
> commit c498ec3e4fb8e07bad7b053535d832273ac9b402
> Author: Alan Coopersmith <alan.coopersmith at sun.com>
> Date:   Tue Oct 6 01:01:07 2009 -0700
>
>    Split NEWS & README, update both
>
>    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
>
> commit dac73a51981632908ce86cff26af5b0bcfcdd770
> Author: Alan Coopersmith <alan.coopersmith at sun.com>
> Date:   Tue Oct 6 00:39:14 2009 -0700
>
>    Set Xft.h version numbers from configure.ac
>
>    Keep the two in sync automatically instead of manually
>
>    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
>
> commit cfa048b4aa351068415c5e2711731246a9c19322
> Author: Alan Coopersmith <alan.coopersmith at sun.com>
> Date:   Mon Oct 5 23:53:33 2009 -0700
>
>    Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
>
>    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
>
> _______________________________________________
> xorg-commit mailing list
> xorg-commit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/xorg-commit

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 3333 bytes
Desc: not available
Url : http://lists.x.org/archives/xorg-devel/attachments/20091010/24e08184/attachment.bin