Re: [ptxdist] [PATCH 04/10] rrdtool: make graph functionality optional

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Sun, Jan 25, 2015 at 01:37:20AM +0100, Robert Schwebel wrote:
> If we need only the rrd functionality of rrdtool and do graphing
> somewhere else, we don't need these dependencies.
> 
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ---
>  rules/rrdtool.in   | 16 +++++++++++-----
>  rules/rrdtool.make |  2 +-
>  2 files changed, 12 insertions(+), 6 deletions(-)
> 
> diff --git a/rules/rrdtool.in b/rules/rrdtool.in
> index 3ae66d7..1249f27 100644
> --- a/rules/rrdtool.in
> +++ b/rules/rrdtool.in
> @@ -3,11 +3,11 @@
>  menuconfig RRDTOOL
>  	tristate
>  	select GLIB
> -	select CAIRO
> -	select CAIRO_SVG
> -	select CAIRO_PDF
> -	select CAIRO_PS
> -	select PANGO
> +	select CAIRO if RRDTOOL_RRD_GRAPH
> +	select CAIRO_SVG if RRDTOOL_RRD_GRAPH
> +	select CAIRO_PDF if RRDTOOL_RRD_GRAPH
> +	select CAIRO_PS if RRDTOOL_RRD_GRAPH
> +	select PANGO if RRDTOOL_RRD_GRAPH

align the 'if's with tabs.

Michael

>  	select LIBXML2
>  	select LIBXML2_SAX1
>  # for autotools only
> @@ -40,6 +40,12 @@ config RRDTOOL_RRDCGI
>  	  purpose is to run as a cgi-program and parse a web page
>  	  template containing special <RRD:: tags.
>  
> +config RRDTOOL_RRD_GRAPH
> +	bool
> +	prompt "install rrd_graph"
> +	help
> +	  Enable all rrd_graph functions.
> +
>  config RRDTOOL_RRDTOOL
>  	bool
>  	prompt "install rrdtool"
> diff --git a/rules/rrdtool.make b/rules/rrdtool.make
> index a741bfd..5e2714e 100644
> --- a/rules/rrdtool.make
> +++ b/rules/rrdtool.make
> @@ -42,7 +42,7 @@ RRDTOOL_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
>  	--enable-silent-rules \
>  	--$(call ptx/endis, PTXCONF_RRDTOOL_RRDCGI)-rrdcgi \
> -	--disable-rrd_graph \
> +	--$(call ptx/endis, PTXCONF_RRDTOOL_RRD_GRAPH)-rrd_graph \
>  	--enable-mmap \
>  	--enable-pthread \
>  	--disable-static-programs \
> -- 
> 2.1.4
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de