X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.in;h=27c6cd316b916a0047cfe389face9b5b40d0af9b;hb=a02ced789b4c93f293dc9d14a5a303c5fe11bcce;hp=7a25a0d323d9b06f814312cc929d9d457a6e6b58;hpb=f19f64d583ab6e1ccf6f4b5e312425330ec1d97c;p=collectd.git

diff --git a/configure.in b/configure.in
index 7a25a0d3..27c6cd31 100644
--- a/configure.in
+++ b/configure.in
@@ -78,6 +78,10 @@ case $host_os in
 	AC_DEFINE([KERNEL_AIX], 1, [True if program is to be compiled for a AIX kernel])
 	ac_system="AIX"
 	;;
+	*freebsd*)
+	AC_DEFINE([KERNEL_FREEBSD], 1, [True if program is to be compiled for a FreeBSD kernel])
+	ac_system="FreeBSD"
+	;;
 	*)
 	ac_system="unknown"
 esac
@@ -1362,6 +1366,8 @@ fi
 m4_divert_once([HELP_WITH], [
 collectd additional packages:])
 
+AM_CONDITIONAL([BUILD_FREEBSD],[test "x$x$ac_system" = "xFreeBSD"])
+
 AM_CONDITIONAL([BUILD_AIX],[test "x$x$ac_system" = "xAIX"]) 
 
 if test "x$ac_system" = "xAIX"
@@ -4204,6 +4210,63 @@ fi
 AM_CONDITIONAL(BUILD_WITH_LIBYAJL, test "x$with_libyajl" = "xyes")
 # }}}
 
+# --with-mic {{{
+with_mic_cflags="-I/opt/intel/mic/sysmgmt/sdk/include"
+with_mic_ldpath="-L/opt/intel/mic/sysmgmt/sdk/lib/Linux"
+with_mic_libs=""
+AC_ARG_WITH(mic,[AS_HELP_STRING([--with-mic@<:@=PREFIX@:>@], [Path to Intel MIC Access API.])],
+[
+	if test "x$withval" = "xno"
+	then
+		with_mic="no"
+	else if test "x$withval" = "xyes"
+	then
+		with_mic="yes"
+	else if test -d "$with_mic/lib"
+	then
+		AC_MSG_NOTICE([Not checking for Intel Mic: Manually configured])
+		with_mic_cflags="-I$withval/include"
+		with_mic_ldpath="-L$withval/lib/Linux"
+		with_mic_libs="-lMicAccessSDK -lscif -lpthread"
+		with_mic="yes"
+	fi; fi; fi
+],
+[with_mic="yes"])
+if test "x$with_mic" = "xyes"
+then
+	SAVE_CPPFLAGS="$CPPFLAGS"
+	CPPFLAGS="$CPPFLAGS $with_mic_cflags"
+	AC_CHECK_HEADERS(MicAccessApi.h,[],[with_mic="no (MicAccessApi not found)"])
+	CPPFLAGS="$SAVE_CPPFLAGS"
+fi
+if test "x$with_mic" = "xyes"
+then
+	SAVE_CPPFLAGS="$CPPFLAGS"
+	SAVE_LDFLAGS="$LDFLAGS"
+
+	CPPFLAGS="$CPPFLAGS $with_mic_cflags"
+	LDFLAGS="$LDFLAGS $with_mic_ldpath"
+
+	AC_CHECK_LIB(MicAccessSDK, MicInitAPI,
+			[with_mic_ldpath="$with_mic_ldpath"
+			with_mic_libs="-lMicAccessSDK -lscif -lpthread"],
+			[with_mic="no (symbol MicInitAPI not found)"],[-lscif -lpthread])
+
+	CPPFLAGS="$SAVE_CPPFLAGS"
+	LDFLAGS="$SAVE_LDFLAGS"
+fi
+
+if test "x$with_mic" = "xyes"
+then
+	BUILD_WITH_MIC_CPPFLAGS="$with_mic_cflags"
+	BUILD_WITH_MIC_LIBPATH="$with_mic_ldpath"
+	BUILD_WITH_MIC_LDADD="$with_mic_libs"
+	AC_SUBST(BUILD_WITH_MIC_CPPFLAGS)
+	AC_SUBST(BUILD_WITH_MIC_LIBPATH)
+	AC_SUBST(BUILD_WITH_MIC_LDADD)
+fi
+#}}}
+
 # --with-libvarnish {{{
 with_libvarnish_cppflags=""
 with_libvarnish_cflags=""
@@ -4630,6 +4693,7 @@ dependency_error="no"
 plugin_ascent="no"
 plugin_battery="no"
 plugin_bind="no"
+plugin_cgroups="no"
 plugin_conntrack="no"
 plugin_contextswitch="no"
 plugin_cpu="no"
@@ -4673,6 +4737,7 @@ then
 	plugin_battery="yes"
 	plugin_conntrack="yes"
 	plugin_contextswitch="yes"
+	plugin_cgroups="yes"
 	plugin_cpu="yes"
 	plugin_cpufreq="yes"
 	plugin_disk="yes"
@@ -4721,6 +4786,14 @@ then
         plugin_tcpconns="yes"
 fi
 
+# FreeBSD
+
+if test "x$ac_system" = "xFreeBSD"
+then
+        plugin_zfs_arc="yes"
+fi
+
+
 if test "x$with_perfstat" = "xyes"
 then
 	plugin_cpu="yes"
@@ -4956,7 +5029,7 @@ AC_PLUGIN([csv],         [yes],                [CSV output plugin])
 AC_PLUGIN([curl],        [$with_libcurl],      [CURL generic web statistics])
 AC_PLUGIN([curl_json],   [$plugin_curl_json],    [CouchDB statistics])
 AC_PLUGIN([curl_xml],   [$plugin_curl_xml],    [CURL generic xml statistics])
-AC_PLUGIN([cgroups_cpuacct], [yes],            [CGroups CPU usage accounting])
+AC_PLUGIN([cgroups],     [$plugin_cgroups],    [CGroups CPU usage accounting])
 AC_PLUGIN([dbi],         [$with_libdbi],       [General database statistics])
 AC_PLUGIN([df],          [$plugin_df],         [Filesystem usage statistics])
 AC_PLUGIN([disk],        [$plugin_disk],       [Disk usage statistics])
@@ -4991,6 +5064,7 @@ AC_PLUGIN([md],          [$have_linux_raid_md_u_h], [md (Linux software RAID) de
 AC_PLUGIN([memcachec],   [$with_libmemcached], [memcachec statistics])
 AC_PLUGIN([memcached],   [yes],                [memcached statistics])
 AC_PLUGIN([memory],      [$plugin_memory],     [Memory usage])
+AC_PLUGIN([mic],         [$with_mic],          [Intel Many Integrated Core stats])
 AC_PLUGIN([modbus],      [$with_libmodbus],    [Modbus plugin])
 AC_PLUGIN([multimeter],  [$plugin_multimeter], [Read multimeter values])
 AC_PLUGIN([mysql],       [$with_libmysql],     [MySQL statistics])
@@ -5226,6 +5300,7 @@ cat <<EOF;
 
 Configuration:
   Libraries:
+    intel mic . . . . . . $with_mic
     libcurl . . . . . . . $with_libcurl
     libdbi  . . . . . . . $with_libdbi
     libcredis . . . . . . $with_libcredis
@@ -5287,7 +5362,7 @@ Configuration:
     bind  . . . . . . . . $enable_bind
     conntrack . . . . . . $enable_conntrack
     contextswitch . . . . $enable_contextswitch
-    cgroups_cpuacct . . . $enable_cgroups_cpuacct
+    cgroups . . . . . . . $enable_cgroups
     cpu . . . . . . . . . $enable_cpu
     cpufreq . . . . . . . $enable_cpufreq
     csv . . . . . . . . . $enable_csv