X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=configure.ac;h=44d10cf666197d75b61233cff26e6d4dec69c25a;hb=ca299374303452480544ac19e2028b63db362164;hp=8daa32b62969dd882d5cc485305799186ebe4253;hpb=f664b944f774e4d1e5d5c562eaf0bb207c6a7edf;p=collectd.git

diff --git a/configure.ac b/configure.ac
index 8daa32b6..44d10cf6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,7 +115,7 @@ then
 	AC_DEFINE(_REENTRANT,               1, [Define to enable reentrancy interfaces.])
 
 	AC_MSG_CHECKING([whether compiler builds 64bit binaries])
-	AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
 			   #ifndef _LP64
 			   # error "Compiler not in 64bit mode."
 			   #endif
@@ -5243,6 +5243,7 @@ plugin_vmem="no"
 plugin_vserver="no"
 plugin_wireless="no"
 plugin_zfs_arc="no"
+plugin_zone="no"
 plugin_zookeeper="no"
 
 # Linux
@@ -5340,6 +5341,7 @@ then
 	plugin_processes="yes"
 	plugin_uptime="yes"
 	plugin_zfs_arc="yes"
+	plugin_zone="yes"
 fi
 
 if test "x$with_devinfo$with_kstat" = "xyesyes"
@@ -5705,6 +5707,7 @@ AC_PLUGIN([write_sensu], [yes],                [Sensu output plugin])
 AC_PLUGIN([write_tsdb],  [yes],                [TSDB output plugin])
 AC_PLUGIN([xmms],        [$with_libxmms],      [XMMS statistics])
 AC_PLUGIN([zfs_arc],     [$plugin_zfs_arc],    [ZFS ARC statistics])
+AC_PLUGIN([zone],        [$plugin_zone],       [Solaris container statistics])
 AC_PLUGIN([zookeeper],   [yes],  	       [Zookeeper statistics])
 
 dnl Default configuration file
@@ -6082,6 +6085,7 @@ Configuration:
     write_tsdb  . . . . . $enable_write_tsdb
     xmms  . . . . . . . . $enable_xmms
     zfs_arc . . . . . . . $enable_zfs_arc
+    zone  . . . . . . . . $enable_zone
     zookeeper . . . . . . $enable_zookeeper
 
 EOF