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

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

Author: douglask
Date: Mon Apr 13 13:56:44 2009
New Revision: 4423

Modified:
   rat/trunk/configure

Log:
regenerated configure


Modified: rat/trunk/configure
==============================================================================
--- rat/trunk/configure	(original)
+++ rat/trunk/configure	Mon Apr 13 13:56:44 2009
@@ -6764,7 +6764,10 @@
 			`ls -d /usr/contrib/lib 2>/dev/null` \
 			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
+			`ls -d /usr/lib64/tcl[8-9].[0-9]* 2>/dev/null` \
 			`ls -d /usr/lib/tcl[8-9].[0-9]* 2>/dev/null` \
+			`ls -d /usr/local/lib64/tcl[8-9].[0-9]* 2>/dev/null` \
+			`ls -d /usr/local/lib/tcl[8-9].[0-9]* 2>/dev/null` \
 			; do
 		    if test -f "$i/tclConfig.sh" ; then
 			ac_cv_c_tclconfig=`(cd $i; pwd)`
@@ -6984,7 +6987,10 @@
 			`ls -d /usr/contrib/lib 2>/dev/null` \
 			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
+			`ls -d /usr/lib64/tk[8-9].[0-9]* 2>/dev/null` \
 			`ls -d /usr/lib/tk[8-9].[0-9]* 2>/dev/null` \
+			`ls -d /usr/local/lib64/tk[8-9].[0-9]* 2>/dev/null` \
+			`ls -d /usr/local/lib/tk[8-9].[0-9]* 2>/dev/null` \
 			; do
 		    if test -f "$i/tkConfig.sh" ; then
 			ac_cv_c_tkconfig=`(cd $i; pwd)`
@@ -7204,10 +7210,31 @@
 fi
 
 
+# dirs in order of preference of where to find UCL common header files
+dirs="$COMMON_INC $COMMON_INC/include \
+	${prefix}/include/uclmmbase \
+	${prefix}/include/common-mml \
+	/usr/include/uclmmbase \
+	/usr/include/common-mml \
+	/usr/local/include/uclmmbase \
+	/usr/local/include/common-mml"
+
+FOUND_DIR=no
+for d in $dirs ; do
+	if test -d "$d" ; then
+		hdirs="$hdirs $d"
+		FOUND_DIR=yes
+	fi
+done
+
+if test x$FOUND_DIR = xno
+then
+	hdirs=$COMMON_INC/include
+fi
+
 FOUND_COMMON_H=no
-for h in ${COMMON_INC} ${COMMON_INC}/include ${COMMON_INC}/include/common-mml ${COMMON_INC}/include/uclmmbase /usr/include/uclmmbase
-do
-as_ac_Header=`echo "ac_cv_header_$h/mbus.h" | $as_tr_sh`
+for h in $hdirs ; do
+	as_ac_Header=`echo "ac_cv_header_$h/mbus.h" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   { echo "$as_me:$LINENO: checking for $h/mbus.h" >&5
 echo $ECHO_N "checking for $h/mbus.h... $ECHO_C" >&6; }
@@ -7355,14 +7382,31 @@
 	exit
 fi
 
-# Check if installed it on it's own...
-if test ! -d ${COMMON_LIB}
-then
-	COMMON_LIB=${COMMON_LIB}/lib
-fi
+{ echo "$as_me:$LINENO: using UCL common library header files found in $COMMON_INC" >&5
+echo "$as_me: using UCL common library header files found in $COMMON_INC" >&6;}
+
+COMMON_INC="-I${COMMON_INC}"
 
-COMMON_DEP="${COMMON_LIB}/libuclmmbase.a"
 
+# Check in a few install locations for libuclmmbase
+for f in `ls -d ${COMMON_LIB}/libuclmmbase.* 2>/dev/null` \
+	`ls -d ${COMMON_LIB}/lib64/libuclmmbase.* 2>/dev/null` \
+	`ls -d ${COMMON_LIB}/lib/libuclmmbase.* 2>/dev/null` \
+	`ls -d ${prefix}/lib64/libuclmmbase.* 2>/dev/null` \
+	`ls -d ${prefix}/lib/libuclmmbase.* 2>/dev/null` \
+	`ls -d /usr/lib64/libuclmmbase.* 2>/dev/null` \
+	`ls -d /usr/lib/libuclmmbase.* 2>/dev/null` \
+	`ls -d /usr/local/lib64/libuclmmbase.* 2>/dev/null` \
+	`ls -d /usr/local/lib/libuclmmbase.* 2>/dev/null`
+do
+	if test -f "$f" ; then
+		COMMON_LIB=`dirname $f`
+		COMMON_LIB=`(cd $COMMON_LIB ; pwd)`
+		break
+	fi
+done
+
+FOUND_COMMON_LIB=no
 { echo "$as_me:$LINENO: checking for mbus_init in -luclmmbase" >&5
 echo $ECHO_N "checking for mbus_init in -luclmmbase... $ECHO_C" >&6; }
 if test "${ac_cv_lib_uclmmbase_mbus_init+set}" = set; then
@@ -7425,34 +7469,33 @@
 { echo "$as_me:$LINENO: result: $ac_cv_lib_uclmmbase_mbus_init" >&5
 echo "${ECHO_T}$ac_cv_lib_uclmmbase_mbus_init" >&6; }
 if test $ac_cv_lib_uclmmbase_mbus_init = yes; then
-  COMMON_LIB=${COMMON_LIB}
-else
+  FOUND_COMMON_LIB=yes
+fi
 
-		    echo "Could not find libuclmmbase.a.  RAT may not build because:"
-		    echo "   (a) Library is not installed."
-		    echo "   (b) Library is not built or not in expected location (--with-common=DIR)."
-		    echo "   (c) this script failed to see it (please inform rat-trap at cs.ucl.ac.uk)."
-		    echo "$COMMON_INC $DEFAULT_COMMON_INC"
-		    if test ${COMMON_INC} = ${DEFAULT_COMMON_INC}
-		    then
-			COMMON_LIB="${DEFAULT_COMMON_LIB}"
-		    else
-			exit
-		    fi
 
+if test x$FOUND_COMMON_LIB = xno
+then
+	echo "Could not find libuclmmbase.  RAT may not build because:"
+	echo "   (a) Library is not installed."
+	echo "   (b) Library is not built or not in expected location (--with-common=DIR)."
+	echo "   (c) this script failed to see it (please inform rat-trap at cs.ucl.ac.uk)."
+	exit
 fi
 
+{ echo "$as_me:$LINENO: using libuclmmbase found in $COMMON_LIB" >&5
+echo "$as_me: using libuclmmbase found in $COMMON_LIB" >&6;}
 
 # Convert paths into compiler arguments
 
-if test "${COMMON_INC}" = "/usr/include/uclmmbase"
+if test "${COMMON_LIB}" = "/usr/lib64"
+then
+	COMMON_LIB="-luclmmbase"
+elif test "${COMMON_LIB}" = "/usr/lib"
 then
 	COMMON_LIB="-luclmmbase"
 else
 	COMMON_LIB="-L${COMMON_LIB} -luclmmbase"
-	EXTERNAL_DEP="${EXTERNAL_DEP} ${COMMON_DEP}"
 fi
-COMMON_INC="-I${COMMON_INC}"