diff --git a/configure.in b/configure.in
index 515c262113288efbf741e1cd8ded775e7799328a..a0c95a6baa817ad5561cec220313e478ec82cfdc 100644 (file)
--- a/configure.in
+++ b/configure.in
AC_SUBST(BUILD_WITH_LIBCURL_LIBS)
fi
AM_CONDITIONAL(BUILD_WITH_LIBCURL, test "x$with_libcurl" = "xyes")
-#
- }}}
+# }}}
# --with-libdbi {{{
with_libdbi_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
@@ -4178,34 +4176,34 @@ AC_ARG_WITH(mic,[AS_HELP_STRING([--with-mic@<:@=PREFIX@:>@], [Path to Intel MIC
[with_mic="yes"])
if test "x$with_mic" = "xyes"
then
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $with_mic_cflags"
+ SAVE_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $with_mic_cflags"
AC_CHECK_HEADERS(MicAccessApi.h,[],[with_mic="no (MicAccessApi not found)"])
- CFLAGS="$SAVE_CFLAGS"
+ CPPFLAGS="$SAVE_CPPFLAGS"
fi
if test "x$with_mic" = "xyes"
then
- SAVE_CFLAGS="$CFLAGS"
+ SAVE_CPPFLAGS="$CPPFLAGS"
SAVE_LDFLAGS="$LDFLAGS"
- CFLAGS="$CFLAGS $with_mic_cflags"
+ 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])
+ [with_mic_ldpath="$with_mic_ldpath"
+ with_mic_libs="-lMicAccessSDK -lscif -lpthread"],
+ [with_mic="no (symbol MicInitAPI not found)"],[-lscif -lpthread])
- CFLAGS="$SAVE_CFLAGS"
+ CPPFLAGS="$SAVE_CPPFLAGS"
LDFLAGS="$SAVE_LDFLAGS"
fi
if test "x$with_mic" = "xyes"
then
- BUILD_WITH_MIC_CFLAGS="$with_mic_cflags"
+ 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_CFLAGS)
+ AC_SUBST(BUILD_WITH_MIC_CPPFLAGS)
AC_SUBST(BUILD_WITH_MIC_LIBPATH)
AC_SUBST(BUILD_WITH_MIC_LDADD)
fi
Configuration:
Libraries:
+ intel mic . . . . . . $with_mic
libcurl . . . . . . . $with_libcurl
libdbi . . . . . . . $with_libdbi
libcredis . . . . . . $with_libcredis
libstatgrab . . . . . $with_libstatgrab
libtokyotyrant . . . $with_libtokyotyrant
libupsclient . . . . $with_libupsclient
- mic . . . . . . . . $with_mic
libvarnish . . . . . $with_libvarnish
libvirt . . . . . . . $with_libvirt
libxml2 . . . . . . . $with_libxml2