Merge branch 'mr_fixes' into 'master'

MR-fixes

See merge request dkrz-source/sct!3

configure.ac

@@ -183,7 +183,9 @@ AS_IF([test x"$mpi" != xfalse],
          [AC_MSG_WARN([check for MPI_LAUNCH disabled])],
          [AC_PATH_PROGS([MPI_LAUNCH], [poe mpirun mpiexec], [true])
        # set MP_HOSTFILE if we are using IBM PE
-       if test x"$(basename $ac_cv_path_MPI_LAUNCH)" == x"poe"; then
+       # $ac_cv_path_MPI_LAUNCH can be a command with arguments:
+       set dummy $ac_cv_path_MPI_LAUNCH
+       if test x"$(basename $[2])" == x"poe"; then
          # create tmp hostfile and export envVar MP_HOSTFILE
          # to enable compiler check for MPI compiler in case of IBM PE
          if test -z "${MP_HOSTFILE}"; then

src/Makefile.am

@@ -42,7 +42,7 @@ else
 	$(top_srcdir)/util/gen_public_header.pl N_HAVE_MPI $(header)
 endif
 
-$(sct_mod): sct.o
+$(sct_mod): sct.lo
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = pkgconfig/sct.pc

src_nosct/Makefile.am

@@ -18,7 +18,7 @@ libsct_la_SOURCES =
 nodist_include_HEADERS =
 endif
 
-$(sct_mod): nosct.o
+$(sct_mod): nosct.lo
 
 # Clean Fortran module files and Cray's postprocessed files.
 CLEANFILES = $(sct_mod) sct.i