Merge branch 'master' of /home/dm4/OpenFOAM/repositories/OpenFOAM-dev

etc/config/CGAL.csh

@@ -41,6 +41,10 @@ if ($?FOAM_VERBOSE && $?prompt) then
     echo "    $boost_version at $BOOST_ARCH_PATH"
 endif
 
+if ( -d "$CGAL_ARCH_PATH" ) then
+    _foamAddLib $CGAL_ARCH_PATH/lib
+endif
+
 if ( -d "$BOOST_ARCH_PATH" ) then
     _foamAddLib $BOOST_ARCH_PATH/lib
 endif

etc/config/CGAL.sh

@@ -42,6 +42,11 @@ then
     echo "    $boost_version at $BOOST_ARCH_PATH"
 fi
 
+if [ -d "$CGAL_ARCH_PATH" ]
+then
+    _foamAddLib $CGAL_ARCH_PATH/lib
+fi
+
 if [ -d "$BOOST_ARCH_PATH" ]
 then
     _foamAddLib $BOOST_ARCH_PATH/lib

etc/config/settings.csh

@@ -562,7 +562,7 @@ endif
 
 # cleanup environment:
 # ~~~~~~~~~~~~~~~~~~~~
-unalias _foamAddPath _foamAddLib _foamAddMan
+#- keep _foamAddPath _foamAddLib _foamAddMan
 unset foamCompiler minBufferSize
 
 # ----------------------------------------------------------------- end-of-file

etc/config/settings.sh

@@ -569,6 +569,7 @@ export MPI_BUFFER_SIZE
 
 # cleanup environment:
 # ~~~~~~~~~~~~~~~~~~~~
-unset _foamAddPath _foamAddLib _foamAddMan foamCompiler minBufferSize
+#keep _foamAddPath _foamAddLib _foamAddMan
+unset foamCompiler minBufferSize
 
 # ----------------------------------------------------------------- end-of-file