From be3197fe277e4accfe79976589a4c6a190a1ff97 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Thu, 20 Oct 2016 20:57:50 -0700 Subject: [PATCH] Ensure that the libevent headers are installed for external libevent when --with-devel-headers is given. Correct the path for opal_config.h in the external hwloc header --- opal/mca/event/external/Makefile.am | 7 +++++++ opal/mca/hwloc/external/external.h | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/opal/mca/event/external/Makefile.am b/opal/mca/event/external/Makefile.am index 3c9ade7651..2da30656ca 100644 --- a/opal/mca/event/external/Makefile.am +++ b/opal/mca/event/external/Makefile.am @@ -1,6 +1,7 @@ # # Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved. +# Copyright (c) 2016 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -16,3 +17,9 @@ libmca_event_external_la_SOURCES = \ event_external_component.c \ event_external_module.c libmca_event_external_la_CPPFLAGS = $(opal_event_external_CPPFLAGS) + +#Conditionally install the header files +if WANT_INSTALL_HEADERS +opaldir = $(opalincludedir)/$(subdir) +nobase_opal_HEADERS = external.h +endif diff --git a/opal/mca/hwloc/external/external.h b/opal/mca/hwloc/external/external.h index dcf455ed08..bf392767d3 100644 --- a/opal/mca/hwloc/external/external.h +++ b/opal/mca/hwloc/external/external.h @@ -3,6 +3,7 @@ * Copyright (c) 2016 Research Organization for Information Science * and Technology (RIST). All rights reserved. * + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -19,7 +20,7 @@ BEGIN_C_DECLS -#include +#include #include MCA_hwloc_external_header /* If the including file requested it, also include the hwloc verbs