Merge pull request #4722 from pkovacs/master-opal-check

opal_check_package: filter /usr[/local]/include from CPPFLAGS
open-mpi · Jan 17, 2018 · 6b3cf6f · 6b3cf6f
2 parents 8eea942 + c4fe4ec
commit 6b3cf6f
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/config/opal_check_package.m4 b/config/opal_check_package.m4
@@ -42,7 +42,9 @@ AC_DEFUN([_OPAL_CHECK_PACKAGE_HEADER], [
     dir_prefix=$(echo $3 | sed -e 'sX/*$XXg')
     opal_check_package_header_happy="no"
     AS_IF([test "$dir_prefix" = "/usr" || \
-           test "$dir_prefix" = "/usr/local"],
+           test "$dir_prefix" = "/usr/local" || \
+           test "$dir_prefix" = "/usr/include" || \
+           test "$dir_prefix" = "/usr/local/include"],
            [ # try as is...
             AC_VERBOSE([looking for header without includes])
             AC_CHECK_HEADERS([$2], [opal_check_package_header_happy="yes"], [])