[libcvd-members] libcvd Makefile.in configure configure.in

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Edward Rosten <edrosten>        07/08/22 22:29:30

Modified files:
        .              : Makefile.in configure configure.in 

Log message:
        Disable SSE FAST by default.
        
        --enable-sse-fast will enable it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/Makefile.in?cvsroot=libcvd&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure?cvsroot=libcvd&r1=1.95&r2=1.96
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure.in?cvsroot=libcvd&r1=1.96&r2=1.97

Patches:
Index: Makefile.in
===================================================================
RCS file: /cvsroot/libcvd/libcvd/Makefile.in,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- Makefile.in 20 Aug 2007 14:49:22 -0000      1.57
+++ Makefile.in 22 Aug 2007 22:29:30 -0000      1.58
@@ -252,20 +252,20 @@
 endif
 
 
-ifeq (@have_sse2@@have_FAST_9@,yesyes)
+ifeq (@have_faster@@have_sse2@@have_FAST_9@,yesyesyes)
        CVD_OBJS+=cvd_src/faster_corner_9.o
 else
        CVD_OBJS+=cvd_src/slower_corner_9.o
 endif
        
 
-ifeq (@have_sse2@@have_FAST_10@,yesyes)
+ifeq (@have_faster@@have_sse2@@have_FAST_10@,yesyesyes)
        CVD_OBJS+=cvd_src/faster_corner_10.o
 else
        CVD_OBJS+=cvd_src/slower_corner_10.o
 endif
 
-ifeq (@have_sse2@@have_FAST_12@,yesyes)
+ifeq (@have_faster@@have_sse2@@have_FAST_12@,yesyesyes)
        CVD_OBJS+=cvd_src/faster_corner_12.o
 else
        CVD_OBJS+=cvd_src/slower_corner_12.o

Index: configure
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- configure   15 Aug 2007 03:59:35 -0000      1.95
+++ configure   22 Aug 2007 22:29:30 -0000      1.96
@@ -310,7 +310,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME 
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix 
program_transform_name bindir sbindir libexecdir datadir sysconfdir 
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir 
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK CC 
CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CXXCPP 
EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os 
have_mmx have_mmxext have_sse have_sse2 have_64bit OFLAGS INSTALL_PROGRAM 
INSTALL_SCRIPT INSTALL_DATA LN_S RANLIB ac_ct_RANLIB osx_hacks have_toon 
have_lapack have_acml major minor have_dvbuffer have_v4l1buffer have_v4l2buffer 
have_o2buffer have_qtbuffer have_pthread have_videodisplay have_jpeg have_tiff 
have_png have_ffmpeg have_memalign have_FAST_7 have_fast_7 have_FAST_8 
have_FAST_9 have_FAST_10 have_FAST_11 have_FAST_12 docs cpu progs testprogs 
LIBOBJS LTLIBOBJS debug_options debug_all_options'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME 
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix 
program_transform_name bindir sbindir libexecdir datadir sysconfdir 
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir 
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK CC 
CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CXXCPP 
EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os 
have_mmx have_mmxext have_sse have_sse2 have_64bit OFLAGS INSTALL_PROGRAM 
INSTALL_SCRIPT INSTALL_DATA LN_S RANLIB ac_ct_RANLIB osx_hacks have_toon 
have_lapack have_acml major minor have_dvbuffer have_v4l1buffer have_v4l2buffer 
have_o2buffer have_qtbuffer have_pthread have_videodisplay have_jpeg have_tiff 
have_png have_ffmpeg have_memalign have_faster have_FAST_7 have_fast_7 
have_FAST_8 have_FAST_9 have_FAST_10 have_FAST_11 have_FAST_12 docs cpu progs 
testprogs LIBOBJS LTLIBOBJS debug_options debug_all_options'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -859,6 +859,7 @@
 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-sse-fast             Enable currently broken SSE FAST detectors
   --enable-missingfast=7,8,...  compile without certain FAST detectors.
 
 Optional Packages:
@@ -9219,6 +9220,18 @@
 
 echo "$as_me:$LINENO: checking \"FAST detectors\"" >&5
 echo $ECHO_N "checking \"FAST detectors\"... $ECHO_C" >&6
+# Check whether --enable-ssefast     or --disable-ssefast     was given.
+if test "${enable_ssefast    +set}" = set; then
+  enableval="$enable_ssefast    "
+
+fi;
+
+
+if test "$ssefast" = yes
+then
+       have_faster=yes
+
+fi
 
 allfasts="7 8 9 10 11 12"
 # Check whether --enable-missingfast or --disable-missingfast was given.
@@ -10059,6 +10072,7 @@
 s,@have_png@,$have_png,;t t
 s,@have_ffmpeg@,$have_ffmpeg,;t t
 s,@have_memalign@,$have_memalign,;t t
+s,@have_faster@,$have_faster,;t t
 s,@have_FAST_7@,$have_FAST_7,;t t
 s,@have_fast_7@,$have_fast_7,;t t
 s,@have_FAST_8@,$have_FAST_8,;t t

Index: configure.in
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure.in,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- configure.in        15 Aug 2007 03:59:36 -0000      1.96
+++ configure.in        22 Aug 2007 22:29:30 -0000      1.97
@@ -1123,6 +1123,13 @@
 echo --------------------------------
 
 AC_MSG_CHECKING("FAST detectors")
+AC_ARG_ENABLE(ssefast    , [  --enable-sse-fast             Enable currently 
broken SSE FAST detectors  ])
+
+
+if test "$ssefast" = yes
+then
+       AC_SUBST(have_faster,yes)
+fi
 
 allfasts="7 8 9 10 11 12"
 AC_ARG_ENABLE(missingfast, [  --enable-missingfast=7,8,...  compile without 
certain FAST detectors.     ])