X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.in;h=719f94e51a7c7b5eac3ff5229a34d975787cfc96;hb=4027126a75439c7d2b1d5572092fd291ef19ead6;hp=3445e21f7204b780e196c5ed89e614f4bfa9bf56;hpb=a32e822b437d1d7047ab51f2f39234ea2df24eff;p=collectd.git

diff --git a/configure.in b/configure.in
index 3445e21f..719f94e5 100644
--- a/configure.in
+++ b/configure.in
@@ -409,7 +409,7 @@ AC_CHECK_FUNCS(gettimeofday select strdup strtol getaddrinfo getnameinfo strchr
 AC_FUNC_STRERROR_R
 
 AC_CACHE_CHECK([for strtok_r],
-  [have_strtok_r_default],
+  [c_cv_have_strtok_r_default],
   AC_LINK_IFELSE(
     AC_LANG_PROGRAM(
     [[[[
@@ -431,18 +431,18 @@ AC_CACHE_CHECK([for strtok_r],
         printf ("token = %s;\n", token);
       }
     ]]]]),
-    [have_strtok_r_default="yes"],
-    [have_strtok_r_default="no"]
+    [c_cv_have_strtok_r_default="yes"],
+    [c_cv_have_strtok_r_default="no"]
   )
 )
 
-if test "x$have_strtok_r_default" = "xno"
+if test "x$c_cv_have_strtok_r_default" = "xno"
 then
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -D_REENTRANT=1"
 
   AC_CACHE_CHECK([if strtok_r needs _REENTRANT],
-    [have_strtok_r_reentrant],
+    [c_cv_have_strtok_r_reentrant],
     AC_LINK_IFELSE(
       AC_LANG_PROGRAM(
       [[[[
@@ -464,7 +464,7 @@ then
           printf ("token = %s;\n", token);
         }
       ]]]]),
-      [have_strtok_r_reentrant="yes"],
+      [c_cv_have_strtok_r_reentrant="yes"],
       [AC_MSG_FAILURE([strtok_r isn't available. Please file a bugreport!])]
     )
   )
@@ -510,7 +510,7 @@ AC_ARG_WITH(nan-emulation, [AS_HELP_STRING([--with-nan-emulation], [use emulated
 [nan_type="none"])
 if test "x$nan_type" = "xnone"; then
   AC_CACHE_CHECK([whether NAN is defined by default],
-    [have_nan_default],
+    [c_cv_have_nan_default],
     AC_COMPILE_IFELSE(
       AC_LANG_PROGRAM(
       [[
@@ -524,18 +524,18 @@ static float foo = NAN;
        else
 	return 1;
       ]]),
-      [have_nan_default="yes"],
-      [have_nan_default="no"]
+      [c_cv_have_nan_default="yes"],
+      [c_cv_have_nan_default="no"]
     )
   )
-  if test "x$have_nan_default" = "xyes"
+  if test "x$c_cv_have_nan_default" = "xyes"
   then
     nan_type="default"
   fi
 fi
 if test "x$nan_type" = "xnone"; then
   AC_CACHE_CHECK([whether NAN is defined by __USE_ISOC99],
-    [have_nan_isoc],
+    [c_cv_have_nan_isoc],
     AC_COMPILE_IFELSE(
       AC_LANG_PROGRAM(
       [[
@@ -550,18 +550,18 @@ static float foo = NAN;
        else
 	return 1;
       ]]),
-      [have_nan_isoc="yes"],
-      [have_nan_isoc="no"]
+      [c_cv_have_nan_isoc="yes"],
+      [c_cv_have_nan_isoc="no"]
     )
   )
-  if test "x$have_nan_isoc" = "xyes"
+  if test "x$c_cv_have_nan_isoc" = "xyes"
   then
     nan_type="isoc99"
   fi
 fi
 if test "x$nan_type" = "xnone"; then
   AC_CACHE_CHECK([whether NAN can be defined by 0/0],
-    [have_nan_zero],
+    [c_cv_have_nan_zero],
     AC_RUN_IFELSE(
       AC_LANG_PROGRAM(
       [[
@@ -582,11 +582,11 @@ static float foo = NAN;
        else
 	return 1;
       ]]),
-      [have_nan_zero="yes"],
-      [have_nan_zero="no"]
+      [c_cv_have_nan_zero="yes"],
+      [c_cv_have_nan_zero="no"]
     )
   )
-  if test "x$have_nan_zero" = "xyes"
+  if test "x$c_cv_have_nan_zero" = "xyes"
   then
     nan_type="zero"
   fi
@@ -621,7 +621,7 @@ fi; fi; fi
 
 if test "x$fp_layout_type" = "xunknown"; then
   AC_CACHE_CHECK([if doubles are stored in x86 representation],
-    [fp_layout_need_nothing],
+    [c_cv_fp_layout_need_nothing],
     AC_RUN_IFELSE(
       AC_LANG_PROGRAM(
       [[[[
@@ -655,17 +655,17 @@ if test "x$fp_layout_type" = "xunknown"; then
 	else
 		return (1);
       ]]]]),
-      [fp_layout_need_nothing="yes"],
-      [fp_layout_need_nothing="no"]
+      [c_cv_fp_layout_need_nothing="yes"],
+      [c_cv_fp_layout_need_nothing="no"]
     )
   )
-  if test "x$fp_layout_need_nothing" = "xyes"; then
+  if test "x$c_cv_fp_layout_need_nothing" = "xyes"; then
     fp_layout_type="nothing"
   fi
 fi
 if test "x$fp_layout_type" = "xunknown"; then
   AC_CACHE_CHECK([if endianflip converts to x86 representation],
-    [fp_layout_need_endianflip],
+    [c_cv_fp_layout_need_endianflip],
     AC_RUN_IFELSE(
       AC_LANG_PROGRAM(
       [[[[
@@ -707,17 +707,17 @@ if test "x$fp_layout_type" = "xunknown"; then
 	else
 		return (1);
       ]]]]),
-      [fp_layout_need_endianflip="yes"],
-      [fp_layout_need_endianflip="no"]
+      [c_cv_fp_layout_need_endianflip="yes"],
+      [c_cv_fp_layout_need_endianflip="no"]
     )
   )
-  if test "x$fp_layout_need_endianflip" = "xyes"; then
+  if test "x$c_cv_fp_layout_need_endianflip" = "xyes"; then
     fp_layout_type="endianflip"
   fi
 fi
 if test "x$fp_layout_type" = "xunknown"; then
   AC_CACHE_CHECK([if intswap converts to x86 representation],
-    [fp_layout_need_intswap],
+    [c_cv_fp_layout_need_intswap],
     AC_RUN_IFELSE(
       AC_LANG_PROGRAM(
       [[[[
@@ -753,11 +753,11 @@ if test "x$fp_layout_type" = "xunknown"; then
 	else
 		return (1);
       ]]]]),
-      [fp_layout_need_intswap="yes"],
-      [fp_layout_need_intswap="no"]
+      [c_cv_fp_layout_need_intswap="yes"],
+      [c_cv_fp_layout_need_intswap="no"]
     )
   )
-  if test "x$fp_layout_need_intswap" = "xyes"; then
+  if test "x$c_cv_fp_layout_need_intswap" = "xyes"; then
     fp_layout_type="intswap"
   fi
 fi
@@ -796,7 +796,7 @@ fi
 
 if test "x$have_getmntent" = "xc"; then
 	AC_CACHE_CHECK([whether getmntent takes one argument],
-		[have_one_getmntent],
+		[c_cv_have_one_getmntent],
 		AC_COMPILE_IFELSE(
 			AC_LANG_PROGRAM([[AC_INCLUDES_DEFAULT
 #include <mntent.h>
@@ -808,12 +808,12 @@ if test "x$have_getmntent" = "xc"; then
 				 me = getmntent (fh);
 				]]
 			),
-			[have_one_getmntent="yes"],
-			[have_one_getmntent="no"]
+			[c_cv_have_one_getmntent="yes"],
+			[c_cv_have_one_getmntent="no"]
 		)
 	)
 	AC_CACHE_CHECK([whether getmntent takes two arguments],
-		[have_two_getmntent],
+		[c_cv_have_two_getmntent],
 		AC_COMPILE_IFELSE(
 			AC_LANG_PROGRAM([[AC_INCLUDES_DEFAULT
 #include <sys/mnttab.h>
@@ -826,8 +826,8 @@ if test "x$have_getmntent" = "xc"; then
 				 status = getmntent (fh, &mt);
 				]]
 			),
-			[have_two_getmntent="yes"],
-			[have_two_getmntent="no"]
+			[c_cv_have_two_getmntent="yes"],
+			[c_cv_have_two_getmntent="no"]
 		)
 	)
 fi
@@ -835,11 +835,11 @@ fi
 # Check for different versions of `getmntent' here..
 
 if test "x$have_getmntent" = "xc"; then
-	if test "x$have_one_getmntent" = "xyes"; then
+	if test "x$c_cv_have_one_getmntent" = "xyes"; then
 		AC_DEFINE(HAVE_ONE_GETMNTENT, 1,
 			  [Define if the function getmntent exists and takes one argument.])
 	fi
-	if test "x$have_two_getmntent" = "xyes"; then
+	if test "x$c_cv_have_two_getmntent" = "xyes"; then
 		AC_DEFINE(HAVE_TWO_GETMNTENT, 1,
 			  [Define if the function getmntent exists and takes two arguments.])
 	fi
@@ -1187,6 +1187,82 @@ AC_DEFINE_UNQUOTED(COLLECT_LIBESMTP, [$collect_libesmtp],
 AM_CONDITIONAL(BUILD_WITH_LIBESMTP, test "x$with_libesmtp" = "xyes")
 # }}}
 
+# --with-libganglia {{{
+AC_ARG_WITH(libganglia, [AS_HELP_STRING([--with-libganglia@<:@=PREFIX@:>@], [Path to libganglia.])],
+[
+ if test -f "$withval" && test -x "$withval"
+ then
+	 with_libganglia_config="$withval"
+	 with_libganglia="yes"
+ else if test -f "$withval/bin/ganglia-config" && test -x "$withval/bin/ganglia-config"
+ then
+	 with_libganglia_config="$withval/bin/ganglia-config"
+	 with_libganglia="yes"
+ else if test -d "$withval"
+ then
+	 GANGLIA_CPPFLAGS="-I$withval/include"
+	 GANGLIA_LDFLAGS="-L$withval/lib"
+	 with_libganglia="yes"
+ else
+	 with_libganglia_config="ganglia-config"
+	 with_libganglia="$withval"
+ fi; fi; fi
+],
+[
+ with_libganglia_config="ganglia-config"
+ with_libganglia="yes"
+])
+
+if test "x$with_libganglia" = "xyes" && test "x$with_libganglia_config" != "x"
+then
+	if test "x$GANGLIA_CPPFLAGS" = "x"
+	then
+		GANGLIA_CPPFLAGS=`"$with_libganglia_config" --cflags 2>/dev/null`
+	fi
+
+	if test "x$GANGLIA_LDFLAGS" = "x"
+	then
+		GANGLIA_LDFLAGS=`"$with_libganglia_config" --ldflags 2>/dev/null`
+	fi
+
+	if test "x$GANGLIA_LIBS" = "x"
+	then
+		GANGLIA_LIBS=`"$with_libganglia_config" --libs 2>/dev/null`
+	fi
+fi
+
+SAVE_CPPFLAGS="$CPPFLAGS"
+SAVE_LDFLAGS="$LDFLAGS"
+CPPFLAGS="$CPPFLAGS $GANGLIA_CPPFLAGS"
+LDFLAGS="$LDFLAGS $GANGLIA_LDFLAGS"
+
+if test "x$with_libganglia" = "xyes"
+then
+	AC_CHECK_HEADERS(gm_protocol.h,
+	[
+		AC_DEFINE(HAVE_GM_PROTOCOL_H, 1,
+			  [Define to 1 if you have the <gm_protocol.h> header file.])
+	], [with_libganglia="no (gm_protocol.h not found)"])
+fi
+
+if test "x$with_libganglia" = "xyes"
+then
+	AC_CHECK_LIB(ganglia, xdr_Ganglia_value_msg,
+	[
+		AC_DEFINE(HAVE_LIBGANGLIA, 1,
+			  [Define to 1 if you have the ganglia library (-lganglia).])
+	], [with_libganglia="no (symbol xdr_Ganglia_value_msg not found)"])
+fi
+
+CPPFLAGS="$SAVE_CPPFLAGS"
+LDFLAGS="$SAVE_LDFLAGS"
+
+AC_SUBST(GANGLIA_CPPFLAGS)
+AC_SUBST(GANGLIA_LDFLAGS)
+AC_SUBST(GANGLIA_LIBS)
+AM_CONDITIONAL(BUILD_WITH_LIBGANGLIA, test "x$with_libganglia" = "xyes")
+# }}}
+
 # --with-libiptc {{{
 with_own_libiptc="no"
 AC_ARG_WITH(libiptc, [AS_HELP_STRING([--with-libiptc@<:@=PREFIX@:>@], [Path to libiptc.])],
@@ -1344,6 +1420,57 @@ AC_SUBST(JAVA_LIBS)
 AM_CONDITIONAL(BUILD_WITH_JAVA, test "x$with_java" = "xyes")
 # }}}
 
+# --with-libmemcached {{{
+with_libmemcached_cppflags=""
+with_libmemcached_ldflags=""
+AC_ARG_WITH(libmemcached, [AS_HELP_STRING([--with-libmemcached@<:@=PREFIX@:>@], [Path to libmemcached.])],
+[
+	if test "x$withval" != "xno" && test "x$withval" != "xyes"
+	then
+		with_libmemcached_cppflags="-I$withval/include"
+		with_libmemcached_ldflags="-L$withval/lib"
+		with_libmemcached="yes"
+	else
+		with_libmemcached="$withval"
+	fi
+],
+[
+	with_libmemcached="yes"
+])
+if test "x$with_libmemcached" = "xyes"
+then
+	SAVE_CPPFLAGS="$CPPFLAGS"
+	CPPFLAGS="$CPPFLAGS $with_libmemcached_cppflags"
+
+	AC_CHECK_HEADERS(libmemcached/memcached.h, [with_libmemcached="yes"], [with_libmemcached="no (libmemcached/memcached.h not found)"])
+
+	CPPFLAGS="$SAVE_CPPFLAGS"
+fi
+if test "x$with_libmemcached" = "xyes"
+then
+	SAVE_CPPFLAGS="$CPPFLAGS"
+	SAVE_LDFLAGS="$LDFLAGS"
+	CPPFLAGS="$CPPFLAGS $with_libmemcached_cppflags"
+	LDFLAGS="$LDFLAGS $with_libmemcached_ldflags"
+
+	AC_CHECK_LIB(memcached, memcached_create, [with_libmemcached="yes"], [with_libmemcached="no (Symbol 'memcached_create' not found)"])
+
+	CPPFLAGS="$SAVE_CPPFLAGS"
+	LDFLAGS="$SAVE_LDFLAGS"
+fi
+if test "x$with_libmemcached" = "xyes"
+then
+	BUILD_WITH_LIBMEMCACHED_CPPFLAGS="$with_libmemcached_cppflags"
+	BUILD_WITH_LIBMEMCACHED_LDFLAGS="$with_libmemcached_ldflags"
+	BUILD_WITH_LIBMEMCACHED_LIBS="-lmemcached"
+	AC_SUBST(BUILD_WITH_LIBMEMCACHED_CPPFLAGS)
+	AC_SUBST(BUILD_WITH_LIBMEMCACHED_LDFLAGS)
+	AC_SUBST(BUILD_WITH_LIBMEMCACHED_LIBS)
+	AC_DEFINE(HAVE_LIBMEMCACHED, 1, [Define if libmemcached is present and usable.])
+fi
+AM_CONDITIONAL(BUILD_WITH_LIBMEMCACHED, test "x$with_libmemcached" = "xyes")
+# }}}
+
 # --with-libmysql {{{
 with_mysql_config="mysql_config"
 with_mysql_cflags=""
@@ -1646,55 +1773,60 @@ fi
 # }}}
 
 # --with-liboping {{{
-with_own_liboping="no"
-liboping_LDFLAGS="$LDFLAGS"
-liboping_CPPFLAGS="$CPPFLAGS"
 AC_ARG_WITH(liboping, [AS_HELP_STRING([--with-liboping@<:@=PREFIX@:>@], [Path to liboping.])],
 [
-	if test "x$withval" != "xno" && test "x$withval" != "xyes"
+ if test "x$withval" = "xyes"
+ then
+	 with_liboping="yes"
+ else if test "x$withval" = "xno"
+ then
+	 with_liboping="no"
+ else
+	 with_liboping="yes"
+	 LIBOPING_CPPFLAGS="$LIBOPING_CPPFLAGS -I$withval/include"
+	 LIBOPING_LDFLAGS="$LIBOPING_LDFLAGS -L$withval/lib"
+ fi; fi
+],
+[with_liboping="yes"])
+
+SAVE_CPPFLAGS="$CPPFLAGS"
+SAVE_LDFLAGS="$LDFLAGS"
+
+CPPFLAGS="$CPPFLAGS $LIBOPING_CPPFLAGS"
+LDFLAGS="$LDFLAGS $LIBOPING_LDFLAGS"
+
+if test "x$with_liboping" = "xyes"
+then
+	if test "x$LIBOPING_CPPFLAGS" != "x"
 	then
-		if test -d "$withval/lib"
-		then
-			liboping_LDFLAGS="$LDFLAGS -L$withval/lib"
-		fi
-		if test -d "$withval/include"
-		then
-			liboping_CPPFLAGS="$CPPFLAGS -I$withval/include"
-		fi
+		AC_MSG_NOTICE([liboping CPPFLAGS: $LIBOPING_CPPFLAGS])
 	fi
-	if test "x$withval" = "xno"
-	then
-		with_liboping="no"
-		with_own_liboping="no"
-	else if test "x$withval" = "xyes"
+	AC_CHECK_HEADERS(oping.h,
+	[with_liboping="yes"],
+	[with_liboping="no ('oping.h' not found)"])
+fi
+if test "x$with_liboping" = "xyes"
+then
+	if test "x$LIBOPING_LDFLAGS" != "x"
 	then
-		with_liboping="yes"
-	fi; fi
-],
-[
-	with_liboping="yes"
-])
+		AC_MSG_NOTICE([liboping LDFLAGS: $LIBOPING_LDFLAGS])
+	fi
+	AC_CHECK_LIB(oping, ping_construct,
+	[with_liboping="yes"],
+	[with_liboping="no (symbol 'ping_construct' not found)"])
+fi
+
+CPPFLAGS="$SAVE_CPPFLAGS"
+LDFLAGS="$SAVE_LDFLAGS"
 
 if test "x$with_liboping" = "xyes"
 then
-	save_LDFLAGS="$LDFLAGS"
-	save_CPPFLAGS="$CPPFLAGS"
-	LDFLAGS="$liboping_LDFLAGS"
-	CPPFLAGS="$liboping_CPPFLAGS"
-	AC_CHECK_LIB(oping, ping_construct,
-	[
-		with_liboping="yes"
-		with_own_liboping="no"
-	],
-	[
-		with_liboping="yes"
-		with_own_liboping="yes"
-		LDFLAGS="$save_LDFLAGS"
-		CPPFLAGS="$save_CPPFLAGS"
-	])
+	BUILD_WITH_LIBOPING_CPPFLAGS="$LIBOPING_CPPFLAGS"
+	BUILD_WITH_LIBOPING_LDFLAGS="$LIBOPING_LDFLAGS"
+	AC_SUBST(BUILD_WITH_LIBOPING_CPPFLAGS)
+	AC_SUBST(BUILD_WITH_LIBOPING_LDFLAGS)
 fi
 AM_CONDITIONAL(BUILD_WITH_LIBOPING, test "x$with_liboping" = "xyes")
-AM_CONDITIONAL(BUILD_WITH_OWN_LIBOPING, test "x$with_own_liboping" = "xyes")
 # }}}
 
 # --with-oracle {{{
@@ -1898,7 +2030,7 @@ then
   LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
 
   AC_CACHE_CHECK([for libperl],
-    [have_libperl],
+    [c_cv_have_libperl],
     AC_LINK_IFELSE(
       AC_LANG_PROGRAM(
       [[
@@ -1913,12 +2045,12 @@ then
 			 newSVpv ("Collectd::Plugin::FooBar", 24),
 			 Nullsv);
       ]]),
-      [have_libperl="yes"],
-      [have_libperl="no"]
+      [c_cv_have_libperl="yes"],
+      [c_cv_have_libperl="no"]
     )
   )
 
-  if test "x$have_libperl" = "xyes"
+  if test "x$c_cv_have_libperl" = "xyes"
   then
 	  AC_DEFINE(HAVE_LIBPERL, 1, [Define if libperl is present and usable.])
 	  AC_SUBST(PERL_CFLAGS)
@@ -1931,7 +2063,7 @@ then
   LDFLAGS=$SAVE_LDFLAGS
 else if test -z "$perl_interpreter"; then
   with_libperl="no (no perl interpreter found)"
-  have_libperl="no"
+  c_cv_have_libperl="no"
 fi; fi
 AM_CONDITIONAL(BUILD_WITH_LIBPERL, test "x$with_libperl" = "xyes")
 
@@ -1943,7 +2075,7 @@ then
 	LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
 
 	AC_CACHE_CHECK([if perl supports ithreads],
-		[have_perl_ithreads],
+		[c_cv_have_perl_ithreads],
 		AC_LINK_IFELSE(
 			AC_LANG_PROGRAM(
 			[[
@@ -1956,12 +2088,12 @@ then
 #endif /* !defined(USE_ITHREADS) */
 			]],
 			[[ ]]),
-			[have_perl_ithreads="yes"],
-			[have_perl_ithreads="no"]
+			[c_cv_have_perl_ithreads="yes"],
+			[c_cv_have_perl_ithreads="no"]
 		)
 	)
 
-	if test "x$have_perl_ithreads" = "xyes"
+	if test "x$c_cv_have_perl_ithreads" = "xyes"
 	then
 		AC_DEFINE(HAVE_PERL_ITHREADS, 1, [Define if Perl supports ithreads.])
 	fi
@@ -1970,7 +2102,7 @@ then
 	LDFLAGS=$SAVE_LDFLAGS
 fi
 
-have_broken_perl_load_module="no"
+c_cv_have_broken_perl_load_module="no"
 if test "x$with_libperl" = "xyes"
 then
 	SAVE_CFLAGS=$CFLAGS
@@ -1981,7 +2113,7 @@ then
 	LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
 
 	AC_CACHE_CHECK([for broken Perl_load_module()],
-		[have_broken_perl_load_module],
+		[c_cv_have_broken_perl_load_module],
 		AC_LINK_IFELSE(
 			AC_LANG_PROGRAM(
 			[[
@@ -1996,8 +2128,8 @@ then
 			     newSVpv ("Collectd::Plugin::FooBar", 24),
 			     Nullsv);
 			]]),
-			[have_broken_perl_load_module="no"],
-			[have_broken_perl_load_module="yes"]
+			[c_cv_have_broken_perl_load_module="no"],
+			[c_cv_have_broken_perl_load_module="yes"]
 		)
 	)
 
@@ -2005,7 +2137,7 @@ then
 	LDFLAGS=$SAVE_LDFLAGS
 fi
 AM_CONDITIONAL(HAVE_BROKEN_PERL_LOAD_MODULE,
-		test "x$have_broken_perl_load_module" = "xyes")
+		test "x$c_cv_have_broken_perl_load_module" = "xyes")
 
 if test "x$with_libperl" = "xyes"
 then
@@ -2111,6 +2243,10 @@ then
 		[with_libpq="yes"],
 		[with_libpq="no (symbol 'PQconnectdb' not found)"])
 
+	AC_CHECK_LIB(pq, PQserverVersion,
+		[with_libpq="yes"],
+		[with_libpq="no (symbol 'PQserverVersion' not found)"])
+
 	LDFLAGS="$SAVE_LDFLAGS"
 fi
 if test "x$with_libpq" = "xyes"
@@ -2952,8 +3088,10 @@ plugin_serial="no"
 plugin_swap="no"
 plugin_tape="no"
 plugin_tcpconns="no"
+plugin_ted="no"
 plugin_thermal="no"
 plugin_users="no"
+plugin_uptime="no"
 plugin_vmem="no"
 plugin_vserver="no"
 plugin_wireless="no"
@@ -2977,6 +3115,7 @@ then
 	plugin_swap="yes"
 	plugin_tcpconns="yes"
 	plugin_thermal="yes"
+	plugin_uptime="yes"
 	plugin_vmem="yes"
 	plugin_vserver="yes"
 	plugin_wireless="yes"
@@ -3000,6 +3139,11 @@ then
 fi
 
 # Solaris
+if test "x$with_kstat" = "xyes"
+then
+	plugin_uptime="yes"
+fi
+
 if test "x$with_devinfo$with_kstat" = "xyesyes"
 then
 	plugin_cpu="yes"
@@ -3045,6 +3189,7 @@ if test "x$have_sysctl" = "xyes"
 then
 	plugin_cpu="yes"
 	plugin_swap="yes"
+	plugin_uptime="yes"
 fi
 if test "x$have_sysctlbyname" = "xyes"
 then
@@ -3077,7 +3222,7 @@ then
 	plugin_load="yes"
 fi
 
-if test "x$have_libperl$have_perl_ithreads" = "xyesyes"
+if test "x$c_cv_have_libperl$c_cv_have_perl_ithreads" = "xyesyes"
 then
 	plugin_perl="yes"
 fi
@@ -3091,6 +3236,7 @@ fi
 if test "x$have_termios_h" = "xyes"
 then
 	plugin_multimeter="yes"
+	plugin_ted="yes"
 fi
 
 if test "x$have_thread_info" = "xyes"
@@ -3148,6 +3294,7 @@ AC_PLUGIN([email],       [yes],                [EMail statistics])
 AC_PLUGIN([entropy],     [$plugin_entropy],    [Entropy statistics])
 AC_PLUGIN([exec],        [yes],                [Execution of external programs])
 AC_PLUGIN([filecount],   [yes],                [Count files in directories])
+AC_PLUGIN([gmond],       [$with_libganglia],   [Ganglia plugin])
 AC_PLUGIN([hddtemp],     [yes],                [Query hddtempd])
 AC_PLUGIN([interface],   [$plugin_interface],  [Interface traffic statistics])
 AC_PLUGIN([ipmi],        [$plugin_ipmi],       [IPMI sensor statistics])
@@ -3162,6 +3309,7 @@ AC_PLUGIN([match_regex], [yes],                [The regex match])
 AC_PLUGIN([match_timediff], [yes],             [The timediff match])
 AC_PLUGIN([match_value], [yes],                [The value match])
 AC_PLUGIN([mbmon],       [yes],                [Query mbmond])
+AC_PLUGIN([memcachec],   [$with_libmemcached], [memcachec statistics])
 AC_PLUGIN([memcached],   [yes],                [memcached statistics])
 AC_PLUGIN([memory],      [$plugin_memory],     [Memory usage])
 AC_PLUGIN([multimeter],  [$plugin_multimeter], [Read multimeter values])
@@ -3198,8 +3346,10 @@ AC_PLUGIN([target_replace], [yes],             [The replace target])
 AC_PLUGIN([target_set],  [yes],                [The set target])
 AC_PLUGIN([tcpconns],    [$plugin_tcpconns],   [TCP connection statistics])
 AC_PLUGIN([teamspeak2],  [yes],                [TeamSpeak2 server statistics])
+AC_PLUGIN([ted],         [$plugin_ted],        [Read The Energy Detective values])
 AC_PLUGIN([thermal],     [$plugin_thermal],    [Linux ACPI thermal zone statistics])
 AC_PLUGIN([unixsock],    [yes],                [Unixsock communication plugin])
+AC_PLUGIN([uptime],      [$plugin_uptime],     [Uptime statistics])
 AC_PLUGIN([users],       [$plugin_users],      [User statistics])
 AC_PLUGIN([uuid],        [yes],                [UUID as hostname plugin])
 AC_PLUGIN([vmem],        [$plugin_vmem],       [Virtual memory statistics])
@@ -3341,7 +3491,7 @@ AC_SUBST(LCC_VERSION_STRING)
 
 AC_CONFIG_FILES(src/libcollectdclient/lcc_features.h)
 
-AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/libiptc/Makefile src/libcollectdclient/Makefile src/libcollectdclient/libcollectdclient.pc src/liboconfig/Makefile src/liboping/Makefile bindings/Makefile)
+AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/libiptc/Makefile src/libcollectdclient/Makefile src/libcollectdclient/libcollectdclient.pc src/liboconfig/Makefile bindings/Makefile)
 
 if test "x$with_librrd" = "xyes" \
 	&& test "x$librrd_threadsafe" != "xyes"
@@ -3349,12 +3499,6 @@ then
 	with_librrd="yes (warning: librrd is not thread-safe)"
 fi
 
-if test "x$with_liboping" = "xyes" \
-	&& test "x$with_own_liboping" = "xyes"
-then
-	with_liboping="yes (shipped version)"
-fi
-
 if test "x$with_libiptc" = "xyes" -a "x$with_own_libiptc" = "xyes"
 then
 	with_libiptc="yes (shipped version)"
@@ -3431,6 +3575,7 @@ Configuration:
     entropy . . . . . . . $enable_entropy
     exec  . . . . . . . . $enable_exec
     filecount . . . . . . $enable_filecount
+    gmond . . . . . . . . $enable_gmond
     hddtemp . . . . . . . $enable_hddtemp
     interface . . . . . . $enable_interface
     ipmi  . . . . . . . . $enable_ipmi
@@ -3445,6 +3590,7 @@ Configuration:
     match_timediff  . . . $enable_match_timediff
     match_value . . . . . $enable_match_value
     mbmon . . . . . . . . $enable_mbmon
+    memcachec . . . . . . $enable_memcachec
     memcached . . . . . . $enable_memcached
     memory  . . . . . . . $enable_memory
     multimeter  . . . . . $enable_multimeter
@@ -3481,8 +3627,10 @@ Configuration:
     target_set  . . . . . $enable_target_set
     tcpconns  . . . . . . $enable_tcpconns
     teamspeak2  . . . . . $enable_teamspeak2
+    ted . . . . . . . . . $enable_ted
     thermal . . . . . . . $enable_thermal
     unixsock  . . . . . . $enable_unixsock
+    uptime  . . . . . . . $enable_uptime
     users . . . . . . . . $enable_users
     uuid  . . . . . . . . $enable_uuid
     vmem  . . . . . . . . $enable_vmem