Add share/doc directory. Add Fc*.3 man pages.

Set FC_DEFAULT_FONTS on Win32 to the WINDOWSFONTDIR token.
Move the LIBRARY and VERSION lines to the end, not to confuse libtool,
    which expects the EXPORTS line to be the first. Add FcConfigEnableHome.

diff --git a/ChangeLog b/ChangeLog
index f61f6c669f85370ee962cc2918605ecb249dd599..354eb048b4cc42ec397303de2a5b60bb00db5e57 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-06-13  Tor Lillqvist  <tml@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@keithp.com>
 
        * Tag version 2.2.90

diff --git a/configure.in b/configure.in
index 3bc3e7e2e9d54ca8b13ed0b3a7faff19a752f7c7..76e8d44ebc651e900c1d4887d5dd516f7c2a126d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -225,9 +225,15 @@ AC_ARG_WITH(default-fonts,     [  --with-default-fonts=DIR      Use fonts from D
 
 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"

diff --git a/fontconfig-zip.in b/fontconfig-zip.in
index d778c4be8ffb5749b0c0de127d8fc074e6e93248..6f9c43627e31ab82276d69516c81a384c515fa60 100755 (executable)
--- a/fontconfig-zip.in
+++ b/fontconfig-zip.in
@@ -26,5 +26,7 @@ bin/fc-list.exe
 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

diff --git a/src/fontconfig.def.in b/src/fontconfig.def.in
index cd937f3ef2c54594cd0e01f7386268dea5125fa0..bbb07a6e38f84173754e1d6dd130d952b7d0b457 100755 (executable)
--- a/src/fontconfig.def.in
+++ b/src/fontconfig.def.in
@@ -1,5 +1,3 @@
-LIBRARY fontconfig
-VERSION @LT_CURRENT@.@LT_REVISION@
 EXPORTS
        FcAtomicCreate
        FcAtomicDeleteNew
@@ -34,6 +32,7 @@ EXPORTS
        FcConfigBuildFonts
        FcConfigCreate
        FcConfigDestroy
+       FcConfigEnableHome
        FcConfigFilename
        FcConfigGetBlanks
        FcConfigGetCache
@@ -159,3 +158,5 @@ EXPORTS
        FcValueEqual
        FcValuePrint
        FcValueSave
+LIBRARY fontconfig
+VERSION @LT_CURRENT@.@LT_REVISION@