mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Robert Schwebel <r.schwebel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCHv3 04/10] rrdtool: make graph functionality optional
Date: Mon,  2 Feb 2015 12:49:58 +0100	[thread overview]
Message-ID: <1422877804-31082-4-git-send-email-r.schwebel@pengutronix.de> (raw)
In-Reply-To: <1422877804-31082-1-git-send-email-r.schwebel@pengutronix.de>

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>
---
Changes since v2:
* none
Changes since v1:
* align dependencies in .in file

 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..eb0af56 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
 	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 430565b..ce7bc24 100644
--- a/rules/rrdtool.make
+++ b/rules/rrdtool.make
@@ -41,7 +41,7 @@ RRDTOOL_CONF_TOOL	:= autoconf
 RRDTOOL_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
 	--$(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

  parent reply	other threads:[~2015-02-02 11:49 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-02 11:49 [ptxdist] [PATCHv3 01/10] rrdtool: version bump 1.4.7 -> 1.4.9 Robert Schwebel
2015-02-02 11:49 ` [ptxdist] [PATCHv3 02/10] rrdtool: audit configure options Robert Schwebel
2015-02-02 11:49 ` [ptxdist] [PATCHv3 03/10] rrdtool: fix libxml2 handling Robert Schwebel
2015-02-02 11:49 ` Robert Schwebel [this message]
2015-02-02 11:49 ` [ptxdist] [PATCHv3 05/10] rrdtool: install multithreaded library Robert Schwebel
2015-02-02 11:50 ` [ptxdist] [PATCHv3 06/10] collectd: add base functionality Robert Schwebel
2015-02-04 13:21   ` Michael Olbrich
2015-02-02 11:50 ` [ptxdist] [PATCHv3 07/10] collectd: add support for rrdtool plugin Robert Schwebel
2015-02-02 11:50 ` [ptxdist] [PATCHv3 08/10] collectd: add support for syslog plugin Robert Schwebel
2015-02-02 11:50 ` [ptxdist] [PATCHv3 09/10] collectd: add support for cpu plugin Robert Schwebel
2015-02-02 11:50 ` [ptxdist] [PATCHv3 10/10] collectd: add support for logfile plugin Robert Schwebel
2015-02-04 13:48 ` [ptxdist] [PATCHv3 01/10] rrdtool: version bump 1.4.7 -> 1.4.9 Michael Olbrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1422877804-31082-4-git-send-email-r.schwebel@pengutronix.de \
    --to=r.schwebel@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox