From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Wed, 30 Oct 2019 19:48:57 +0000 (+0100)
Subject: Fix compilation with libcuda
X-Git-Tag: 5.10.0~1^2~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3332%2Fhead;p=thirdparty%2Fcollectd.git

Fix compilation with libcuda

Fixes #3320
---

diff --git a/Makefile.am b/Makefile.am
index 9e2687a68..f00871b35 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1017,8 +1017,8 @@ endif
 if BUILD_PLUGIN_GPU_NVIDIA
 pkglib_LTLIBRARIES += gpu_nvidia.la
 gpu_nvidia_la_SOURCES = src/gpu_nvidia.c
-gpu_nvidia_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_GPU_CUDA_CPPFLAGS)
-gpu_nvidia_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_GPU_CUDA_LDFLAGS)
+gpu_nvidia_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) $(BUILD_WITH_CUDA_CPPFLAGS)
+gpu_nvidia_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_CUDA_LDFLAGS)
 gpu_nvidia_la_LIBADD = $(BUILD_WITH_CUDA_LIBS)
 endif
 
diff --git a/configure.ac b/configure.ac
index a1ce009ae..82016b3cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2096,8 +2096,8 @@ if test "x$with_cuda" = "xyes"; then
 fi
 
 if test "x$with_cuda" = "xyes"; then
-  BUILD_WITH_CUDA_CPPFLAGS="$CUDA_CPPFLAGS"
-  BUILD_WITH_CUDA_LDFLAGS="$CUDA_LDFLAGS"
+  BUILD_WITH_CUDA_CPPFLAGS="$with_cuda_cppflags"
+  BUILD_WITH_CUDA_LDFLAGS="$with_cuda_ldflags"
   BUILD_WITH_CUDA_LIBS="-lnvidia-ml"
 fi