diff --git a/configure.in b/configure.in
index 48b4e62ceacb56abf7f177643699003a0a01dbb8..4fb42420bd4451c814f8f08310446695e2130a7b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -692,19 +692,25 @@ AC_ARG_WITH(rrdtool, [AS_HELP_STRING([--with-rrdtool@<:@=PREFIX@:>@], [Path to r
], [with_rrdtool="yes"])
if test "x$with_rrdtool" = "xyes"
then
- SAVE_CFLAGS="$CFLAGS"
+ SAVE_CPPFLAGS="$CPPFLAGS"
SAVE_LDFLAGS="$LDFLAGS"
- CFLAGS="$CFLAGS $librrd_cflags"
+ CPPFLAGS="$CPPFLAGS $librrd_cflags"
LDFLAGS="$LDFLAGS $librrd_ldflags"
AC_CHECK_HEADERS(rrd.h,, [with_rrdtool="no (rrd.h not found)"])
- CFLAGS="$SAVE_CFLAGS"
+ CPPFLAGS="$SAVE_CPPFLAGS"
LDFLAGS="$SAVE_LDFLAGS"
fi
if test "x$with_rrdtool" = "xyes"
then
+ SAVE_CPPFLAGS="$CPPFLAGS"
+ SAVE_LDFLAGS="$LDFLAGS"
+
+ CPPFLAGS="$CPPFLAGS $librrd_cflags"
+ LDFLAGS="$LDFLAGS $librrd_ldflags"
+
AC_CHECK_LIB(rrd_th, rrd_update_r,
[with_rrdtool="yes"
librrd_ldflags="$librrd_ldflags -lrrd_th -lm"
[-lm])
]
[-lm])
+
+ CPPFLAGS="$SAVE_CPPFLAGS"
+ LDFLAGS="$SAVE_LDFLAGS"
fi
if test "x$with_rrdtool" = "xyes"
then
AC_PLUGIN([load], [$plugin_load], [System load])
AC_PLUGIN([logfile], [yes], [File logging plugin])
AC_PLUGIN([mbmon], [yes], [Query mbmond])
+AC_PLUGIN([memcached], [yes], [memcached statistics])
AC_PLUGIN([memory], [$plugin_memory], [Memory usage])
AC_PLUGIN([multimeter], [$plugin_multimeter], [Read multimeter values])
AC_PLUGIN([mysql], [$with_libmysql], [MySQL statistics])
AC_PLUGIN([netlink], [$with_libnetlink], [Enhanced Linux network statistics])
AC_PLUGIN([network], [yes], [Network communication plugin])
AC_PLUGIN([nfs], [$plugin_nfs], [NFS statistics])
+AC_PLUGIN([nginx], [$with_libcurl], [nginx statistics])
AC_PLUGIN([ntpd], [yes], [NTPd statistics])
AC_PLUGIN([nut], [$with_libupsclient], [Network UPS tools statistics])
AC_PLUGIN([perl], [$with_libperl], [Embed a Perl interpreter])
load . . . . . . . $enable_load
logfile . . . . . . $enable_logfile
mbmon . . . . . . . $enable_mbmon
+ memcached . . . . . $enable_memcached
memory . . . . . . $enable_memory
multimeter . . . . $enable_multimeter
mysql . . . . . . . $enable_mysql
perl . . . . . . . $enable_perl
ping . . . . . . . $enable_ping
processes . . . . . $enable_processes
+ rrdtool . . . . . . $enable_rrdtool
sensors . . . . . . $enable_sensors
serial . . . . . . $enable_serial
snmp . . . . . . . $enable_snmp