Merge branch 'rf/std-auto-ptr' into 'master'

RF: Work around issue with c++17 and older versions of libxml++.

See merge request !36

CHANGELOG.md

 # FSL base project changelog
 
+## 2111.8 (Friday 26th November 2021)
+
+* Work around an issue with compiling against older versions of `libxml++`,
+  when using `-std=c++17`.
+* The `FSLLOCKDIR`, `FSLMACHINELIST`, `FSLREMOTECALL` and `FSLPARALLEL`
+  variables are not defined by default.
+
 
 ## 2111.7 (Friday 19th November 2021)
 

config/buildSettings.mk

@@ -114,6 +114,13 @@ ifeq ($(SYSTYPE), Darwin)
   LDFLAGS  += -Wl,-rpath,"${FSLDIR}/lib"
   ARCHLIBS += -llapack -lblas -lz -lm
 
+  # Old versions of libxml++ (which is used by
+  # ciftilib) use std::auto_ptr, which has been
+  # removed from the llvm C++17 implementation.
+  # Adding this flag is a hack which allows us
+  # to continue to use std::auto_ptr.
+  ARCHCPPFLAGS += -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR
+
   # On macOS, we need to change the install
   # name of shared libs so that they can be
   # looked up according to the rpath of

etc/fslconf/fsl.sh

@@ -43,8 +43,8 @@ fi
 #   NIFTI_PAIR_GZ
 #   NIFTI2_PAIR_GZ
 #
-# This would typically be overwritten in ${HOME}/.fslconf/fsl.sh if the user wished
-# to write files with a different format
+# This would typically be overwritten in ${HOME}/.fslconf/fsl.sh if the user 
+# wished to write files with a different format
 export FSLOUTPUTTYPE=NIFTI_GZ
 
 # Comment out the definition of FSLMULTIFILEQUIT to enable
@@ -62,9 +62,10 @@ export FSLWISH=$FSLDIR/bin/fslwish
 # The following variables are used for running code in parallel across
 #  several machines ( i.e. for FDT )
 
-export FSLLOCKDIR=
-export FSLMACHINELIST=
-export FSLREMOTECALL=
+# export FSLLOCKDIR=
+# export FSLMACHINELIST=
+# export FSLREMOTECALL=
+# export FSLPARALLEL=
 
 # The following variables are used to configure CUDA capable queues - if you
 # are using Grid Engine then this queue will be used to enqueue tasks that