From: Dongsheng Song <songdongsheng@live.cn>
Date: Sat, 4 May 2013 09:29:13 +0000 (+0800)
Subject: Make gcc and binding happy
X-Git-Tag: v1.5.0-rc1~181^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c238ca48c6c88043ddf03a215beb34299d37bf7c;p=thirdparty%2Frrdtool-1.x.git

Make gcc and binding happy
---

diff --git a/configure.ac b/configure.ac
index d6b2722b..9882c6c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,7 +85,7 @@ AH_BOTTOM([
 #  include <malloc/malloc.h>
 #endif
 
-#include "src/rrd_config_bottom.h"
+#include "rrd_config_bottom.h"
 
 #endif
 ])
@@ -944,6 +944,10 @@ AC_CONFIG_COMMANDS([default],[[ chmod +x examples/*.pl]],[[]])
 dnl intl requires our config to be called config.h. indulge it.
 AC_CONFIG_COMMANDS_POST([ test -f config.h || ln -s rrd_config.h config.h ])
 
+dnl bindings use nasty path, just make them happy.
+AC_CONFIG_COMMANDS_POST([ test -f src/rrd_config.h || (cd src/ && ln -s ../rrd_config.h) ])
+AC_CONFIG_COMMANDS_POST([ test -f src/rrd_config_bottom.h || (cd src/ && ln -s ../rrd_config_bottom.h) ])
+
 AC_OUTPUT
 
 AC_MSG_CHECKING(in)
diff --git a/src/rrd_graph_helper.c b/src/rrd_graph_helper.c
index aad4706f..0b03cb86 100644
--- a/src/rrd_graph_helper.c
+++ b/src/rrd_graph_helper.c
@@ -735,7 +735,7 @@ graph_desc_t* newGraphDescription(image_desc_t *const im,enum gf_en gf,parsedarg
     gdp->cf=cf_conv(cf);
     if (((int)gdp->cf)==-1) { 
       rrd_set_error("bad CF: %s",cf); return NULL; }
-  } else { if (bitscmp(PARSE_CF)) { gdp->cf = (cf_en) -1; }}
+  } else { if (bitscmp(PARSE_CF)) { gdp->cf = (enum cf_en) -1; }}
   if ((color)&&(parse_color(color,&(gdp->col)))) { return NULL; }
   if ((color2)&&(parse_color(color2,&(gdp->col2)))) { return NULL; }
   if (rpn) {gdp->rpn=rpn;}
@@ -1388,7 +1388,7 @@ void rrd_graph_script(
 	}
 
 	/* convert to enum but handling LINE special*/
-	enum gf_en gf = (gf_en) -1;
+	enum gf_en gf = (enum gf_en) -1;
 	gf=gf_conv(cmd);
 	if ((int)gf == -1) {
 	  if (strncmp("LINE",cmd,4)==0) {