From a08f7250c1d37cb1328c73149cbcb593758cccdc Mon Sep 17 00:00:00 2001
From: Christoph Niethammer <niethammer@hlrs.de>
Date: Wed, 21 Aug 2019 14:49:46 +0000
Subject: [PATCH] Fixed some papi location finding issues.

---
 packages/performance/extrae/extrae-3.6.1 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/performance/extrae/extrae-3.6.1 b/packages/performance/extrae/extrae-3.6.1
index 37fe1d2..8cc77c6 100644
--- a/packages/performance/extrae/extrae-3.6.1
+++ b/packages/performance/extrae/extrae-3.6.1
@@ -45,10 +45,11 @@ case $PLATFORM in
 esac
 
 
-# use PAPI
 if [ $enable_papi != 0 ] ; then
-    PAPI_DIR=$(dirname $(dirname $(which papi_avail)))
+    PAPI_DIR=${PAPI_DIR:=$(dirname $(dirname $(which papi_avail)))}
     CONFIGURE_OPTS="$CONFIGURE_OPTS --with-papi=$PAPI_DIR"
+    CONFIGURE_OPTS="$CONFIGURE_OPTS --with-papi-headers=${PAPI_INC_DIR:=$PAPI_DIR/include}"
+    CONFIGURE_OPTS="$CONFIGURE_OPTS --with-papi-libs=${PAPI_LIB_DIR:=$PAPI_DIR/lib}"
 else
     CONFIGURE_OPTS="$CONFIGURE_OPTS --without-papi"
 fi