From f79071800f47e4c26869e84d81c9e2019f521b68 Mon Sep 17 00:00:00 2001 From: Alejandro Vilches Date: Tue, 14 Jul 2015 16:09:44 -0700 Subject: [PATCH 1/2] Improving robustness in opal_check_package header checking. --- config/opal_check_package.m4 | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/config/opal_check_package.m4 b/config/opal_check_package.m4 index 8e3f83d46b2..d054e906fd7 100644 --- a/config/opal_check_package.m4 +++ b/config/opal_check_package.m4 @@ -36,24 +36,27 @@ AC_DEFUN([_OPAL_CHECK_PACKAGE_HEADER], [ unset opal_Header opal_check_package_header_happy="no" - AS_IF([test "$3" = "/usr" || \ + AS_IF([test "$3" = "" || \ + test "$3" = "/usr" || \ test "$3" = "/usr/local"], [ # try as is... AC_VERBOSE([looking for header without includes]) - AC_CHECK_HEADERS([$2], [opal_check_package_header_happy="yes"], []) + AC_CHECK_HEADERS([$2], [opal_check_package_header_happy="yes"], [], [$6]) AS_IF([test "$opal_check_package_header_happy" = "no"], [# no go on the as is - reset the cache and try again - unset opal_Header])]) - - AS_IF([test "$opal_check_package_header_happy" = "no"], - [AS_IF([test "$3" != ""], - [$1_CPPFLAGS="$$1_CPPFLAGS -I$3/include" - CPPFLAGS="$CPPFLAGS -I$3/include"]) - AC_CHECK_HEADERS([$2], [opal_check_package_header_happy="yes"], [], [$6]) - AS_IF([test "$opal_check_package_header_happy" = "yes"], [$4], [$5])], - [$4]) - unset opal_check_package_header_happy + unset opal_Header])], + [AS_IF([test "$3" != ""], + AS_IF([test -e $3/$2], + [$1_CPPFLAGS="$$1_CPPFLAGS -I$3" + CPPFLAGS="$CPPFLAGS -I$3"], + AS_IF([test -e $3/include/$2], + [$1_CPPFLAGS="$$1_CPPFLAGS -I$3/include" + CPPFLAGS="$CPPFLAGS -I$3/include"]))) + AC_CHECK_HEADERS([$2], [opal_check_package_header_happy="yes"], [], [$6])]) + + AS_IF([test "$opal_check_package_header_happy" = "yes"], [$4], [$5]) + unset opal_check_package_header_happy AS_VAR_POPDEF([opal_Header])dnl ]) From a5bb93b6e9f124e8498d2dbcef7c22a6b98b2327 Mon Sep 17 00:00:00 2001 From: Alejandro Vilches Date: Thu, 16 Jul 2015 19:19:40 -0700 Subject: [PATCH 2/2] Previous commit caused an issue with the Mellanox build. Trying a different fix to address this issue. --- config/opal_check_package.m4 | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/config/opal_check_package.m4 b/config/opal_check_package.m4 index d054e906fd7..127f4b82b52 100644 --- a/config/opal_check_package.m4 +++ b/config/opal_check_package.m4 @@ -44,15 +44,27 @@ AC_DEFUN([_OPAL_CHECK_PACKAGE_HEADER], [ AC_CHECK_HEADERS([$2], [opal_check_package_header_happy="yes"], [], [$6]) AS_IF([test "$opal_check_package_header_happy" = "no"], [# no go on the as is - reset the cache and try again - unset opal_Header])], - [AS_IF([test "$3" != ""], - AS_IF([test -e $3/$2], - [$1_CPPFLAGS="$$1_CPPFLAGS -I$3" - CPPFLAGS="$CPPFLAGS -I$3"], - AS_IF([test -e $3/include/$2], - [$1_CPPFLAGS="$$1_CPPFLAGS -I$3/include" - CPPFLAGS="$CPPFLAGS -I$3/include"]))) - AC_CHECK_HEADERS([$2], [opal_check_package_header_happy="yes"], [], [$6])]) + unset opal_Header])]) + + AS_IF([test "$opal_check_package_header_happy" = "no" && \ + test "$3" != ""], + [$1_CPPFLAGS="$$1_CPPFLAGS -I$3/include" + CPPFLAGS="$CPPFLAGS -I$3/include" + AC_VERBOSE([looking for header in "$3/include"]) + AC_CHECK_HEADERS([$2], [opal_check_package_header_happy="yes"], [], [$6]) + AS_IF([test "$opal_check_package_header_happy" = "no"], + [# still no... - reset the cache and try again + unset opal_Header])]) + + AS_IF([test "$opal_check_package_header_happy" = "no" && \ + test "$3" != ""], + [$1_CPPFLAGS="$$1_CPPFLAGS -I$3" + CPPFLAGS="$CPPFLAGS -I$3" + AC_VERBOSE([looking for header in "$3"]) + AC_CHECK_HEADERS([$2], [opal_check_package_header_happy="yes"], [], [$6]) + AS_IF([test "$opal_check_package_header_happy" = "no"], + [# still no... + unset opal_Header])]) AS_IF([test "$opal_check_package_header_happy" = "yes"], [$4], [$5])