let rrd_graph honor the font name (RRD_DEFAULT_FONT) defined in confignt/config.h

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2@451 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/program/confignt/config.h b/program/confignt/config.h
index 62ebc5466b02b5b4f04e5e08dc3135d582e7b2dc..3a7336b047bc9ee0d045f00a4726f8756a982c17 100644 (file)
--- a/program/confignt/config.h
+++ b/program/confignt/config.h
@@ -14,15 +14,13 @@
 #define rrd_realloc(a,b) realloc((a), (b))
 
 #define snprintf _snprintf
-/* Code in rrd_graph.c:rrd_graph_init() uses the %windir%
- * environment variable to override this. This should
- * avoid the recompile problem if the system directory is
- * c:/windows vs. d:/winnt.
- * This #define can't be removed because:
- * (1) the constant is used outside of rrd_graph_init() to init a struct
- * (2) windir might not be available in all environments
+
+/* Code in rrd_graph.c:rrd_graph_init() uses the %windir% environment
+ * variable to find the actual location of this relative font path to avoid
+ * the recompile problem if the system directory is c:/windows vs. d:/winnt. 
  */
-#define RRD_DEFAULT_FONT "c:/windows/fonts/cour.ttf"
+
+#define RRD_DEFAULT_FONT "cour.ttf"
 
 #define RRDGRAPH_YLEGEND_ANGLE 90.0
 

diff --git a/program/src/rrd_graph.c b/program/src/rrd_graph.c
index 910f9dbf0f549a83445f19217879fdfa140eb259..dc21548dba90325bd58a9b62f7c9f52c23b66928 100644 (file)
--- a/program/src/rrd_graph.c
+++ b/program/src/rrd_graph.c
@@ -2797,7 +2797,8 @@ rrd_graph_init(image_desc_t *im)
             if (windir != NULL) {
                     strncpy(rrd_win_default_font,windir,999);
                     rrd_win_default_font[999] = '\0';
-                    strcat(rrd_win_default_font,"\\fonts\\cour.ttf");
+                    strcat(rrd_win_default_font,"\\fonts\\");
+                   strcat(rrd_win_default_font,RRD_DEFAULT_FONT);         
                     for(i=0;i<DIM(text_prop);i++){
                             strncpy(text_prop[i].font,rrd_win_default_font,sizeof(text_prop[i].font)-1);
                             text_prop[i].font[sizeof(text_prop[i].font)-1] = '\0';