Fix compilation with libcuda

Fixes #3320

diff --git a/Makefile.am b/Makefile.am
index 58d4a3edd99d3c100ef7e1aab35636196df4f092..a219f1b288b56647ca4bedffbe17d49d286cdde6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1098,8 +1098,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 6c6c0f806ddbf5fe95f819da378b986e6c496d9f..c77c8937f8019cd8120e98a2116807c793662ecf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2092,8 +2092,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