Add configure option to disable rrdcached

Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>

diff --git a/configure.ac b/configure.ac
index b1def9ada9f16171067388d7c2de6bbca96891ea..d235a35c3c97bfb52e41ac74f3af7e7894236ea5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -99,6 +99,9 @@ AC_ARG_VAR(RRDGRAPH_YLEGEND_ANGLE,
 AC_DEFINE_UNQUOTED(RRDGRAPH_YLEGEND_ANGLE,${RRDGRAPH_YLEGEND_ANGLE:-90.0},
  [Vertical label angle: -90.0 (default) or 90.0])
 
+AC_ARG_ENABLE(rrdcached,AS_HELP_STRING([--disable-rrdcached],[disable building of rrdcached]),
+[],[enable_rrdcached=yes])
+
 AC_ARG_ENABLE(rrdcgi,AS_HELP_STRING([--disable-rrdcgi],[disable building of rrdcgi]),
 [],[enable_rrdcgi=yes])
 
@@ -109,6 +112,7 @@ AC_ARG_ENABLE(rrd_restore,AS_HELP_STRING([--disable-rrd_restore],[disable rrd_re
 [],[enable_rrd_restore=yes])
 
 AM_CONDITIONAL(BUILD_RRDCGI,[test $enable_rrdcgi != no])
+AM_CONDITIONAL(BUILD_RRDCACHED,[test $enable_rrdcached != no])
 
 
 if test $enable_rrd_graph != no; then
@@ -1009,6 +1013,7 @@ fi
 fi
 echo "    Build Tcl Bindings: $enable_tcl"
 echo " Build Python Bindings: $enable_python"
+echo "       Build rrdcached: $enable_rrdcached"
 echo "          Build rrdcgi: $enable_rrdcgi"
 echo "       Build librrd MT: $enable_pthread"
 echo "           Use gettext: $USE_NLS"

diff --git a/src/Makefile.am b/src/Makefile.am
index 408cb22119a0d8f2f682672e8a9b5b6457cac294..1496d8d5fb0d206ee666b79f9cf5c6a037b2e728 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -113,12 +113,16 @@ librrd_th_la_LIBADD          = $(ALL_LIBS) $(LIBINTL)
 
 include_HEADERS        = rrd.h rrd_format.h rrd_client.h
 
-bin_PROGRAMS   = rrdtool rrdupdate rrdcached
+bin_PROGRAMS   = rrdtool rrdupdate
 
 if BUILD_RRDCGI
 bin_PROGRAMS += rrdcgi
 endif
 
+if BUILD_RRDCACHED
+bin_PROGRAMS += rrdcached
+endif
+
 rrdcgi_SOURCES = rrd_cgi.c
 rrdcgi_LDADD   = librrd.la