Changes to configry to accommodate LLVM

Make.inc.in

@@ -88,7 +88,8 @@ CUDA_DEFINES=@CUDA_DEFINES@
 FCUDEFINES=@FCUDEFINES@
 CCUDEFINES=@CCUDEFINES@
 CXXCUDEFINES=@CXXCUDEFINES@
-NVCC=@CUDA_NVCC@
+EXTRA_NVCC=@EXTRA_NVCC@
+NVCC=@CUDA_NVCC@ $(EXTRA_NVCC)
 CUDEFINES=@CUDEFINES@
 
 

configure

@@ -707,6 +707,7 @@ MODEXT
 FMFLAG
 FIFLAG
 FAKEMPI
+EXTRA_NVCC
 EXTRA_OPT
 CXXOPT
 CCOPT
@@ -833,6 +834,7 @@ with_extra_opt
 with_libs
 with_clibs
 with_flibs
+with_extra_nvcc
 with_library_path
 with_include_path
 with_module_path
@@ -1533,6 +1535,8 @@ Optional Packages:
                           to [CLIBS]
   --with-flibs            additional [FLIBS] flags to be added: will prepend
                           to [FLIBS]
+  --with-extra-nvcc       additional [EXTRA_NVCC] flags to be added: will
+                          prepend to [EXTRA_NVCC]
   --with-library-path     additional [LIBRARYPATH] flags to be added: will
                           prepend to [LIBRARYPATH]
   --with-include-path     additional [INCLUDEPATH] flags to be added: will
@@ -5818,6 +5822,25 @@ fi
 
 
 
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether additional EXTRA_NVCC flags should be added (should be invoked only once)" >&5
+printf %s "checking whether additional EXTRA_NVCC flags should be added (should be invoked only once)... " >&6; }
+
+# Check whether --with-extra-nvcc was given.
+if test ${with_extra_nvcc+y}
+then :
+  withval=$with_extra_nvcc;
+EXTRA_NVCC="${withval} ${EXTRA_NVCC}"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXTRA_NVCC = ${EXTRA_NVCC}" >&5
+printf "%s\n" "EXTRA_NVCC = ${EXTRA_NVCC}" >&6; }
+
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+fi
+
+
+
 
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether additional LIBRARYPATH flags should be added (should be invoked only once)" >&5
 printf %s "checking whether additional LIBRARYPATH flags should be added (should be invoked only once)... " >&6; }
@@ -11400,6 +11423,7 @@ UTILLIBNAME=libpsb_util.a
 
 
 
+
 
 
 PSBLASRULES='

configure.ac

@@ -197,6 +197,7 @@ PAC_ARG_WITH_FLAGS(extra-opt,EXTRA_OPT)
 PAC_ARG_WITH_LIBS
 PAC_ARG_WITH_FLAGS(clibs,CLIBS)
 PAC_ARG_WITH_FLAGS(flibs,FLIBS)
+PAC_ARG_WITH_FLAGS(extra-nvcc,EXTRA_NVCC)
 
 dnl candidates for removal:
 PAC_ARG_WITH_FLAGS(library-path,LIBRARYPATH)
@@ -947,6 +948,7 @@ AC_SUBST(FCOPT)
 AC_SUBST(CCOPT)
 AC_SUBST(CXXOPT)
 AC_SUBST(EXTRA_OPT)
+AC_SUBST(EXTRA_NVCC)
 AC_SUBST(FAKEMPI)
 AC_SUBST(FIFLAG)
 AC_SUBST(FMFLAG)