From eb6fb7f7e3cf59a0bf81d42c1e63fe693b17cb29 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 4 Apr 2017 17:11:36 +0200
Subject: [PATCH] ENH: make FOAM_EXT_LIBBIN optional in the configuration files

- useful for builds that don't use the ThirdParty directory at all
---
 etc/config.csh/mpi      | 13 +++++++------
 etc/config.csh/settings |  7 +++++--
 etc/config.sh/mpi       | 14 ++++++++------
 etc/config.sh/settings  |  8 ++++++--
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/etc/config.csh/mpi b/etc/config.csh/mpi
index 1d3789ce38..e6b57838b4 100644
--- a/etc/config.csh/mpi
+++ b/etc/config.csh/mpi
@@ -32,7 +32,7 @@
 #     wmake/rules/General/mplibUSERMPI file and managing all settings
 #
 #------------------------------------------------------------------------------
-unsetenv MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN
+unsetenv MPI_ARCH_PATH MPI_HOME
 
 switch ("$WM_MPLIB")
 case SYSTEMOPENMPI:
@@ -249,16 +249,17 @@ endsw
 
 
 # Add (non-dummy) MPI implementation
-# Dummy MPI already added to LD_LIBRARY_PATH and has no external libraries
+# - dummy MPI already added to LD_LIBRARY_PATH and has no external libraries
 if ( "$FOAM_MPI" != dummy ) then
-    _foamAddLib ${FOAM_LIBBIN}/${FOAM_MPI}:${FOAM_EXT_LIBBIN}/${FOAM_MPI}
+    if ( $?FOAM_EXT_LIBBIN ) then   # External libraries (allowed to be unset)
+        _foamAddLib ${FOAM_EXT_LIBBIN}/${FOAM_MPI}
+    endif
+    _foamAddLib ${FOAM_LIBBIN}/${FOAM_MPI}
 endif
 
 
-# Set the minimum MPI buffer size (used by all platforms except SGI MPI)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Minimum MPI buffer size (used by all except SGI MPI)
 if ( ! $?minBufferSize ) set minBufferSize=20000000
-
 if ( $?MPI_BUFFER_SIZE ) then
     if ( $MPI_BUFFER_SIZE < $minBufferSize ) then
         setenv MPI_BUFFER_SIZE $minBufferSize
diff --git a/etc/config.csh/settings b/etc/config.csh/settings
index 4cbcefc0f0..29094d6f79 100644
--- a/etc/config.csh/settings
+++ b/etc/config.csh/settings
@@ -197,8 +197,11 @@ endif
 unset siteDir
 
 _foamAddPath ${FOAM_USER_APPBIN}:${FOAM_SITE_APPBIN}:${FOAM_APPBIN}
-# Make sure to pick up dummy versions of external libraries last
-_foamAddLib  ${FOAM_USER_LIBBIN}:${FOAM_SITE_LIBBIN}:${FOAM_LIBBIN}:${FOAM_EXT_LIBBIN}:${FOAM_LIBBIN}/dummy
+_foamAddLib  $FOAM_LIBBIN/dummy     # Dummy versions of external libraries last
+if ( $?FOAM_EXT_LIBBIN ) then       # External libraries (allowed to be unset)
+    _foamAddLib $FOAM_EXT_LIBBIN
+endif
+_foamAddLib  ${FOAM_USER_LIBBIN}:${FOAM_SITE_LIBBIN}:${FOAM_LIBBIN}
 
 #------------------------------------------------------------------------------
 
diff --git a/etc/config.sh/mpi b/etc/config.sh/mpi
index 2aad0aab92..ae3961361f 100644
--- a/etc/config.sh/mpi
+++ b/etc/config.sh/mpi
@@ -32,7 +32,7 @@
 #     wmake/rules/General/mplibUSERMPI file and managing all settings
 #
 #------------------------------------------------------------------------------
-unset MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN
+unset MPI_ARCH_PATH MPI_HOME
 
 case "$WM_MPLIB" in
 SYSTEMOPENMPI)
@@ -264,17 +264,19 @@ INTELMPI)
 esac
 
 # Add (non-dummy) MPI implementation
-# Dummy MPI already added to LD_LIBRARY_PATH and has no external libraries
+# - dummy MPI already added to LD_LIBRARY_PATH and has no external libraries
 if [ "$FOAM_MPI" != dummy ] && type _foamAddLib > /dev/null 2>&1
 then
-    _foamAddLib $FOAM_LIBBIN/$FOAM_MPI:$FOAM_EXT_LIBBIN/$FOAM_MPI
+    if [ -n "$FOAM_EXT_LIBBIN" ]    # External libraries (allowed to be unset)
+    then
+        _foamAddLib $FOAM_EXT_LIBBIN/$FOAM_MPI
+    fi
+    _foamAddLib $FOAM_LIBBIN/$FOAM_MPI
 fi
 
 
-# Set the minimum MPI buffer size (used by all platforms except SGI MPI)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Minimum MPI buffer size (used by all except SGI MPI)
 : ${minBufferSize:=20000000}
-
 if [ "${MPI_BUFFER_SIZE:=$minBufferSize}" -lt $minBufferSize ]
 then
     MPI_BUFFER_SIZE=$minBufferSize
diff --git a/etc/config.sh/settings b/etc/config.sh/settings
index 77059d3f4c..d1e629eed5 100644
--- a/etc/config.sh/settings
+++ b/etc/config.sh/settings
@@ -198,8 +198,12 @@ fi
 unset siteDir
 
 _foamAddPath $FOAM_USER_APPBIN:$FOAM_SITE_APPBIN:$FOAM_APPBIN
-# Make sure to pick up dummy versions of external libraries last
-_foamAddLib  $FOAM_USER_LIBBIN:$FOAM_SITE_LIBBIN:$FOAM_LIBBIN:$FOAM_EXT_LIBBIN:$FOAM_LIBBIN/dummy
+_foamAddLib  $FOAM_LIBBIN/dummy     # Dummy versions of external libraries last
+if [ -n "$FOAM_EXT_LIBBIN" ]        # External libraries (allowed to be unset)
+then
+    _foamAddLib $FOAM_EXT_LIBBIN
+fi
+_foamAddLib  $FOAM_USER_LIBBIN:$FOAM_SITE_LIBBIN:$FOAM_LIBBIN
 
 #------------------------------------------------------------------------------