Get the DLL from "bin" where modern libtools put it, not "lib".

Check also drive letter prefix on Win32.

diff --git a/ChangeLog b/ChangeLog
index 16cc6b3cca89089ab67dbb87c554ef40999c14b3..9ea7cf045c9c4f8298d10fc54ad42ae46f73cead 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-03-09  Tor Lillqvist  <tml@novell.com>
+
+       * fontconfig-zip.in: Get the DLL from "bin" where modern libtools
+       put it, not "lib".
+
+       * src/fccfg.c (FcConfigFileExists): Check also drive letter
+       prefix on Win32.
+
 2005-03-08  Keith Packard  <keithp@keithp.com>
 
        * README:

diff --git a/fontconfig-zip.in b/fontconfig-zip.in
index fe56e63edbea13d9871c0eeb0f19bdd6399b0d4e..4b364388c7bab0aa42fc4a9a18b7a2722cca1d48 100755 (executable)
--- a/fontconfig-zip.in
+++ b/fontconfig-zip.in
@@ -10,7 +10,7 @@ DEVZIP=/tmp/fontconfig-dev-@VERSION@.zip
 cd @prefix@
 rm -f $ZIP
 zip $ZIP -@ <<EOF
-lib/libfontconfig-@LT_CURRENT_MINUS_AGE@.dll
+bin/libfontconfig-@LT_CURRENT_MINUS_AGE@.dll
 etc/fonts/fonts.conf
 EOF
 

diff --git a/src/fccfg.c b/src/fccfg.c
index 079e18c25514604c9b66784169606dd70289ef81..551dbe19178ff8c00bf6d93a06fb44269d6e6125 100644 (file)
--- a/src/fccfg.c
+++ b/src/fccfg.c
@@ -1503,7 +1503,9 @@ FcConfigFileExists (const FcChar8 *dir, const FcChar8 *file)
 #ifdef _WIN32
     if ((!path[0] || (path[strlen((char *) path)-1] != '/' &&
                      path[strlen((char *) path)-1] != '\\')) &&
-        (file[0] != '/' && file[0] != '\\'))
+       !(file[0] == '/' ||
+         file[0] == '\\' ||
+         (isalpha (file[0]) && file[1] == ':' && (file[2] == '/' || file[2] == '\\'))))
        strcat ((char *) path, "\\");
 #else
     if ((!path[0] || path[strlen((char *) path)-1] != '/') && file[0] != '/')