CONFIG: include static libraries in FFTW search (#1087)

wmake/scripts/have_fftw

@@ -68,6 +68,7 @@ have_fftw()
     # Header/library names
     header="fftw3.h"
     library="libfftw3$extLibso"
+    static="libfftw3$extLiba"
 
 
     if hasAbsdir "$FFTW_ARCH_PATH"
@@ -77,7 +78,9 @@ have_fftw()
         # FOAM_EXT_LIBBIN is allowed to be unset
         library=$(findFirstFile \
             $FOAM_EXT_LIBBIN/$library \
+            $FFTW_ARCH_PATH/lib/$static \
             $FFTW_ARCH_PATH/lib/$library \
+            $FFTW_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/$static \
             $FFTW_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/$library \
         )
     elif isSystem "$FFTW_ARCH_PATH"

wmake/scripts/have_hypre

@@ -55,9 +55,17 @@ echo_hypre()
 have_hypre()
 {
     local header library static label settings warn
-    # warn="==> skip hypre"
+    warn="==> skip hypre"
 
-    # Basic setup/checks
+    # Basic setup/checks. Prefer current environment value? (TDB)
+    if [ ! -d "$HYPRE_ARCH_PATH" ]
+    then
+        settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/hypre) || {
+            [ -n "$warn" ] && echo "$warn (no config.sh/hypre settings)"
+            return 1
+        }
+        . $settings
+    fi
     if isNone "$HYPRE_ARCH_PATH"
     then
         [ -n "$warn" ] && echo "$warn (not available)"