--- src/configure.ac 2012-03-23 13:38:56.459091848 +0100
+++ rrdtool-1.4.7/src/configure.ac      2012-03-23 12:20:12.694912215 +0100
@@ -140,6 +140,13 @@
      esac],[staticprogs=no])
 AM_CONDITIONAL(STATIC_PROGRAMS,[test "x$staticprogs" = "xyes"])
 
+dnl Disable rrd deamon
+AC_ARG_ENABLE([rrd_daemon],
+AS_HELP_STRING([--disable-rrd_daemon],[disable rrddaemon]),
+[],
+[enable_rrd_daemon=yes])
+
+AM_CONDITIONAL(BUILD_RRD_DAEMON,[test $enable_rrd_daemon != no])
 
 CONFIGURE_PART(Audit Compilation Environment)
 
@@ -235,9 +242,10 @@
 
 dnl check for socket and nsl solaris again ... we need this for the new rrd_daemon stuff
 
+if test $enable_rrd_daemon != no; then
 AC_CHECK_FUNCS(socket, [],  AC_CHECK_LIB(socket, socket, [LIBS="${LIBS} -lsocket"; AC_DEFINE(HAVE_SOCKET)],[]))
 AC_CHECK_FUNCS(getaddrinfo, [],  AC_CHECK_LIB(nsl, getaddrinfo, [LIBS="${LIBS} -lnsl"; AC_DEFINE(HAVE_GETADDRINFO)],[]))
-
+fi
 
 
 dnl XXX: dunno about windows.. add AC_CHECK_FUNCS(munmap) there too?
@@ -545,9 +553,10 @@
 EX_CHECK_ALL(cairo,      cairo_pdf_surface_create,      cairo-pdf.h,            cairo-pdf,   1.10.2,  http://cairographics.org/releases/, "")
 EX_CHECK_ALL(cairo,      cairo_ps_surface_create,       cairo-ps.h,             cairo-ps,    1.10.2,  http://cairographics.org/releases/, "")
 EX_CHECK_ALL(pangocairo-1.0,  pango_cairo_context_set_font_options,  pango/pango.h,  pangocairo,  1.28.4,    http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "")
-
 fi
+if test $enable_rrd_daemon != no || test $enable_rrd_graph != no; then
 EX_CHECK_ALL(glib-2.0,   glib_check_version,            glib.h,                 glib-2.0,    2.28.7, ftp://ftp.gtk.org/pub/glib/2.28/, "")
+fi
 EX_CHECK_ALL(xml2,       xmlParseFile,                  libxml/parser.h,        libxml-2.0,        2.7.8,  http://xmlsoft.org/downloads.html, /usr/include/libxml2)
 
 if test "$EX_CHECK_ALL_ERR" = "YES"; then
@@ -953,6 +962,7 @@
 echo "          With MMAP IO: $enable_mmap"
 echo "      Build rrd_getopt: $build_getopt"
 echo "       Build rrd_graph: $enable_rrd_graph"
+echo "       Build rrd_daemon: $enable_rrd_daemon"
 echo "       Static programs: $staticprogs"
 echo "          Perl Modules: $COMP_PERL"
 echo "           Perl Binary: $PERL"
--- src/src/Makefile.am	2011-11-22 13:46:15.000000000 +0100
+++ rrdtool-1.4.7/src/src/Makefile.am	2012-03-23 14:59:09.231274866 +0100
@@ -97,7 +97,11 @@
 
 include_HEADERS	= rrd.h rrd_format.h rrd_client.h
 
-bin_PROGRAMS	= rrdtool rrdupdate rrdcached
+bin_PROGRAMS	= rrdtool rrdupdate
+
+if BUILD_RRD_DAEMON
+bin_PROGRAMS += rrdcached
+endif
 
 if BUILD_RRDCGI
 bin_PROGRAMS += rrdcgi