Merge branch 'mr-5-13-0-fixes' into 'master'

Fixes for 5.13.0-0rc1

Closes #116

See merge request parastation/psmpi!268

Author: sonjahapp

configure.ac

@@ -76,18 +76,6 @@ AC_ARG_WITH([hcoll], [
 ])
 AC_SUBST([DISABLE_HCOLL])
 
-DISABLE_UCC="true" # For the time being, disable UCC by default!
-AC_ARG_WITH([ucc], [
-  --with-ucc[[=path]]     Use UCC support (and specify path to UCC directory).
-],[
-	if test "x$with_ucc" = "xno" ; then
-	   DISABLE_UCC="true"
-	else
-	   DISABLE_UCC="false"
-	fi
-])
-AC_SUBST([DISABLE_UCC])
-
 AC_ARG_WITH([confset], [
   --with-confset[=set]  Use predefined configuration set ["default"]
 	   default    : Like 'gcc'
@@ -652,6 +640,17 @@ else
     CONF_OPS="$CONF_OPS --without-pmix --with-pmi=pmi1"
 fi
 
+DISABLE_UCC="true" # For the time being, disable UCC by default!
+AC_ARG_WITH([ucc], [
+  --with-ucc[[=path]]     Use UCC support (and specify path to UCC directory). Default: no.
+],[
+	if test "x$with_ucc" != "xno" ; then
+	   DISABLE_UCC="false"
+	fi
+],[
+	CONF_OPS="$CONF_OPS --without-ucc"
+])
+
 AC_ARG_WITH([cuda], [
   --with-cuda[[=path]]
 			  Use CUDA awareness within ParaStation MPI (and specify path to CUDA directory)

dist/Makefile.sources

@@ -20,7 +20,6 @@ dist/Makefile \
 dist/Makefile.sources \
 dist/psmpi.spec.templ \
 dist/rpm_depgen \
-doc/Makefile.in \
 doc/antora/antora.yml \
 doc/antora/modules/ROOT/images/psmpi-overview.svg \
 doc/antora/modules/ROOT/nav.adoc \
@@ -30,18 +29,6 @@ doc/antora/modules/ROOT/pages/installation.adoc \
 doc/antora/modules/ROOT/pages/requirements.adoc \
 doc/antora/modules/ROOT/pages/runtime-parameters.adoc \
 doc/antora/modules/ROOT/pages/test-suite.adoc \
-doc/imb-perf-booster.txt \
-doc/imb-perf-jureca.txt \
-doc/mpich-patches/0001-Fix-According-to-MPICH-its-recursive_doubling-algori.patch \
-doc/mpich-patches/0002-coll-Fix-bug-in-MPICH-s-scatter_ring-algorithm-of-MP.patch \
-doc/mpich-patches/0003-coll-Tune-fix-internal-algorithm-selection-for.patch \
-doc/mpich-patches/0004-mpich-romio-Fix-some-error-code-handling-in-MPICH-s-.patch \
-doc/mpich-patches/0005-hcoll-Avoid-some-compiler-warnings-in-MPICH-s-hcoll-.patch \
-doc/mpich-patches/0006-msa-Add-MPID_Get_-max_-badge-to-ADI3-interface.patch \
-doc/mpich-patches/0007-mpich-Fix-for-Bcast-with-messages-2-GiB.patch \
-doc/mpich-patches/0008-mpich-Fix-for-Ibcast-with-messages-2-GiB.patch \
-doc/mpich-patches/list-of-patches.sh \
-doc/mpich-patches/list-of-patches.txt \
 mpich2/.gitignore \
 mpich2/.mailmap \
 mpich2/.travis.yml \
@@ -6284,10 +6271,10 @@ mpich2/src/mpid/psp/src/mpid_psp_request.h \
 mpich2/src/mpid/psp/src/mpid_recv.c \
 mpich2/src/mpid/psp/src/mpid_rma.c \
 mpich2/src/mpid/psp/src/mpid_rma_accumulate.c \
+mpich2/src/mpid/psp/src/mpid_rma_callbacks.c \
 mpich2/src/mpid/psp/src/mpid_rma_get.c \
 mpich2/src/mpid/psp/src/mpid_rma_put.c \
 mpich2/src/mpid/psp/src/mpid_rma_sync.c \
-mpich2/src/mpid/psp/src/mpid_rma_callbacks.c \
 mpich2/src/mpid/psp/src/mpid_send.c \
 mpich2/src/mpid/psp/src/mpid_spawn.c \
 mpich2/src/mpid/psp/src/mpid_start.c \