COMP: include /usr/local in search for system headers/libraries

- this is consistent with compiler defaults, and helps Darwin users

wmake/rules/General/CGAL

@@ -3,6 +3,7 @@ CGAL_INC = \
     -I$(MPFR_ARCH_PATH)/include \
     -I$(BOOST_ARCH_PATH)/include \
     -I$(CGAL_ARCH_PATH)/include \
+    -I/usr/local/include \
     -I/usr/include
 
 CGAL_LIBS = \

wmake/scripts/have_boost

@@ -82,12 +82,23 @@ have_boost()
         )
     elif isSystem "$BOOST_ARCH_PATH"
     then
-        header=$(findFirstFile /usr/include/$header)
-
-        library=$(findFirstFile \
-            /usr/lib/$library \
-            /usr/lib$WM_COMPILER_LIB_ARCH/$library \
-        )
+        header=$(findFirstFile /usr/local/include/$header /usr/include/$header)
+
+        case "$header" in
+        /usr/local/*)
+            library=$(findFirstFile \
+                /usr/local/lib/$library \
+                /usr/local/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+
+        *)
+            library=$(findFirstFile \
+                /usr/lib/$library \
+                /usr/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+        esac
     else
         unset header library
     fi

wmake/scripts/have_cgal

@@ -82,12 +82,23 @@ have_cgal()
         )
     elif isSystem "$CGAL_ARCH_PATH"
     then
-        header=$(findFirstFile /usr/include/$header)
-
-        library=$(findFirstFile \
-            /usr/lib/$library \
-            /usr/lib$WM_COMPILER_LIB_ARCH/$library \
-        )
+        header=$(findFirstFile /usr/local/include/$header /usr/include/$header)
+
+        case "$header" in
+        /usr/local/*)
+            library=$(findFirstFile \
+                /usr/local/lib/$library \
+                /usr/local/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+
+        *)
+            library=$(findFirstFile \
+                /usr/lib/$library \
+                /usr/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+        esac
     else
         unset header library
     fi

wmake/scripts/have_fftw

@@ -82,12 +82,23 @@ have_fftw()
         )
     elif isSystem "$FFTW_ARCH_PATH"
     then
-        header=$(findFirstFile /usr/include/$header)
-
-        library=$(findFirstFile \
-            /usr/lib/$library \
-            /usr/lib$WM_COMPILER_LIB_ARCH/$library \
-        )
+        header=$(findFirstFile /usr/local/include/$header /usr/include/$header)
+
+        case "$header" in
+        /usr/local/*)
+            library=$(findFirstFile \
+                /usr/local/lib/$library \
+                /usr/local/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+
+        *)
+            library=$(findFirstFile \
+                /usr/lib/$library \
+                /usr/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+        esac
     else
         unset header library
     fi

wmake/scripts/have_kahip

@@ -90,12 +90,23 @@ have_kahip()
         )
     elif isSystem "$KAHIP_ARCH_PATH"
     then
-        header=$(findFirstFile /usr/include/$header)
-
-        library=$(findFirstFile \
-            /usr/lib/$library \
-            /usr/lib$WM_COMPILER_LIB_ARCH/$library \
-        )
+        header=$(findFirstFile /usr/local/include/$header /usr/include/$header)
+
+        case "$header" in
+        /usr/local/*)
+            library=$(findFirstFile \
+                /usr/local/lib/$library \
+                /usr/local/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+
+        *)
+            library=$(findFirstFile \
+                /usr/lib/$library \
+                /usr/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+        esac
     else
         unset header library
     fi

wmake/scripts/have_metis

@@ -91,12 +91,23 @@ have_metis()
         )
     elif isSystem "$METIS_ARCH_PATH"
     then
-        header=$(findFirstFile /usr/include/$header)
-
-        library=$(findFirstFile \
-            /usr/lib/$library \
-            /usr/lib$WM_COMPILER_LIB_ARCH/$library \
-        )
+        header=$(findFirstFile /usr/local/include/$header /usr/include/$header)
+
+        case "$header" in
+        /usr/local/*)
+            library=$(findFirstFile \
+                /usr/local/lib/$library \
+                /usr/local/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+
+        *)
+            library=$(findFirstFile \
+                /usr/lib/$library \
+                /usr/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+        esac
     else
         unset header library
     fi

wmake/scripts/have_mgridgen

@@ -91,12 +91,23 @@ have_mgridgen()
         )
     elif isSystem "$MGRIDGEN_ARCH_PATH"
     then
-        header=$(findFirstFile /usr/include/$header)
-
-        library=$(findFirstFile \
-            /usr/lib/$library \
-            /usr/lib$WM_COMPILER_LIB_ARCH/$library \
-        )
+        header=$(findFirstFile /usr/local/include/$header /usr/include/$header)
+
+        case "$header" in
+        /usr/local/*)
+            library=$(findFirstFile \
+                /usr/local/lib/$library \
+                /usr/local/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+
+        *)
+            library=$(findFirstFile \
+                /usr/lib/$library \
+                /usr/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+        esac
     else
         unset header library
     fi

wmake/scripts/have_readline

@@ -61,12 +61,23 @@ have_readline()
     library="libreadline$extLibso"
 
     # System only?
-    header=$(findFirstFile /usr/include/$header)
-
-    library=$(findFirstFile \
-        /usr/lib/$library \
-        /usr/lib$WM_COMPILER_LIB_ARCH/$library \
-    )
+    header=$(findFirstFile /usr/local/include/$header /usr/include/$header)
+
+    case "$header" in
+    /usr/local/*)
+        library=$(findFirstFile \
+            /usr/local/lib/$library \
+            /usr/local/lib$WM_COMPILER_LIB_ARCH/$library \
+        )
+        ;;
+
+    *)
+        library=$(findFirstFile \
+            /usr/lib/$library \
+            /usr/lib$WM_COMPILER_LIB_ARCH/$library \
+        )
+        ;;
+    esac
 
     # Header found?
     [ -n "$header" ] || {

wmake/scripts/have_scotch

@@ -91,12 +91,28 @@ have_scotch()
         )
     elif isSystem "$SCOTCH_ARCH_PATH"
     then
-        header=$(findFirstFile /usr/include/$header /usr/include/scotch/$header)
-
-        library=$(findFirstFile \
-            /usr/lib/$library \
-            /usr/lib$WM_COMPILER_LIB_ARCH/$library \
+        header=$(findFirstFile \
+            /usr/local/include/$header \
+            /usr/local/include/scotch/$header \
+            /usr/include/$header \
+            /usr/include/scotch/$header \
         )
+
+        case "$header" in
+        /usr/local/*)
+            library=$(findFirstFile \
+                /usr/local/lib/$library \
+                /usr/local/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+
+        *)
+            library=$(findFirstFile \
+                /usr/lib/$library \
+                /usr/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+        esac
     else
         unset header library
     fi

wmake/scripts/have_zoltan

@@ -90,12 +90,23 @@ have_zoltan()
         )
     elif isSystem "$ZOLTAN_ARCH_PATH"
     then
-        header=$(findFirstFile /usr/include/$header)
-
-        library=$(findFirstFile \
-            /usr/lib/$library \
-            /usr/lib$WM_COMPILER_LIB_ARCH/$library \
-        )
+        header=$(findFirstFile /usr/local/include/$header /usr/include/$header)
+
+        case "$header" in
+        /usr/local/*)
+            library=$(findFirstFile \
+                /usr/local/lib/$library \
+                /usr/local/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+
+        *)
+            library=$(findFirstFile \
+                /usr/lib/$library \
+                /usr/lib$WM_COMPILER_LIB_ARCH/$library \
+            )
+            ;;
+        esac
     else
         unset header library
     fi