From: Tor Lillqvist <tml@iki.fi>
Date: Wed, 9 Mar 2005 00:47:11 +0000 (+0000)
Subject: Get the DLL from "bin" where modern libtools put it, not "lib".
X-Git-Tag: fc-2_3_1-2~2
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=79da4fe91ff0cee974e1ec7003857fb47c0f55d5;p=fontconfig.git

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 16cc6b3..9ea7cf0 100644
--- 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 fe56e63..4b36438 100755
--- 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 079e18c..551dbe1 100644
--- 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] != '/')