summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
a96e1c4)
It had a bunch of issues, one of them that it touched CFLAGS, the other
that it didn't use CUDA_CFLAGS.
The check is still too simple, we need to check if we can actually use
the library instead of just the header.
if BUILD_PLUGIN_GPU_NVIDIA
pkglib_LTLIBRARIES += gpu_nvidia.la
gpu_nvidia_la_SOURCES = src/gpu_nvidia.c
if BUILD_PLUGIN_GPU_NVIDIA
pkglib_LTLIBRARIES += gpu_nvidia.la
gpu_nvidia_la_SOURCES = src/gpu_nvidia.c
+gpu_nvidia_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) $(BUILD_WITH_GPU_CUDA_CPPFLAGS)
gpu_nvidia_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_GPU_CUDA_LDFLAGS)
gpu_nvidia_la_LIBADD = $(BUILD_WITH_CUDA_LIBS)
endif
gpu_nvidia_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_GPU_CUDA_LDFLAGS)
gpu_nvidia_la_LIBADD = $(BUILD_WITH_CUDA_LIBS)
endif
-# only CUDA provides the nvml.h header
AC_ARG_WITH([cuda],
[AS_HELP_STRING([--with-cuda@<:@=PREFIX@:>@], [Path to cuda.])],
[
AC_ARG_WITH([cuda],
[AS_HELP_STRING([--with-cuda@<:@=PREFIX@:>@], [Path to cuda.])],
[
- if test "x$withval" = "xyes"; then
+ if test "x$withval" != "xno" && test "x$withval" != "xyes"; then
+ with_cuda_cppflags="-I$withval/include"
+ with_cuda_ldflags="-I$withval/lib"
- else if test "x$withval" = "xno"; then
- with_cuda="no"
- with_cuda="yes"
- CUDA_CFLAGS="$CUDA_CFLAGS -I$withval/include"
- CUDA_LDFLAGS="$CUDA_LDFLAGS -L$withval/lib"
- fi; fi
+ with_cuda="$withval"
+ fi
- [ with_cuda="yes"
- CUDA_CFLAGS="$CUDA_CFLAGS -I/opt/cuda/include"
- CUDA_LDFLAGS="$CUDA_LDFLAGS -L/opt/cuda/lib64"
- ]
-SAVE_CFLAGS="$CFLAGS"
-SAVE_LDFLAGS="$LDFLAGS"
-CFLAGS="$CFLAGS $CUDA_CFLAGS"
-LDFLAGS="$LDFLAGS $CUDA_LDFLAGS"
-
if test "x$with_cuda" = "xyes"; then
if test "x$with_cuda" = "xyes"; then
+ SAVE_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $with_cuda_cppflags"
+
AC_CHECK_HEADERS([nvml.h],
[with_cuda="yes"],
AC_CHECK_HEADERS([nvml.h],
[with_cuda="yes"],
- [with_cuda="no (header file missing)"]
+ [with_cuda="no (nvml.h not found)"]
-if test "x$with_cuda" = "xpkgconfig"; then
- AC_CHECK_HEADERS([nvml.h],
- [],
- [with_cuda="no (header file missing)"]
- )
+ CPPFLAGS="$SAVE_CPPFLAGS"
fi
if test "x$with_cuda" = "xyes"; then
fi
if test "x$with_cuda" = "xyes"; then
- BUILD_WITH_CUDA_CFLAGS="$CUDA_CFLAGS"
+ BUILD_WITH_CUDA_CPPFLAGS="$CUDA_CPPFLAGS"
BUILD_WITH_CUDA_LDFLAGS="$CUDA_LDFLAGS"
BUILD_WITH_CUDA_LIBS="-lnvidia-ml"
fi
BUILD_WITH_CUDA_LDFLAGS="$CUDA_LDFLAGS"
BUILD_WITH_CUDA_LIBS="-lnvidia-ml"
fi
-AC_SUBST([BUILD_WITH_CUDA_CFLAGS])
+AC_SUBST([BUILD_WITH_CUDA_CPPFLAGS])
AC_SUBST([BUILD_WITH_CUDA_LDFLAGS])
AC_SUBST([BUILD_WITH_CUDA_LIBS])
AC_SUBST([BUILD_WITH_CUDA_LDFLAGS])
AC_SUBST([BUILD_WITH_CUDA_LIBS])
AC_MSG_RESULT([ YFLAGS . . . . . . . $YFLAGS])
AC_MSG_RESULT()
AC_MSG_RESULT([ Libraries:])
AC_MSG_RESULT([ YFLAGS . . . . . . . $YFLAGS])
AC_MSG_RESULT()
AC_MSG_RESULT([ Libraries:])
-AC_MSG_RESULT([ cuda . . . . . . . . $with_cuda])
AC_MSG_RESULT([ intel mic . . . . . . $with_mic])
AC_MSG_RESULT([ libaquaero5 . . . . . $with_libaquaero5])
AC_MSG_RESULT([ libatasmart . . . . . $with_libatasmart])
AC_MSG_RESULT([ intel mic . . . . . . $with_mic])
AC_MSG_RESULT([ libaquaero5 . . . . . $with_libaquaero5])
AC_MSG_RESULT([ libatasmart . . . . . $with_libatasmart])
AC_MSG_RESULT([ libnetsnmp . . . . . $with_libnetsnmp])
AC_MSG_RESULT([ libnetsnmpagent . . . $with_libnetsnmpagent])
AC_MSG_RESULT([ libnotify . . . . . . $with_libnotify])
AC_MSG_RESULT([ libnetsnmp . . . . . $with_libnetsnmp])
AC_MSG_RESULT([ libnetsnmpagent . . . $with_libnetsnmpagent])
AC_MSG_RESULT([ libnotify . . . . . . $with_libnotify])
+AC_MSG_RESULT([ libnvidia-ml . . . . $with_cuda])
AC_MSG_RESULT([ libopenipmi . . . . . $with_libopenipmipthread])
AC_MSG_RESULT([ liboping . . . . . . $with_liboping])
AC_MSG_RESULT([ libowcapi . . . . . . $with_libowcapi])
AC_MSG_RESULT([ libopenipmi . . . . . $with_libopenipmipthread])
AC_MSG_RESULT([ liboping . . . . . . $with_liboping])
AC_MSG_RESULT([ libowcapi . . . . . . $with_libowcapi])