[Commit] Xft Makefile.am,1.5,1.6 Xft.h,1.33,1.34 configure.ac,1.6,1.7 xft.pc.in,1.1,1.2

[commit@keithp.com]

Update of /local/src/CVS/Xft
In directory home.keithp.com:/tmp/cvs-serv22583

Modified Files:
	Makefile.am Xft.h configure.ac xft.pc.in 
Log Message:
Remove extra version number (PACKAGE_VERSION) from confgiure.ac.  One (VERSION) seems like plenty.  Bump version to 2.1.1


Index: Makefile.am
===================================================================
RCS file: /local/src/CVS/Xft/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	20 Apr 2003 03:32:21 -0000	1.5
+++ Makefile.am	21 Apr 2003 16:59:26 -0000	1.6
@@ -52,7 +52,7 @@
 libXft_la_LIBADD = @FONTCONFIG_LIBS@ @FREETYPE_LIBS@ @XRENDER_LIBS@
 
 # -version-number requires libtool >= 1.5
-libXft_la_LDFLAGS = -version-number 2:1
+libXft_la_LDFLAGS = -version-number 2:1:1
 
 libXftincludedir = $(includedir)/X11/Xft
 libXftinclude_HEADERS = Xft.h XftCompat.h 

Index: Xft.h
===================================================================
RCS file: /local/src/CVS/Xft/Xft.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- Xft.h	17 Apr 2003 04:29:24 -0000	1.33
+++ Xft.h	21 Apr 2003 16:59:26 -0000	1.34
@@ -25,9 +25,15 @@
 #ifndef _XFT_H_
 #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	0
+#define XFT_REVISION	1
 #define XFT_VERSION	((XFT_MAJOR * 10000) + (XFT_MINOR * 100) + (XFT_REVISION))
 #define XftVersion	XFT_VERSION
 

Index: configure.ac
===================================================================
RCS file: /local/src/CVS/Xft/configure.ac,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- configure.ac	17 Apr 2003 23:34:25 -0000	1.6
+++ configure.ac	21 Apr 2003 16:59:26 -0000	1.7
@@ -24,9 +24,13 @@
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.50])
-AC_INIT([xft], [2.1.0])
+AC_INIT(Xft.h)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(xft, 2.1.0)
+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
+AM_INIT_AUTOMAKE(xft, 2.1.1)
 
 # checks for progs
 AC_PROG_CC

Index: xft.pc.in
===================================================================
RCS file: /local/src/CVS/Xft/xft.pc.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xft.pc.in	23 May 2002 23:01:56 -0000	1.1
+++ xft.pc.in	21 Apr 2003 16:59:26 -0000	1.2
@@ -9,7 +9,7 @@
 
 Name: Xft
 Description: X FreeType library
-Version: @PACKAGE_VERSION@
+Version: @VERSION@
 Requires: fontconfig
 Libs: -L${libdir} -lXft ${freetypelibs} ${xrenderlibs}
 Cflags: -I${includedir} ${freetypecflags} ${xrendercflags}