X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=configure.in;h=a0c95a6baa817ad5561cec220313e478ec82cfdc;hb=9d3fb4e714753fa281360ddbd59493430f1e92a9;hp=2c9ee3974f44a254f1bf03ce1117185df39a864e;hpb=8284de77836c9fb039cbea6060f516c36c13b5dd;p=collectd.git

diff --git a/configure.in b/configure.in
index 2c9ee397..a0c95a6b 100644
--- a/configure.in
+++ b/configure.in
@@ -1600,8 +1600,7 @@ then
 	AC_SUBST(BUILD_WITH_LIBCURL_LIBS)
 fi
 AM_CONDITIONAL(BUILD_WITH_LIBCURL, test "x$with_libcurl" = "xyes")
-#
- }}}
+# }}}
 
 # --with-libdbi {{{
 with_libdbi_cppflags=""
@@ -1767,7 +1766,6 @@ AC_SUBST(GANGLIA_CPPFLAGS)
 AC_SUBST(GANGLIA_LDFLAGS)
 AC_SUBST(GANGLIA_LIBS)
 AM_CONDITIONAL(BUILD_WITH_LIBGANGLIA, test "x$with_libganglia" = "xyes")
-
 # }}}
 
 # --with-libgcrypt {{{
@@ -4170,7 +4168,7 @@ AC_ARG_WITH(mic,[AS_HELP_STRING([--with-mic@<:@=PREFIX@:>@], [Path to Intel MIC
 	then
 		AC_MSG_NOTICE([Not checking for Intel Mic: Manually configured])
 		with_mic_cflags="-I$withval/include"
-		with_mic_ldpath="-L$withval/lib"
+		with_mic_ldpath="-L$withval/lib/Linux"
 		with_mic_libs="-lMicAccessSDK -lscif -lpthread"
 		with_mic="yes"
 	fi; fi; fi
@@ -4192,9 +4190,9 @@ then
 	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])
+			[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"
@@ -4655,7 +4653,6 @@ plugin_irq="no"
 plugin_libvirt="no"
 plugin_load="no"
 plugin_memory="no"
-plugin_mic="no"
 plugin_multimeter="no"
 plugin_nfs="no"
 plugin_numa="no"
@@ -4819,10 +4816,6 @@ then
 	plugin_memory="yes"
 	plugin_tcpconns="yes"
 fi
-if test "x$with_mic" = "xyes"
-then
-	plugin_mic="yes"
-fi
 
 # Df plugin: Check if we know how to determine mount points first.
 #if test "x$have_listmntent" = "xyes"; then
@@ -5000,7 +4993,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],         [$plugin_mic],          [Intel Many Integrated Core stats])
+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])
@@ -5236,6 +5229,7 @@ cat <<EOF;
 
 Configuration:
   Libraries:
+    intel mic . . . . . . $with_mic
     libcurl . . . . . . . $with_libcurl
     libdbi  . . . . . . . $with_libdbi
     libcredis . . . . . . $with_libcredis
@@ -5269,7 +5263,6 @@ Configuration:
     libstatgrab . . . . . $with_libstatgrab
     libtokyotyrant  . . . $with_libtokyotyrant
     libupsclient  . . . . $with_libupsclient
-    mic  . . .  . . . . . $with_mic
     libvarnish  . . . . . $with_libvarnish
     libvirt . . . . . . . $with_libvirt
     libxml2 . . . . . . . $with_libxml2