[xlibs-commit] Xfont ChangeLog,1.6,1.7 Makefile.am,1.4,1.5 configure.ac,1.9,1.10

[Eric Anholt]

Committed by: anholt

Update of /cvs/xlibs/Xfont
In directory pdx:/home/anholt/xlibs/Xfont

Modified Files:
	ChangeLog Makefile.am configure.ac 
Log Message:
Fix shared library version to be 1.4.1, matching XFree86's.
Make package version 1.4.1.


Index: ChangeLog
===================================================================
RCS file: /cvs/xlibs/Xfont/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ChangeLog	9 Nov 2003 03:08:03 -0000	1.6
+++ ChangeLog	9 Nov 2003 04:38:10 -0000	1.7
@@ -1,5 +1,14 @@
 2003-11-08  Eric Anholt  <anholt@FreeBSD.org>
 
+	reviewed by: <keithp@keithp.com>
+
+	* Makefile.am:
+	* configure.ac:
+	Fix shared library version to be 1.4.1, matching XFree86's.
+	Make package version 1.4.1.
+
+2003-11-08  Eric Anholt  <anholt@FreeBSD.org>
+
 	* configure.ac:
 	Make the distribution name libXfont, not Xfont, matching other xlibs.
 	Use the new AC_INIT/AM_INIT_AUTOMAKE so that .tar.bz2 dists get made.

Index: Makefile.am
===================================================================
RCS file: /cvs/xlibs/Xfont/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	29 Oct 2003 16:11:40 -0000	1.4
+++ Makefile.am	9 Nov 2003 04:38:10 -0000	1.5
@@ -66,7 +66,7 @@
 #
 # Shared library version info.  This is not the same as the package version
 #
-libXfont_la_LDFLAGS = -version-info @LT_VERSION_INFO@
+libXfont_la_LDFLAGS = -version-number 1:4:1
 
 libXfontincludedir = $(includedir)/X11/fonts
 libXfontinclude_HEADERS = \
@@ -78,7 +78,7 @@
 	include/X11/fonts/fontproto.h \
 	include/X11/fonts/fontstruct.h \
 	include/X11/fonts/fsmasks.h
-	
+
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xfont.pc

Index: configure.ac
===================================================================
RCS file: /cvs/xlibs/Xfont/configure.ac,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- configure.ac	9 Nov 2003 03:08:03 -0000	1.9
+++ configure.ac	9 Nov 2003 04:38:10 -0000	1.10
@@ -26,7 +26,7 @@
 AC_PREREQ([2.57])
 
 AC_INIT([libXfont],
-	0.0.1,
+	1.4.1,
 	[keithp@keithp.com],
 	libXfont)
 dnl
@@ -40,20 +40,6 @@
 AC_CONFIG_AUX_DIR(.)
 AC_CONFIG_HEADERS([include/X11/fonts/fontconf.h])
 
-dnl libtool versioning
-LT_CURRENT=0
-LT_REVISION=0
-LT_AGE=0
-
-AC_SUBST(LT_CURRENT)
-AC_SUBST(LT_REVISION)
-
-LT_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
-AC_SUBST(LT_VERSION_INFO)
-
-LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
-AC_SUBST(LT_CURRENT_MINUS_AGE)
-
 # Check for progs
 AC_PROG_CC
 AC_PROG_LIBTOOL