From ee416e81058b382a287f952cc9cef45557934b8d Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 14 Jan 2009 11:57:05 +0000
Subject: [PATCH] promoting MESA paths to top level

---
 bin/buildParaView3.5-cvs         | 2 ++
 bin/tools/buildParaViewFunctions | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/buildParaView3.5-cvs b/bin/buildParaView3.5-cvs
index fa024f7799..f12a158973 100755
--- a/bin/buildParaView3.5-cvs
+++ b/bin/buildParaView3.5-cvs
@@ -53,6 +53,8 @@ PYTHON_LIBRARY=""
 
 # MESA graphics support:
 WITH_MESA=OFF
+MESA_INCLUDE_DIR="/usr/include/GL"
+MESA_LIBRARY="/usr/lib64/libOSMesa.so"
 
 #
 # No further editing below this line
diff --git a/bin/tools/buildParaViewFunctions b/bin/tools/buildParaViewFunctions
index b126a98614..f1da2c0e3e 100644
--- a/bin/tools/buildParaViewFunctions
+++ b/bin/tools/buildParaViewFunctions
@@ -154,9 +154,6 @@ addMesaSupport()
 {
     [ "$WITH_MESA" = ON ] || return
 
-    MESA_INCLUDE_DIR=/usr/include/GL
-    MESA_LIBRARY=/usr/lib$WM_COMPILER_LIB_ARCH/libOSMesa.so
-
     if [ -d "$MESA_INCLUDE_DIR" -a -f "$MESA_LIBRARY" ]
     then
         OBJ_ADD="$OBJ_ADD-mesa"
@@ -167,6 +164,10 @@ addMesaSupport()
 
     else
        echo "*** Error: no MESA information found"
+       echo "***        Deactivate MESA support by setting WITH_MESA=OFF, or"
+       echo "***        correct paths given by:"
+       echo "***        - MESA_INCLUDE_DIR ($MESA_INCLUDE_DIR)"
+       echo "***        - MESA_LIBRARY ($MESA_LIBRARY)"
        exit 1
     fi
 }