[cig-commits] [commit] devel, master: updates configuration and m4/ scripts (fixes configuration with CUDA and intel ifort compilers) (ca6ec64)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/specfem3d_globe

On branches: devel,master
Link       : https://github.com/geodynamics/specfem3d_globe/compare/bc58e579b3b0838a0968725a076f5904845437ca...be63f20cbb6f462104e949894dbe205d2398cd7f

>---------------------------------------------------------------

commit ca6ec6480b8c896434f788e92b9c4f66f5c4953a
Author: daniel peter <peterda at ethz.ch>
Date:   Sat Oct 18 12:28:25 2014 +0200

    updates configuration and m4/ scripts (fixes configuration with CUDA and intel ifort compilers)


>---------------------------------------------------------------

ca6ec6480b8c896434f788e92b9c4f66f5c4953a
 configure | 5 +++--
 m4        | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 97add03..3528cd8 100755
--- a/configure
+++ b/configure
@@ -6509,9 +6509,10 @@ rm -f core conftest.err conftest.$ac_objext \
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking with cudaMalloc in -lcudart" >&5
 $as_echo_n "checking linking with cudaMalloc in -lcudart... " >&6; }
   # C compiler linking
-  #ac_link='$NVCC -c $CFLAGS conftest.$ac_ext >&5; $CC -o conftest$ac_exeext $LDFLAGS conftest.$ac_objext $LIBS >&5'
+  ac_link='$NVCC -c $CFLAGS conftest.$ac_ext >&5; $CC -o conftest$ac_exeext $LDFLAGS conftest.$ac_objext $LIBS >&5'
   # Fortran compiler linking
-  ac_link='$NVCC -c $CFLAGS conftest.$ac_ext >&5; $FC -o conftest$ac_exeext $LDFLAGS conftest.$ac_objext $LIBS >&5'
+  # note: fortran linking with ifort would need -nofor-main to succeed
+  #ac_link='$NVCC -c $CFLAGS conftest.$ac_ext >&5; $FC -o conftest$ac_exeext $LDFLAGS conftest.$ac_objext $LIBS >&5'
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/m4 b/m4
index ba14abf..2f5d95b 160000
--- a/m4
+++ b/m4
@@ -1 +1 @@
-Subproject commit ba14abf73197b78e13d1a155a8f84ceb1d7be3e4
+Subproject commit 2f5d95b32cea24be622a943d2b434501a9c683db