Skip to content

Commit be3197f

Browse files
author
Ralph Castain
committed
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
1 parent 45336d0 commit be3197f

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

opal/mca/event/external/Makefile.am

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#
22
# Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
33
# Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
4+
# Copyright (c) 2016 Intel, Inc. All rights reserved.
45
# $COPYRIGHT$
56
#
67
# Additional copyrights may follow
@@ -16,3 +17,9 @@ libmca_event_external_la_SOURCES = \
1617
event_external_component.c \
1718
event_external_module.c
1819
libmca_event_external_la_CPPFLAGS = $(opal_event_external_CPPFLAGS)
20+
21+
#Conditionally install the header files
22+
if WANT_INSTALL_HEADERS
23+
opaldir = $(opalincludedir)/$(subdir)
24+
nobase_opal_HEADERS = external.h
25+
endif

opal/mca/hwloc/external/external.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright (c) 2016 Research Organization for Information Science
44
* and Technology (RIST). All rights reserved.
55
*
6+
* Copyright (c) 2016 Intel, Inc. All rights reserved.
67
* $COPYRIGHT$
78
*
89
* Additional copyrights may follow
@@ -19,7 +20,7 @@
1920

2021
BEGIN_C_DECLS
2122

22-
#include <opal/include/opal_config.h>
23+
#include <opal_config.h>
2324
#include MCA_hwloc_external_header
2425

2526
/* If the including file requested it, also include the hwloc verbs

0 commit comments

Comments
 (0)