[Commit] fontconfig ChangeLog,1.21,1.22 configure.in,1.38,1.39 fontconfig-zip.in,1.1,1.2

Tor Lillqvist commit at keithp.com
Fri Jun 13 16:43:30 PDT 2003


Committed by: tml

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

Modified Files:
	ChangeLog configure.in fontconfig-zip.in 
Log Message:
2003-06-13  Tor Lillqvist  <tml at iki.fi>

	* fontconfig-zip.in (DEVZIP): Add share/doc directory. Add Fc*.3
	man pages.

	* configure.in: Set FC_DEFAULT_FONTS on Win32 to the
	WINDOWSFONTDIR token.

	* src/fontconfig.def.in: Move the LIBRARY and VERSION lines to the
	end, not to confuse libtool, which expects the EXPORTS line to be
	the first. Add FcConfigEnableHome.



Index: ChangeLog
===================================================================
RCS file: /local/src/CVS/fontconfig/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- ChangeLog	9 Jun 2003 19:21:06 -0000	1.21
+++ ChangeLog	13 Jun 2003 22:43:28 -0000	1.22
@@ -1,3 +1,15 @@
+2003-06-13  Tor Lillqvist  <tml at iki.fi>
+
+	* fontconfig-zip.in (DEVZIP): Add share/doc directory. Add Fc*.3
+	man pages.
+
+	* configure.in: Set FC_DEFAULT_FONTS on Win32 to the
+	WINDOWSFONTDIR token.
+
+	* src/fontconfig.def.in: Move the LIBRARY and VERSION lines to the
+	end, not to confuse libtool, which expects the EXPORTS line to be
+	the first. Add FcConfigEnableHome.
+
 2003-06-09  Keith Packard <keithp at keithp.com>
 
 	* Tag version 2.2.90

Index: configure.in
===================================================================
RCS file: /local/src/CVS/fontconfig/configure.in,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- configure.in	9 Jun 2003 19:21:06 -0000	1.38
+++ configure.in	13 Jun 2003 22:43:28 -0000	1.39
@@ -225,9 +225,15 @@
 
 case "$default_fonts" in
 yes)
-	FC_DEFAULT_FONTS="/usr/share/fonts"
-	AC_DEFINE_UNQUOTED(FC_DEFAULT_FONTS, "/usr/share/fonts", 
-			   [System font directory])
+	if test "$os_win32" = "yes"; then
+		FC_DEFAULT_FONTS="WINDOWSFONTDIR"
+		AC_DEFINE_UNQUOTED(FC_DEFAULT_FONTS, "WINDOWSFONTDIR", 
+				   [Windows font directory])
+	else
+		FC_DEFAULT_FONTS="/usr/share/fonts"
+		AC_DEFINE_UNQUOTED(FC_DEFAULT_FONTS, "/usr/share/fonts", 
+				   [System font directory])
+	fi
 	;;
 *)
 	FC_DEFAULT_FONTS="$default_fonts"

Index: fontconfig-zip.in
===================================================================
RCS file: /local/src/CVS/fontconfig/fontconfig-zip.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fontconfig-zip.in	22 Mar 2003 21:28:13 -0000	1.1
+++ fontconfig-zip.in	13 Jun 2003 22:43:28 -0000	1.2
@@ -26,5 +26,7 @@
 bin/fc-cache.exe
 man/man1/fc-cache.1
 man/man1/fc-list.1
-man/man3/fontconfig.3
+man/man3/Fc*.3
+man/man5/fonts-conf.5
+share/doc/fontconfig
 EOF




More information about the Commit mailing list