diff --git a/ompi/mca/btl/openib/Makefile.am b/ompi/mca/btl/openib/Makefile.am
index 965633659c..dd1ab30cb4 100644
--- a/ompi/mca/btl/openib/Makefile.am
+++ b/ompi/mca/btl/openib/Makefile.am
@@ -127,7 +127,7 @@ mca_btl_openib_la_SOURCES = $(component_sources)
 mca_btl_openib_la_LDFLAGS = -module -avoid-version $(btl_openib_LDFLAGS)
 mca_btl_openib_la_LIBADD = $(btl_openib_LIBS) \
     $(top_ompi_builddir)/ompi/mca/common/verbs/libmca_common_verbs.la
-if OPAL_cuda_support
+if MCA_ompi_cuda_support
 mca_btl_openib_la_LIBADD += \
     $(top_ompi_builddir)/ompi/mca/common/cuda/libmca_common_cuda.la
 endif
diff --git a/ompi/mca/btl/smcuda/Makefile.am b/ompi/mca/btl/smcuda/Makefile.am
index 9675c45fbf..4bad852bfc 100644
--- a/ompi/mca/btl/smcuda/Makefile.am
+++ b/ompi/mca/btl/smcuda/Makefile.am
@@ -51,7 +51,7 @@ mca_btl_smcuda_la_LDFLAGS = -module -avoid-version
 mca_btl_smcuda_la_LIBADD = \
     $(top_ompi_builddir)/ompi/mca/common/sm/libmca_common_sm.la
 mca_btl_smcuda_la_CPPFLAGS = $(btl_smcuda_CPPFLAGS)
-if OPAL_cuda_support
+if MCA_ompi_cuda_support
 mca_btl_smcuda_la_LIBADD += \
     $(top_ompi_builddir)/ompi/mca/common/cuda/libmca_common_cuda.la
 endif
diff --git a/ompi/mca/btl/tcp/Makefile.am b/ompi/mca/btl/tcp/Makefile.am
index 3405c79978..7e2f4b0c11 100644
--- a/ompi/mca/btl/tcp/Makefile.am
+++ b/ompi/mca/btl/tcp/Makefile.am
@@ -55,7 +55,7 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_btl_tcp_la_SOURCES = $(component_sources)
 mca_btl_tcp_la_LDFLAGS = -module -avoid-version
-if OPAL_cuda_support
+if MCA_ompi_cuda_support
 mca_btl_tcp_la_LIBADD = \
     $(top_ompi_builddir)/ompi/mca/common/cuda/libmca_common_cuda.la
 endif
diff --git a/ompi/mca/common/cuda/configure.m4 b/ompi/mca/common/cuda/configure.m4
index 0784dca12d..459fb076b1 100644
--- a/ompi/mca/common/cuda/configure.m4
+++ b/ompi/mca/common/cuda/configure.m4
@@ -24,6 +24,8 @@ AC_DEFUN([MCA_ompi_common_cuda_CONFIG],[
           [$1],
           [$2])
 
+    AM_CONDITIONAL([MCA_ompi_cuda_support], [test "x$OPAL_CUDA_SUPPORT" = "x1"]) 
+
     # Copy over the includes needed to build CUDA
     common_cuda_CPPFLAGS=$opal_datatype_cuda_CPPFLAGS
     AC_SUBST([common_cuda_CPPFLAGS])
diff --git a/ompi/mca/mpool/gpusm/Makefile.am b/ompi/mca/mpool/gpusm/Makefile.am
index 37731e7fe3..cea9ae7f2c 100644
--- a/ompi/mca/mpool/gpusm/Makefile.am
+++ b/ompi/mca/mpool/gpusm/Makefile.am
@@ -46,7 +46,7 @@ mcacomponent_LTLIBRARIES = $(component_install)
 mca_mpool_gpusm_la_SOURCES = $(sources)
 mca_mpool_gpusm_la_LDFLAGS = -module -avoid-version
 mca_mpool_gpusm_la_LIBADD = $(mpool_gpusm_LIBS)
-if OPAL_cuda_support
+if MCA_ompi_cuda_support
 mca_mpool_gpusm_la_LIBADD += \
     $(top_ompi_builddir)/ompi/mca/common/cuda/libmca_common_cuda.la
 endif
diff --git a/ompi/mca/mpool/rgpusm/Makefile.am b/ompi/mca/mpool/rgpusm/Makefile.am
index 63449062b8..af5815d519 100644
--- a/ompi/mca/mpool/rgpusm/Makefile.am
+++ b/ompi/mca/mpool/rgpusm/Makefile.am
@@ -46,7 +46,7 @@ mcacomponent_LTLIBRARIES = $(component_install)
 mca_mpool_rgpusm_la_SOURCES = $(sources)
 mca_mpool_rgpusm_la_LDFLAGS = -module -avoid-version
 mca_mpool_rgpusm_la_LIBADD = $(mpool_rgpusm_LIBS)
-if OPAL_cuda_support
+if MCA_ompi_cuda_support
 mca_mpool_rgpusm_la_LIBADD += \
     $(top_ompi_builddir)/ompi/mca/common/cuda/libmca_common_cuda.la
 endif
diff --git a/ompi/mca/mpool/sm/Makefile.am b/ompi/mca/mpool/sm/Makefile.am
index 37acb9ebfd..0da33f972e 100644
--- a/ompi/mca/mpool/sm/Makefile.am
+++ b/ompi/mca/mpool/sm/Makefile.am
@@ -44,7 +44,7 @@ mca_mpool_sm_la_SOURCES = $(sources)
 mca_mpool_sm_la_LDFLAGS = -module -avoid-version
 mca_mpool_sm_la_LIBADD = \
     $(top_ompi_builddir)/ompi/mca/common/sm/libmca_common_sm.la
-if OPAL_cuda_support
+if MCA_ompi_cuda_support
 mca_mpool_sm_la_LIBADD += \
     $(top_ompi_builddir)/ompi/mca/common/cuda/libmca_common_cuda.la
 endif
diff --git a/ompi/mca/pml/bfo/Makefile.am b/ompi/mca/pml/bfo/Makefile.am
index f856bc1b59..84eb2f3c57 100644
--- a/ompi/mca/pml/bfo/Makefile.am
+++ b/ompi/mca/pml/bfo/Makefile.am
@@ -53,7 +53,7 @@ bfo_sources  = \
 	pml_bfo_start.c 
 
 # If we have CUDA support requested, build the CUDA file also
-if OPAL_cuda_support
+if MCA_ompi_cuda_support
 bfo_sources += \
     pml_bfo_cuda.c
 endif
diff --git a/ompi/mca/pml/ob1/Makefile.am b/ompi/mca/pml/ob1/Makefile.am
index 89a7a1f53e..6042e2df61 100644
--- a/ompi/mca/pml/ob1/Makefile.am
+++ b/ompi/mca/pml/ob1/Makefile.am
@@ -49,7 +49,7 @@ ob1_sources  = \
 	pml_ob1_start.c 
 
 # If we have CUDA support requested, build the CUDA file also
-if OPAL_cuda_support
+if MCA_ompi_cuda_support
 ob1_sources += \
     pml_ob1_cuda.c
 endif