make dist works now. Update to 2.1.90 in preparation for eventual 2.2

release

COPYING

@@ -1,6 +1,6 @@
-$XFree86: $
+$Id$
 
-Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
+Copyright © 2001 Keith Packard
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that

ChangeLog

@@ -1,3 +1,23 @@
+Sat Mar  1 17:28:53 PST 2003	keithp
+	+ Ok, so the ChangeLog is a bit out of date
+
+	+ Lots of bugs fixed; most are in bugzilla, the
+	  biggest problems were in cache management where
+	  Owen discovered the library would lose badly when
+	  combining fonts-cache and ~/.fonts-cache data
+
+	+ Converted from autoconf to automake.  This after
+	  getting patches accepted into libtool to allow
+	  the '-version-number' argument which lets
+	  packages set version numbers explicitly rather
+	  than the roundabout libtool way
+
+	+ Converted documentation to SGML using the docbook
+	  DTD.  Now .txt and .html documents are installed
+	  in /usr/share/doc/fontconfig and there's no
+	  man page.  Perhaps a man version can be written
+	  at some point.
+
 Sat Aug 31 15:21:22 PDT 2002	keithp
 	+ Xrender and Xft had several bugs related to
 	  rendering manually placed or poly-face text

INSTALL

@@ -1,13 +1,8 @@
-You can build fontconfig with either autoconf or imake.
+Fontconfig is built with the traditional configure script:
 
-For autoconf:
+	$ ./configure --sysconfdir=/etc --prefix=/usr
 
-	$ sh cvscompile.sh --sysconfdir=/etc --prefix=/usr
+This should generate valid Makefiles, then:
-
-For imake:
-	$ xmkmf -a
-
-These should both generate valid Makefiles, in either case:
 
 	$ make
 	$ make install

Makefile.am

@@ -28,7 +28,8 @@ EXTRA_DIST = \
         fonts.conf.in \
 	fonts.dtd \
 	local.conf \
-        stamp-h.in
+        fontconfig.spec.in \
+        fontconfig.spec
 
 pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA = fontconfig.pc

README

@@ -1,9 +1,9 @@
 			Fontconfig
 	Font configuration and customization library
-		      Version 1.0.1
+		      Version 2.2
-		        2002-5-23
+		        2003-3-1
 
-This is the first public release of fontconfig, a font configuration and
+This is the third public release of fontconfig, a font configuration and
 customization library.  Fontconfig is designed to locate fonts within the
 system and select them according to requirements specified by applications.
 

configure.in

@@ -23,23 +23,24 @@ dnl  PERFORMANCE OF THIS SOFTWARE.
 dnl
 dnl Process this file with autoconf to create configure.
 
+AC_INIT(fonts.dtd)
+
 dnl ==========================================================================
 dnl                               Versioning              
 dnl ==========================================================================
 
-dnl The version number is also in fontconfig/fontconfig.h
+dnl This is the package version number, not the shared library version number
-AC_INIT(ChangeLog,1.0.3,fontconfig@fontconfig.org)
+dnl The shared library version lives in fontconfig/fontconfig.h
+AM_INIT_AUTOMAKE(fontconfig, 2.1.90)
 
 FONTCONFIG_HEADER=fontconfig/fontconfig.h
 FONTCONFIG_MAJOR=`awk '/^#define FC_MAJOR/ { print $3 }' $FONTCONFIG_HEADER`
 FONTCONFIG_MINOR=`awk '/^#define FC_MINOR/ { print $3 }' $FONTCONFIG_HEADER`
 FONTCONFIG_REVISION=`awk '/^#define FC_REVISION/ { print $3 }' $FONTCONFIG_HEADER`
-FONTCONFIG_VERSION="$FONTCONFIG_MAJOR.$FONTCONFIG_MINOR.$FONTCONFIG_REVISION"
 
 AC_SUBST(FONTCONFIG_MAJOR)
 AC_SUBST(FONTCONFIG_MINOR)
 AC_SUBST(FONTCONFIG_REVISION)
-AC_SUBST(FONTCONFIG_VERSION)
 
 dnl libtool versioning
 
@@ -48,8 +49,6 @@ AC_SUBST(LT_VERSION_NUMBER)
 
 dnl ==========================================================================
 
-AM_INIT_AUTOMAKE(fontconfig, $FONTCONFIG_VERSION)
-
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC

fc-lang/Makefile.am

@@ -33,6 +33,8 @@ noinst_HEADERS=$(TARG)
 
 ORTH=@ORTH_FILES@
 
+EXTRA_DIST=$(TMPL) $(ORTH)
+
 $(TARG): $(TMPL) fc-lang $(ORTH)
 	rm -f $(TARG)
 	./fc-lang $(ORTH) < $(TMPL) > $(TARG)

src/Makefile.am

@@ -4,6 +4,8 @@ INCLUDES = 						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/src
 	
+noinst_HEADERS=fcint.h
+
 libfontconfig_la_SOURCES = \
 	fcatomic.c \
 	fcblanks.c \

test/Makefile.am

@@ -2,3 +2,6 @@ check_SCRIPTS=run-test.sh
 TESTS_ENVIRONMENT=sh
 TESTS=run-test.sh
 
+TESTDATA=4x6.pcf 8x16.pcf out.expected fonts.conf.in
+
+EXTRA_DIST=$(check_SCRIPTS) $(TESTDATA)