[Sumover-dev] [svn commit] r4088 - rat/trunk

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

Author: douglask
Date: Sun Aug 12 09:28:28 2007
New Revision: 4088

Modified:
   rat/trunk/configure
   rat/trunk/configure.in

Log:
corrected 'configure --help' output.
added $TCL_LIB/lib64 and $TK_LIB/lib64 to the location guesses for the Tcl/Tk libraries.


Modified: rat/trunk/configure
==============================================================================
--- rat/trunk/configure	(original)
+++ rat/trunk/configure	Sun Aug 12 09:28:28 2007
@@ -1300,11 +1300,11 @@
   --with-x                use the X Window System
   --with-tcltk-version=M.m specify preferred Tcl/Tk version
   --with-tcl=DIR          specify location of Tcl installation
-  --with-tcl=DIR          specify location of Tcl library installation
-  --with-tcl=DIR          specify location of Tcl include installation
+  --with-tcllib=DIR       specify location of Tcl library installation
+  --with-tclinc=DIR       specify location of Tcl include installation
   --with-tk=DIR           specify location of Tk installation
-  --with-tklib=DIR          specify location of Tk library installation
-  --with-tkinc=DIR          specify location of Tk include installation
+  --with-tklib=DIR        specify location of Tk library installation
+  --with-tkinc=DIR        specify location of Tk include installation
   --with-common=DIR       specify location of UCL's common library
 
 Some influential environment variables:
@@ -8244,7 +8244,7 @@
 # Guess most probable tcl lib location
 #-----------------------------------------------------------------------------
 
-for i in $TCL_LIB/unix $TCL_LIB/lib $TCL_LIB
+for i in $TCL_LIB/unix $TCL_LIB/lib64 $TCL_LIB/lib $TCL_LIB
 do
 	if test -d $i ; then
 		TCL_LIB=$i
@@ -8408,7 +8408,7 @@
 fi
 
 # Guess most probable tk lib location
-for i in $TK_LIB/unix $TK_LIB/lib $TK_LIB
+for i in $TK_LIB/unix $TK_LIB/lib64 $TK_LIB/lib $TK_LIB
 do
 	if test -d $i ; then
 		TK_LIB=$i

Modified: rat/trunk/configure.in
==============================================================================
--- rat/trunk/configure.in	(original)
+++ rat/trunk/configure.in	Sun Aug 12 09:28:28 2007
@@ -332,10 +332,10 @@
 	[TCL_INC=$withval
 	 TCL_LIB=$withval])
 AC_ARG_WITH(tcllib,           
-	[  --with-tcl=DIR          specify location of Tcl library installation],
+	[  --with-tcllib=DIR       specify location of Tcl library installation],
 	[TCL_LIB=$withval])
 AC_ARG_WITH(tclinc,           
-	[  --with-tcl=DIR          specify location of Tcl include installation],
+	[  --with-tclinc=DIR       specify location of Tcl include installation],
 	[TCL_INC=$withval])
 
 #-----------------------------------------------------------------------------
@@ -366,7 +366,7 @@
 # Guess most probable tcl lib location
 #-----------------------------------------------------------------------------
 
-for i in $TCL_LIB/unix $TCL_LIB/lib $TCL_LIB 
+for i in $TCL_LIB/unix $TCL_LIB/lib64 $TCL_LIB/lib $TCL_LIB 
 do
 	if test -d $i ; then
 		TCL_LIB=$i
@@ -407,10 +407,10 @@
 	[TK_INC=$withval
 	 TK_LIB=$withval])
 AC_ARG_WITH(tklib,           
-	[  --with-tklib=DIR          specify location of Tk library installation],
+	[  --with-tklib=DIR        specify location of Tk library installation],
 	[TK_LIB=$withval])
 AC_ARG_WITH(tkinc,           
-	[  --with-tkinc=DIR          specify location of Tk include installation],
+	[  --with-tkinc=DIR        specify location of Tk include installation],
 	[TK_INC=$withval])
 #-----------------------------------------------------------------------------
 # Depending on config expect tk.h to be tk source dir or include path
@@ -439,7 +439,7 @@
 fi
 
 # Guess most probable tk lib location
-for i in $TK_LIB/unix $TK_LIB/lib $TK_LIB
+for i in $TK_LIB/unix $TK_LIB/lib64 $TK_LIB/lib $TK_LIB
 do
 	if test -d $i ; then
 		TK_LIB=$i