From: Floris Bos Date: Fri, 19 Sep 2014 15:59:43 +0000 (+0200) Subject: Add configure option to disable rrdcached X-Git-Tag: v1.5.0-rc1~27^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38fb0ad1eac5a5e2b1fec51a3b2a7c981b192976;p=thirdparty%2Frrdtool-1.x.git Add configure option to disable rrdcached Signed-off-by: Floris Bos --- diff --git a/configure.ac b/configure.ac index b1def9ad..d235a35c 100644 --- 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 408cb221..1496d8d5 100644 --- 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