Export wine_get_font_dir from libwine for external use

[Dmitry Timoshkov]

Hello,

Changelog:
    Export wine_get_font_dir from libwine for external use.

diff -up cvs/hq/wine/fonts/Makefile.in wine/fonts/Makefile.in
--- cvs/hq/wine/fonts/Makefile.in	2006-02-18 09:40:59.000000000 +0800
+++ wine/fonts/Makefile.in	2006-03-06 21:34:01.000000000 +0800
@@ -3,7 +3,6 @@ TOPOBJDIR = ..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
-fontdir   = $(datadir)/fonts/wine
 
 BITMAP_FONTS  = \
 	coue1255.fon \
diff -up cvs/hq/wine/libs/wine/config.c wine/libs/wine/config.c
--- cvs/hq/wine/libs/wine/config.c	2006-02-18 09:41:04.000000000 +0800
+++ wine/libs/wine/config.c	2006-03-06 22:05:12.000000000 +0800
@@ -41,6 +41,7 @@ static const char server_dir_prefix[] = 
 
 static char *bindir;
 static char *dlldir;
+static char *fontdir;
 static char *config_dir;
 static char *server_dir;
 static char *user_name;
@@ -248,6 +249,7 @@ void wine_init_argv0_path( const char *a
     {
         bindir = build_path( libdir, LIB_TO_BINDIR );
         dlldir = build_path( libdir, LIB_TO_DLLDIR );
+        fontdir = build_path( libdir, LIB_TO_FONTDIR );
         return;
     }
 
@@ -283,6 +285,7 @@ void wine_init_argv0_path( const char *a
     }
 
     dlldir = build_path( bindir, BIN_TO_DLLDIR );
+    fontdir = build_path( libdir, BIN_TO_FONTDIR );
 }
 
 /* return the configuration directory ($WINEPREFIX or $HOME/.wine) */
@@ -292,6 +295,12 @@ const char *wine_get_config_dir(void)
     return config_dir;
 }
 
+/* retrieve the fonts dir */
+const char *wine_get_font_dir(void)
+{
+    return fontdir;
+}
+
 /* return the full name of the server directory (the one containing the socket) */
 const char *wine_get_server_dir(void)
 {
diff -up cvs/hq/wine/libs/wine/Makefile.in wine/libs/wine/Makefile.in
--- cvs/hq/wine/libs/wine/Makefile.in	2006-02-18 09:41:04.000000000 +0800
+++ wine/libs/wine/Makefile.in	2006-03-06 21:16:44.000000000 +0800
@@ -21,9 +21,12 @@ C_SRCS = \
 CONFIGDIRS = \
 	-DBINDIR='"$(bindir)"' \
 	-DDLLDIR='"$(dlldir)"' \
+	-DFONTDIR='"$(fontdir)"' \
 	-DLIB_TO_BINDIR=\"`$(RELPATH) $(libdir) $(bindir)`\" \
 	-DLIB_TO_DLLDIR=\"`$(RELPATH) $(libdir) $(dlldir)`\" \
-	-DBIN_TO_DLLDIR=\"`$(RELPATH) $(bindir) $(dlldir)`\"
+	-DLIB_TO_FONTDIR=\"`$(RELPATH) $(libdir) $(fontdir)`\" \
+	-DBIN_TO_DLLDIR=\"`$(RELPATH) $(bindir) $(dlldir)`\" \
+	-DBIN_TO_FONTDIR=\"`$(RELPATH) $(bindir) $(fontdir)`\"
 
 config.o: config.c $(RELPATH)
 	$(CC) -c $(ALLCFLAGS) -o $@ $(SRCDIR)/config.c $(CONFIGDIRS)
diff -up cvs/hq/wine/libs/wine/wine.def wine/libs/wine/wine.def
--- cvs/hq/wine/libs/wine/wine.def	2006-02-18 09:41:04.000000000 +0800
+++ wine/libs/wine/wine.def	2006-03-06 21:12:48.000000000 +0800
@@ -29,6 +29,7 @@ EXPORTS
     wine_get_cs
     wine_get_ds
     wine_get_es
+    wine_get_font_dir
     wine_get_fs
     wine_get_gs
     wine_get_server_dir
diff -up cvs/hq/wine/libs/wine/wine.map wine/libs/wine/wine.map
--- cvs/hq/wine/libs/wine/wine.map	2006-02-18 09:41:04.000000000 +0800
+++ wine/libs/wine/wine.map	2006-03-06 21:12:35.000000000 +0800
@@ -29,6 +29,7 @@ WINE_1.0
     wine_get_cs;
     wine_get_ds;
     wine_get_es;
+    wine_get_font_dir;
     wine_get_fs;
     wine_get_gs;
     wine_get_server_dir;
diff -up cvs/hq/wine/Make.rules.in wine/Make.rules.in
--- cvs/hq/wine/Make.rules.in	2006-02-18 09:39:24.000000000 +0800
+++ wine/Make.rules.in	2006-03-06 21:35:13.000000000 +0800
@@ -104,6 +104,7 @@ mandir          = @mandir@
 sysconfdir      = @sysconfdir@
 includedir      = @includedir@/wine
 dlldir          = @libdir@/wine
+fontdir         = @datadir@/fonts/wine
 prog_manext     = 1
 api_manext      = 3w
 conf_manext     = 5