Merge from HEAD:

If FcConfigHome() is NULL, use the temp folder. (I guess this branch
    doesn't crash on a NULL config->cache, but still a good idea to have a
    cache file, for performance, isn't it?)
Fix cut&paste error.
Remove CRs from the out file before comparing (needed on Windows).
Add share/doc directory. Add Fc*.3 man pages.
Move the LIBRARY and VERSION lines to the end, not to confuse libtool,
    which expects the EXPORTS line to be the first. Add FcConfigEnableHome.
Check also for DLL_EXPORT as indication of being built as a DLL on Win32.

diff --git a/ChangeLog b/ChangeLog
index 3a52b9126e7f40aeae3fe6512e02353896d18fbb..7518192952b38624839db1359701713864f6b5b5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2004-03-28  Tor Lillqvist  <tml@iki.fi>
+
+       Merge from HEAD:
+       
+       * src/fccfg.c (FcConfigCreate): If FcConfigHome() is NULL, use the
+       temp folder. (I guess this branch doesn't crash on a NULL
+       config->cache, but still a good idea to have a cache file, for
+       performance, isn't it?)
+
+       * src/Makefile.am (install-libtool-import-lib): Fix cut&paste error.
+
+       * test/run-test.sh: Remove CRs from the out file before comparing
+       (needed on Windows).
+
+       * fontconfig-zip.in (DEVZIP): Add share/doc directory. Add Fc*.3
+       man pages.
+
+       * 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.
+
+       * src/fccfg.c: Check also for DLL_EXPORT as indication of being
+       built as a DLL on Win32.
+
 2004-03-10  Keith Packard  <keithp@keithp.com>
 
        * README:

diff --git a/configure.in b/configure.in
index 21f3a0bf86726530daddd404928774d48eef7467..75912d9fe2fd872f5295541b3073046d5e77755b 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..fe56e63edbea13d9871c0eeb0f19bdd6399b0d4e 100755 (executable)
--- a/fontconfig-zip.in
+++ b/fontconfig-zip.in
@@ -26,5 +26,8 @@ bin/fc-list.exe
 bin/fc-cache.exe
 man/man1/fc-cache.1
 man/man1/fc-list.1
-man/man3/fontconfig.3
+man/man5/fonts-conf.5
+share/doc/fontconfig
 EOF
+
+zip $DEVZIP man/man3/Fc*.3

diff --git a/src/Makefile.am b/src/Makefile.am
index a30604e763770a65046d6c259f762a75813f33e3..7890e962066cc5b3d6395780007b67a2cef24696 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ export_symbols = -export-symbols fontconfig.def
 
 install-libtool-import-lib: 
        $(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)
-       $(INSTALL) fontconfig.def $(DESTDIR)$(libdir)/glib-2.0.def
+       $(INSTALL) fontconfig.def $(DESTDIR)$(libdir)/fontconfig.def
 
 uninstall-libtool-import-lib:
        -rm $(DESTDIR)$(libdir)/libfontconfig.dll.a $(DESTDIR)$(libdir)/fontconfig.def

diff --git a/src/fccfg.c b/src/fccfg.c
index 8d32db8fc1cf6b8b3ade862611c865269a34b415..d0cf358fe0c03b23cb7f253a904b3831d679fdaa 100644 (file)
--- a/src/fccfg.c
+++ b/src/fccfg.c
@@ -24,7 +24,7 @@
 
 #include "fcint.h"
 
-#if defined (_WIN32) && defined (PIC)
+#if defined (_WIN32) && (defined (PIC) || defined (DLL_EXPORT))
 #define STRICT
 #include <windows.h>
 #undef STRICT
@@ -60,6 +60,31 @@ FcConfigCreate (void)
        if (!FcConfigSetCache (config, (FcChar8 *) ("~/" FC_USER_CACHE_FILE)))
            goto bail4;
 
+#ifdef _WIN32
+    if (config->cache == 0)
+    {
+       /* If no home, use the temp folder. */
+       FcChar8     dummy[1];
+       int         templen = GetTempPath (1, dummy);
+       FcChar8     *temp = malloc (templen + 1);
+
+       if (temp)
+       {
+           FcChar8 *cache_dir;
+
+           GetTempPath (templen + 1, temp);
+           cache_dir = FcStrPlus (temp, FC_USER_CACHE_FILE);
+           free (temp);
+           if (!FcConfigSetCache (config, cache_dir))
+           {
+               FcStrFree (cache_dir);
+               goto bail4;
+           }
+           FcStrFree (cache_dir);
+       }
+    }
+#endif
+
     config->blanks = 0;
 
     config->substPattern = 0;
@@ -1355,7 +1380,7 @@ FcConfigSubstitute (FcConfig      *config,
     return FcConfigSubstituteWithPat (config, p, 0, kind);
 }
 
-#if defined (_WIN32) && defined (PIC)
+#if defined (_WIN32) && (defined (PIC) || defined (DLL_EXPORT))
 
 static FcChar8 fontconfig_path[1000] = "";
 

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@

diff --git a/test/run-test.sh b/test/run-test.sh
index b2600d78f9bf7a869570ea0e721994c4f2d968d3..ae5af1eb7f7eaae6dbe6d59f2a701aedfd1b6ab8 100644 (file)
--- a/test/run-test.sh
+++ b/test/run-test.sh
@@ -13,6 +13,7 @@ check () {
   $FCLIST - family pixelsize | sort >> out
   echo "=" >> out
   $FCLIST - family pixelsize | sort >> out
+  tr -d '\015' <out >out.tmp; mv out.tmp out
   if cmp out out.expected > /dev/null ; then : ; else
     echo "*** Test failed: $TEST"
     echo "*** output is in 'out', expected output in 'out.expected'"