From cdfe3a7b66d2e4496ce79ed80cc1bcdd5943f2cd Mon Sep 17 00:00:00 2001
From: Roland Kaufmann <roland.kaufmann@uni.no>
Date: Mon, 4 Mar 2013 21:51:59 +0100
Subject: [PATCH] Consolidate package location variables

Always use the same form of package location variable, to maintain
consistency.
---
 configure | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/configure b/configure
index f6d807d6..23d42fab 100755
--- a/configure
+++ b/configure
@@ -151,20 +151,17 @@ while getopts -- ":-:" optchar; do
               pch_use=" -DPRECOMPILE_HEADERS:BOOL=ON"
               rootvar=""
               ;;
-            agmg  |\
-            ert   |\
-            boost |\
-            zlib)
-              rootvar="${pkgname^^}_ROOT"
-              ;;
-            superlu)
-              rootvar="${pkgname^^}_PREFIX"
-              ;;
+            agmg        |\
+            ert         |\
+            boost       |\
+            superlu     |\
             SuiteSparse |\
             TinyXML     |\
             opm-*       |\
-            dune-*)
-              rootvar="${pkgname}_ROOT"
+            dune-*      |\
+            zlib)
+              rootvar="${pkgname^^}_ROOT"
+              rootvar="${rootvar/-/_}"
               ;;
             *)
               invalid_opt --with-${pkgname}