[Sumover-dev] [svn commit] r4086 - vic/branches/mpeg4

[sumover-dev at cs.ucl.ac.uk]

Author: douglask
Date: Wed Aug  8 11:29:07 2007
New Revision: 4086

Modified:
   vic/branches/mpeg4/configure
   vic/branches/mpeg4/configure.in.tk

Log:
Let configure script try to find 64bit Tcl/Tk libraries in /usr/lib64


Modified: vic/branches/mpeg4/configure
==============================================================================
--- vic/branches/mpeg4/configure	(original)
+++ vic/branches/mpeg4/configure	Wed Aug  8 11:29:07 2007
@@ -4628,7 +4628,13 @@
 		echo "can't find tcl.h in $d/include"
 		exit 1
 	fi
-	places="$d/lib/libtcl8.4.so \
+	places="$d/lib64/libtcl8.4.so \
+		$d/lib64/libtcl8.4.dylib \
+		$d/lib64/libtcl8.4.a \
+		$d/lib64/libtcl.so \
+		$d/lib64/libtcl.dylib \
+		$d/lib64/libtcl.a \
+		$d/lib/libtcl8.4.so \
 		$d/lib/libtcl8.4.dylib \
 		$d/lib/libtcl8.4.a \
 		$d/lib/libtcl.so \
@@ -4645,7 +4651,10 @@
 		echo "can't find libtcl.a in $d/lib"
 		exit 1
 	fi
-	places="$d/lib/tcl-8.4 \
+	places="$d/lib64/tcl-8.4 \
+		$d/lib64/tcl8.4 \
+		$d/lib64/tcl \
+		$d/lib/tcl-8.4 \
 		$d/lib/tcl8.4 \
 		$d/lib/tcl"
 	V_LIBRARY_TCL=FAIL
@@ -4903,7 +4912,11 @@
 		echo "can't find tk.h in $d/include"
 		exit 1
 	fi
-	places="$d/lib/libtk8.4.so \
+	places="$d/lib64/libtk8.4.so \
+		$d/lib64/libtk8.4.a \
+		$d/lib64/libtk.so \
+		$d/lib64/libtk.a \
+		$d/lib/libtk8.4.so \
 		$d/lib/libtk8.4.a \
 		$d/lib/libtk.so \
 		$d/lib/libtk.a"
@@ -4918,7 +4931,9 @@
 		echo "can't find libtk.a in $d/lib"
 		exit 1
 	fi
-	places="$d/lib/tk8.4 \
+	places="$d/lib64/tk8.4 \
+		$d/lib64/tk \
+		$d/lib/tk8.4 \
 		$d/lib/tk"
 	V_LIBRARY_TK=FAIL
 	for dir in $places; do

Modified: vic/branches/mpeg4/configure.in.tk
==============================================================================
--- vic/branches/mpeg4/configure.in.tk	(original)
+++ vic/branches/mpeg4/configure.in.tk	Wed Aug  8 11:29:07 2007
@@ -45,7 +45,13 @@
 		echo "can't find tcl.h in $d/include"
 		exit 1
 	fi
-	places="$d/lib/libtcl8.4.so \
+	places="$d/lib64/libtcl8.4.so \
+		$d/lib64/libtcl8.4.dylib \
+		$d/lib64/libtcl8.4.a \
+		$d/lib64/libtcl.so \
+		$d/lib64/libtcl.dylib \
+		$d/lib64/libtcl.a \
+		$d/lib/libtcl8.4.so \
 		$d/lib/libtcl8.4.dylib \
 		$d/lib/libtcl8.4.a \
 		$d/lib/libtcl.so \
@@ -62,7 +68,10 @@
 		echo "can't find libtcl.a in $d/lib"
 		exit 1
 	fi
-	places="$d/lib/tcl-8.4 \
+	places="$d/lib64/tcl-8.4 \
+		$d/lib64/tcl8.4 \
+		$d/lib64/tcl \
+		$d/lib/tcl-8.4 \
 		$d/lib/tcl8.4 \
 		$d/lib/tcl"
 	V_LIBRARY_TCL=FAIL
@@ -214,7 +223,11 @@
 		echo "can't find tk.h in $d/include"
 		exit 1
 	fi
-	places="$d/lib/libtk8.4.so \
+	places="$d/lib64/libtk8.4.so \
+		$d/lib64/libtk8.4.a \
+		$d/lib64/libtk.so \
+		$d/lib64/libtk.a \
+		$d/lib/libtk8.4.so \
 		$d/lib/libtk8.4.a \
 		$d/lib/libtk.so \
 		$d/lib/libtk.a"
@@ -229,7 +242,9 @@
 		echo "can't find libtk.a in $d/lib"
 		exit 1
 	fi
-	places="$d/lib/tk8.4 \
+	places="$d/lib64/tk8.4 \
+		$d/lib64/tk \
+		$d/lib/tk8.4 \
 		$d/lib/tk"
 	V_LIBRARY_TK=FAIL
 	for dir in $places; do