X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.ac;h=ef251fab283e81cc8430f35f0da9955db5490e06;hb=01713a543e73f75cdf021e35e07b4c2f79e6cc6a;hp=87d1502b23360e9e9691e007ac169ec38ce791e1;hpb=0c88d3b2d330c152be0bc6af8faecef0211a705e;p=collectd.git

diff --git a/configure.ac b/configure.ac
index 87d1502b..ef251fab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2020,6 +2020,93 @@ AC_SUBST(GCRYPT_LIBS)
 AM_CONDITIONAL(BUILD_WITH_LIBGCRYPT, test "x$with_libgcrypt" = "xyes")
 # }}}
 
+# --with-libgnutls {{{
+with_libgnutls_cflags="$GNUTLS_CFLAGS"
+with_libgnutls_libs="$GNUTLS_LIBS"
+AC_ARG_WITH(libgnutls, [AS_HELP_STRING([--with-libgnutls@<:@=PREFIX@:>@], [Path to GnuTLS.])],
+[
+	if test "x$withval" = "xno"
+	then
+		with_libgnutls="no"
+	else if test "x$withval" = "xyes"
+	then
+		with_libgnutls="use_pkgconfig"
+	else if test -d "$with_libgnutls/lib"
+	then
+		AC_MSG_NOTICE([Not checking for libgnutls: Manually configured])
+		with_libgnutls_cflags="-I$withval/include"
+		with_libgnutls_libs="-L$withval/lib -lgnutls"
+		with_libgnutls="yes"
+	fi; fi; fi
+],
+[with_libgnutls="use_pkgconfig"])
+
+# configure using pkg-config
+if test "x$with_libgnutls" = "xuse_pkgconfig"
+then
+	if test "x$PKG_CONFIG" = "x"
+	then
+		with_libgnutls="no (Don't have pkg-config)"
+	fi
+fi
+if test "x$with_libgnutls" = "xuse_pkgconfig"
+then
+	AC_MSG_NOTICE([Checking for gnutls using $PKG_CONFIG])
+	$PKG_CONFIG --exists 'gnutls' 2>/dev/null
+	if test $? -ne 0
+	then
+		with_libgnutls="no (pkg-config doesn't know gnutls)"
+	fi
+fi
+if test "x$with_libgnutls" = "xuse_pkgconfig"
+then
+	with_libgnutls_cflags="`$PKG_CONFIG --cflags 'gnutls'`"
+	if test $? -ne 0
+	then
+		with_libgnutls="no ($PKG_CONFIG failed)"
+	fi
+	with_libgnutls_libs="`$PKG_CONFIG --libs 'gnutls'`"
+	if test $? -ne 0
+	then
+		with_libgnutls="no ($PKG_CONFIG failed)"
+	fi
+fi
+if test "x$with_libgnutls" = "xuse_pkgconfig"
+then
+	with_libgnutls="yes"
+fi
+
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $with_libgnutls_cflags"
+
+# with_libgnutls_cflags and with_libgnutls_libs are set up now, let's do
+# the actual checks.
+if test "x$with_libgnutls" = "xyes"
+then
+	AC_CHECK_HEADERS(gnutls/gnutls.h, [], [with_libgnutls="no (gnutls/gnutls.h not found)"])
+fi
+if test "x$with_libgnutls" = "xyes"
+then
+	AC_CHECK_HEADERS(gnutls/dtls.h gnutls/openpgp.h)
+fi
+if test "x$with_libgnutls" = "xyes"
+then
+	AC_CHECK_LIB(gnutls, gnutls_global_init,
+		     [with_libgnutls="yes"],
+		     [with_libgnutls="no (symbol gnutls_global_init not found)"],
+		     [$with_libgnutls_libs])
+fi
+if test "x$with_libgnutls" = "xyes"
+then
+	BUILD_WITH_LIBGNUTLS_CFLAGS="$with_libgnutls_cflags"
+	BUILD_WITH_LIBGNUTLS_LIBS="$with_libgnutls_libs"
+	AC_SUBST(BUILD_WITH_LIBGNUTLS_CFLAGS)
+	AC_SUBST(BUILD_WITH_LIBGNUTLS_LIBS)
+fi
+
+CPPFLAGS="$SAVE_CPPFLAGS"
+# }}}
+
 # --with-libiptc {{{
 AC_ARG_WITH(libiptc, [AS_HELP_STRING([--with-libiptc@<:@=PREFIX@:>@], [Path to libiptc.])],
 [
@@ -5194,6 +5281,7 @@ plugin_vmem="no"
 plugin_vserver="no"
 plugin_wireless="no"
 plugin_zfs_arc="no"
+plugin_zone="no"
 plugin_zookeeper="no"
 
 # Linux
@@ -5291,6 +5379,7 @@ then
 	plugin_processes="yes"
 	plugin_uptime="yes"
 	plugin_zfs_arc="yes"
+	plugin_zone="yes"
 fi
 
 if test "x$with_devinfo$with_kstat" = "xyesyes"
@@ -5584,6 +5673,7 @@ AC_PLUGIN([modbus],      [$with_libmodbus],    [Modbus plugin])
 AC_PLUGIN([multimeter],  [$plugin_multimeter], [Read multimeter values])
 AC_PLUGIN([mysql],       [$with_libmysql],     [MySQL statistics])
 AC_PLUGIN([netapp],      [$with_libnetapp],    [NetApp plugin])
+AC_PLUGIN([netcmd],      [$with_libgnutls],    [Network control socket])
 AC_PLUGIN([netlink],     [$with_libmnl],       [Enhanced Linux network statistics])
 AC_PLUGIN([network],     [yes],                [Network communication plugin])
 AC_PLUGIN([nfs],         [$plugin_nfs],        [NFS statistics])
@@ -5656,6 +5746,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
@@ -5846,6 +5937,7 @@ Configuration:
     libesmtp  . . . . . . $with_libesmtp
     libganglia  . . . . . $with_libganglia
     libgcrypt . . . . . . $with_libgcrypt
+    libgnutls . . . . . . $with_libgnutls
     libhal  . . . . . . . $with_libhal
     libhiredis  . . . . . $with_libhiredis
     libi2c-dev  . . . . . $with_libi2c
@@ -5962,6 +6054,7 @@ Configuration:
     multimeter  . . . . . $enable_multimeter
     mysql . . . . . . . . $enable_mysql
     netapp  . . . . . . . $enable_netapp
+    netcmd  . . . . . . . $enable_netcmd
     netlink . . . . . . . $enable_netlink
     network . . . . . . . $enable_network
     nfs . . . . . . . . . $enable_nfs
@@ -6033,6 +6126,7 @@ Configuration:
     write_tsdb  . . . . . $enable_write_tsdb
     xmms  . . . . . . . . $enable_xmms
     zfs_arc . . . . . . . $enable_zfs_arc
+    zone  . . . . . . . . $enable_zone
     zookeeper . . . . . . $enable_zookeeper
 
 EOF