[Sumover-dev] [svn commit] r4718 - vic/branches/cc

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

Author: soohyunc
Date: Tue Mar 23 21:19:57 2010
New Revision: 4718

Modified:
   vic/branches/cc/configure.in.tail

Log:
Updated configure.in.tail (copied from mpeg4 branch)



Modified: vic/branches/cc/configure.in.tail
==============================================================================
--- vic/branches/cc/configure.in.tail	(original)
+++ vic/branches/cc/configure.in.tail	Tue Mar 23 21:19:57 2010
@@ -1,53 +1,36 @@
 dnl standard final commands for vic/vat/etc. autoconf scripts
 dnl $Header$ (LBL)
 
-# tcl7.5 needs a dynamic loading library (unless built with the
-# -disable-load flag).  Try to find the appropriate one.
-
-if test ! -z "$V_NEED_DL" ; then
-	V_LIB_DL=""
-	case "$target" in 
-	*-*-solaris*)
-		V_LIB_DL="dl"
-		;;
-	sparc-sun-sunos*)
-		V_LIB_DL="dl"
-		;;
-	*-*-hpux*)
-		V_LIB_DL="dld"
-		;;
-	*-*-linux*)
-		AC_CHECK_LIB(dl, dlopen, V_LIB_DL="dl", V_LIB_DL="dld")
-		;;
-	*-*-aix4*)
-		V_LIB_DL="ld"
-		;;
-	esac
-	if test ! -z "$V_LIB_DL" ; then
-		AC_CHECK_LIB($V_LIB_DL, main, , V_LIB_DL="", $V_STATIC)
-	fi
-	if test ! -z "$V_LIB_DL" ; then
-		V_LIB="$V_LIB -l$V_LIB_DL"
-	else
-		echo "no dynamic load lib"
-	fi
-fi
-
-AC_SUBST(V_STATIC)
+# various include hacks
+dirs="../common/src \
+	/usr/include/uclmmbase \
+	/usr/include/common-mml \
+	/usr/local/include/uclmmbase \
+	/usr/local/include/common-mml"
 
-if test "$host_cpu" = alpha ; then 
-	V_DEFINE="$V_DEFINE -DINT_64=u_long"
+if test x$prefix != xNONE ; then
+	dirs="$prefix/include/common-mml $prefix/include/uclmmbase $dirs"
 fi
 
-# various include hacks
-dirs="/usr/src/local/include-fixes \
-	/import/mcast/include"
 for dir in $dirs; do
 	if test -d $dir ; then
 		V_INCLUDE="$V_INCLUDE -I$dir"
 	fi
 done
 
+# various linker hacks
+if test x$prefix != xNONE ; then
+	if test -d $prefix/lib64 ; then
+		V_LDFLAGS="-L$prefix/lib64 $V_LDFLAGS"
+	else
+		V_LDFLAGS="-L$prefix/lib $V_LDFLAGS"
+	fi
+else
+	if test -d ../common/src ; then
+		V_LDFLAGS="-L../common/src $V_LDFLAGS"
+	fi
+fi
+
 # always use -g with gcc during development (even with -O)
 #if test "$CC" = gcc && test -f .devel ; then
 if test "$CC" = gcc  ; then
@@ -56,18 +39,20 @@
 	V_DEFINE="$V_DEFINE -fsigned-char"
 fi
 
-
 V_TAR_TARGET=$target_os
 AC_SUBST(V_TAR_TARGET)
 
 AC_SUBST(V_ALL)
 AC_SUBST(V_CCOPT)
+AC_SUBST(V_LDFLAGS)
+AC_SUBST(V_CCLDFLAGS32)
 AC_SUBST(V_CCOPT_H261)
 AC_SUBST(V_TAR_EXTRA)
 AC_SUBST(V_LIB)
 AC_SUBST(V_DEFINE)
 AC_SUBST(V_SIGRET)
 AC_SUBST(V_SHELL)
+AC_SUBST(V_STATIC)
 AC_SUBST(V_TARCMD)
 AC_SUBST(V_INCLUDE)
 AC_SUBST(V_OBJ)
@@ -79,4 +64,3 @@
 if test -f .devel ; then
 	make depend
 fi
-