[cig-commits] r15003 - long/3D/SNAC/trunk/VMake/Config

[echoi at geodynamics.org]

Author: echoi
Date: 2009-05-17 11:31:16 -0700 (Sun, 17 May 2009)
New Revision: 15003

Modified:
   long/3D/SNAC/trunk/VMake/Config/tau-config.sh
Log:
The configure file for TAU modified for the compatibility with the latest version (2.18.2).



Modified: long/3D/SNAC/trunk/VMake/Config/tau-config.sh
===================================================================
--- long/3D/SNAC/trunk/VMake/Config/tau-config.sh	2009-05-17 18:19:05 UTC (rev 15002)
+++ long/3D/SNAC/trunk/VMake/Config/tau-config.sh	2009-05-17 18:31:16 UTC (rev 15003)
@@ -22,50 +22,32 @@
 setValueWithDefault TAU_DIR '/usr/local/tau'
 assertValidDirectory ${TAU_DIR} TAU TAU_DIR
 
-if test "${TAU_CONFIG_ARCH}${TAU_OPTIONS}x" = "x"; then
-	# Attempt to be smart and pickup the arch and options
-	NUM_ARCH=`find ${TAU_DIR} -maxdepth 1 -mindepth 1 -type d | grep -v man | grep -v include | wc -l | sed 's/^[ ]*//'`
-	case ${NUM_ARCH} in
-		0)
-			echo "Error - No TAU_CONFIG_ARCH found in ${TAU_DIR}. Check that TAU has been installed properly."
-			exit 1
-			;;
-		1)
-			setValueWithDefault TAU_CONFIG_ARCH \
-				`find ${TAU_DIR} -maxdepth 1 -mindepth 1 -type d | grep -v man | grep -v include | xargs basename`
-			NUM_OPTIONS=`find ${TAU_DIR}/${TAU_CONFIG_ARCH} -type f -name "Makefile.tau*" | wc -l`
-			if test "${NUM_OPTIONS}" -eq "1"; then
-				setValueWithDefault TAU_OPTIONS \
-				`find ${TAU_DIR}/${TAU_CONFIG_ARCH} -type f -name "Makefile.tau*"  | xargs basename | sed 's/Makefile.tau//'`
-			else
-				echo "Error - TAU_OPTIONS could not be found. Check that TAU has been installed properly and set TAU_OPTIONS"
-			fi
-			;;
-		*)
-			echo "Error - More than one architecture found in ${TAU_DIR}. Please select and set TAU_CONFIG_ARCH and TAU_OPTIONS."
-			exit 1
-			;;
-	esac
+if test "${TAU_CONFIG_ARCH}${TAU_MAKETYPE}x" = "x"; then
+		setValueWithDefault TAU_CONFIG_ARCH \
+			`tau-config | grep TAUARCH | awk -F'=' '{print $2}'`
+		NUM_OPTIONS=`find ${TAU_DIR}/${TAU_CONFIG_ARCH} -type f -name "Makefile.tau*" | wc -l`
+		if test "${NUM_OPTIONS}" -eq "1"; then
+			setValueWithDefault TAU_MAKETYPE \
+			`find ${TAU_DIR}/${TAU_CONFIG_ARCH} -type f -name "Makefile.tau*"  | xargs basename | sed 's/Makefile.tau//'`
+		else
+			echo "Error - TAU_MAKETYPE could not be found. Check that TAU has been installed properly and set TAU_MAKETYPE"
+		fi
 fi
 
-assertValidExecutable "$TAU_DIR/$TAU_CONFIG_ARCH/bin/tau_instrumentor" "tau_instrumentor"
-
-setValueWithDefault TAUINSTR "${TAU_DIR}/${TAU_CONFIG_ARCH}/bin/tau_instrumentor"
-
 setValueWithDefault TAU_INCDIR '${TAU_DIR}/include'
 warnIfNotValidFile "${TAU_INCDIR}/TAU.h"    "TAU Libraries" TAU_INCDIR TAU_DIR
 
-getVariableFromMakefile TAU_INCLUDE $TAU_DIR/$TAU_CONFIG_ARCH/lib/Makefile.tau${TAU_OPTIONS}
-getVariableFromMakefile TAU_DEFS $TAU_DIR/$TAU_CONFIG_ARCH/lib/Makefile.tau${TAU_OPTIONS}
-getVariableFromMakefile TAU_MPI_INCLUDE $TAU_DIR/$TAU_CONFIG_ARCH/lib/Makefile.tau${TAU_OPTIONS}
+getVariableFromMakefile TAU_INCLUDE $TAU_DIR/$TAU_CONFIG_ARCH/lib/Makefile.tau${TAU_MAKETYPE}
+getVariableFromMakefile TAU_DEFS $TAU_DIR/$TAU_CONFIG_ARCH/lib/Makefile.tau${TAU_MAKETYPE}
+getVariableFromMakefile TAU_MPI_INCLUDE $TAU_DIR/$TAU_CONFIG_ARCH/lib/Makefile.tau${TAU_MAKETYPE}
 TAU_CFLAGS="${TAU_INCLUDE} ${TAU_DEFS} ${TAU_MPI_INCLUDE}"
 
 setValueWithDefault TAU_INCLUDES "${TAU_CFLAGS}"
 
 setValueWithDefault TAU_LIBDIR '${TAU_DIR}/${TAU_CONFIG_ARCH}/lib'
 
-getVariableFromMakefile TAU_MPI_LIBS $TAU_DIR/$TAU_CONFIG_ARCH/lib/Makefile.tau${TAU_OPTIONS}
-getVariableFromMakefile TAU_SHLIBS $TAU_DIR/$TAU_CONFIG_ARCH/lib/Makefile.tau${TAU_OPTIONS}
+getVariableFromMakefile TAU_MPI_LIBS $TAU_DIR/$TAU_CONFIG_ARCH/lib/Makefile.tau${TAU_MAKETYPE}
+getVariableFromMakefile TAU_SHLIBS $TAU_DIR/$TAU_CONFIG_ARCH/lib/Makefile.tau${TAU_MAKETYPE}
 TAU_LFLAGS="${TAU_MPI_LIBS} ${TAU_SHLIBS}"
 
 setValueWithDefault TAU_LIBS "${TAU_LFLAGS}"