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

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

Author: piers
Date: Thu May  3 11:56:11 2007
New Revision: 4006

Modified:
   vic/branches/mpeg4/configure

Log:
Updated configure - with CPUDETECT OBJs working properly


Modified: vic/branches/mpeg4/configure
==============================================================================
--- vic/branches/mpeg4/configure	(original)
+++ vic/branches/mpeg4/configure	Thu May  3 11:56:11 2007
@@ -694,6 +694,7 @@
 V_OBJ
 V_LIB
 V_CODEC_LIB
+V_CPUDETECT_OBJ
 V_STATIC
 V_TAR_TARGET
 V_ALL
@@ -4579,6 +4580,7 @@
 
 
 if test "$aquatcl" == yes; then
+	echo "On MACOSX - Using Aqua TCL/Tk"
         V_LIB_TCL="-framework Tcl"
         V_LIBRARY_TCL=/Library/Frameworks/Tcl.framework/Versions/8.4/Resources/Scripts
         V_INCLUDE_TCL="-I/Library/Frameworks/Tcl.framework/Headers -I/Library/Frameworks/Tcl.framework/PrivateHeaders"
@@ -6090,6 +6092,8 @@
     V_CPUDETECT="-DRUNTIME_CPUDETECT"
     V_CPUDETECT_OBJ="cpu/cpudetect.o cpu/cpuid.o"
  fi
+ else
+   echo "No runtime cputect without --enable-gpl"
 fi
 
 V_H261AS=""
@@ -6989,6 +6993,7 @@
 
 
 
+
 V_DEFINE="$V_DEFINE $V_SHM $V_H261AS $V_DV $V_XV $V_CPUDETECT -D$V_ARCH"
 
 
@@ -7910,6 +7915,7 @@
 V_OBJ!$V_OBJ$ac_delim
 V_LIB!$V_LIB$ac_delim
 V_CODEC_LIB!$V_CODEC_LIB$ac_delim
+V_CPUDETECT_OBJ!$V_CPUDETECT_OBJ$ac_delim
 V_STATIC!$V_STATIC$ac_delim
 V_TAR_TARGET!$V_TAR_TARGET$ac_delim
 V_ALL!$V_ALL$ac_delim
@@ -7927,7 +7933,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5