Commit dac73a51 authored by Alan Coopersmith's avatar Alan Coopersmith

Set Xft.h version numbers from configure.ac

Keep the two in sync automatically instead of manually
Signed-off-by: default avatarAlan Coopersmith <alan.coopersmith@sun.com>
parent cfa048b4
......@@ -41,9 +41,7 @@ Support fontconfig 2.2 release which doesn't include FC_HINT_STYLE.
To release a version of this library:
1. Update the version numbers
configure.ac
Xft.h
1. Update the version number in configure.ac
2. Fix the README
Change version number
Set the date
......
......@@ -25,9 +25,7 @@ AC_PREREQ([2.57])
dnl
dnl This is the package version number, not the shared library
dnl version. This same version number must appear in Xft.h
dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's
dnl not possible to extract the version number here from Xft.h
dnl version. This version number will be substituted into Xft.h
dnl Please bump the minor library number at each release as well.
dnl
AC_INIT(libXft, 2.1.13, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXft)
......@@ -46,6 +44,19 @@ AC_PROG_CC
AC_PROG_LIBTOOL
XORG_DEFAULT_OPTIONS
# Set library version for Xft.h from package version set in AC_INIT
# copied from PACKAGE_VERSION_* settings in XORG_VERSION
AC_CONFIG_HEADERS([include/X11/Xft/Xft.h])
AC_DEFINE_UNQUOTED([XFT_MAJOR],
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
[Major version of Xft])
AC_DEFINE_UNQUOTED([XFT_MINOR],
[`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`],
[Minor version of Xft])
AC_DEFINE_UNQUOTED([XFT_REVISION],
[`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`],
[Micro revision of Xft])
#
# Check for Xrender
#
......
......@@ -24,14 +24,13 @@
#define _XFT_H_
/*
* Current Xft version number. This same number
* must appear in the Xft configure.ac file. Yes,
* it'a a pain to synchronize version numbers like this.
*/
#define XFT_MAJOR 2
#define XFT_MINOR 1
#define XFT_REVISION 13
* 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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment