From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0] ident=Debian-exim) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1YFm2K-0002tV-DQ for ptxdist@pengutronix.de; Mon, 26 Jan 2015 16:57:12 +0100 Received: from mol by ptx.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1YFm2K-00088g-Bp for ptxdist@pengutronix.de; Mon, 26 Jan 2015 16:57:12 +0100 Date: Mon, 26 Jan 2015 16:57:12 +0100 From: Michael Olbrich Message-ID: <20150126155712.GF20195@pengutronix.de> References: <1422146246-11197-1-git-send-email-r.schwebel@pengutronix.de> <1422146246-11197-4-git-send-email-r.schwebel@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1422146246-11197-4-git-send-email-r.schwebel@pengutronix.de> Subject: Re: [ptxdist] [PATCH 04/10] rrdtool: make graph functionality optional Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@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 > --- > 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 > +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