[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libcvd-members] libcvd Makefile.in configure configure.in
|
From: |
Edward Rosten |
|
Subject: |
[libcvd-members] libcvd Makefile.in configure configure.in |
|
Date: |
Thu, 23 Aug 2007 00:19:05 +0000 |
CVSROOT: /cvsroot/libcvd
Module name: libcvd
Changes by: Edward Rosten <edrosten> 07/08/23 00:19:05
Modified files:
. : Makefile.in configure configure.in
Log message:
SSE fast-9 and SSE fast-10 seem to be working, so they are compiled by
default
if possible.
Disable them with --disable-ssefast9 and --disable-ssefast10 if need be.
SSE Fast-12 is still broken. It can be enabled with --enable-ssefast12
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/Makefile.in?cvsroot=libcvd&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure?cvsroot=libcvd&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure.in?cvsroot=libcvd&r1=1.99&r2=1.100
Patches:
Index: Makefile.in
===================================================================
RCS file: /cvsroot/libcvd/libcvd/Makefile.in,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- Makefile.in 22 Aug 2007 23:43:13 -0000 1.59
+++ Makefile.in 23 Aug 2007 00:19:04 -0000 1.60
@@ -252,20 +252,20 @@
endif
-ifeq (@have_faster@@have_sse2@@have_FAST_9@,yesyesyes)
+ifeq (@have_faster9@@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_faster@@have_sse2@@have_FAST_10@,yesyesyes)
+ifeq (@have_faster10@@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_faster@@have_sse2@@have_FAST_12@,yesyesyes)
+ifeq (@have_faster12@@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.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- configure 22 Aug 2007 23:43:13 -0000 1.98
+++ configure 23 Aug 2007 00:19:04 -0000 1.99
@@ -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_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_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_faster9 have_faster10 have_faster12
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,7 +859,9 @@
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-ssefast Enable currently broken SSE FAST detectors
+ --enable-ssefast12 Enable currently broken SSE FAST-12 detector
+ --disable-ssefast9 Disable the probably OK SSE FAST-9 detector
+ --disable-ssefast10 Disable the probably OK SSE FAST-10 detector
--enable-missingfast=7,8,... compile without certain FAST detectors.
Optional Packages:
@@ -9218,13 +9220,35 @@
echo Checking for extra build options
echo --------------------------------
-# Check whether --enable-ssefast or --disable-ssefast was given.
-if test "${enable_ssefast+set}" = set; then
- enableval="$enable_ssefast"
+# Check whether --enable-ssefast12 or --disable-ssefast12 was given.
+if test "${enable_ssefast12+set}" = set; then
+ enableval="$enable_ssefast12"
fi;
+# Check whether --enable-ssefast9 or --disable-ssefast9 was given.
+if test "${enable_ssefast9+set}" = set; then
+ enableval="$enable_ssefast9"
-if test "$enable_ssefast" = yes
+fi;
+# Check whether --enable-ssefast10 or --disable-ssefast10 was given.
+if test "${enable_ssefast10+set}" = set; then
+ enableval="$enable_ssefast10"
+
+fi;
+
+if test "$enable_ssefast9" != "no"
+then
+ have_faster9=yes
+
+fi
+
+if test "$enable_ssefast10" != "no"
+then
+ have_faster10=yes
+
+fi
+
+if test "$enable_ssefast12" = yes
then
if test "$sse2" = no
then
@@ -9238,7 +9262,7 @@
echo -------------------------------------------------------------------
echo
- have_faster=yes
+ have_faster12=yes
hidden_options="$hidden_options faster_test";
@@ -10086,7 +10110,9 @@
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_faster9@,$have_faster9,;t t
+s,@have_faster10@,$have_faster10,;t t
+s,@have_faster12@,$have_faster12,;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.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- configure.in 22 Aug 2007 23:43:13 -0000 1.99
+++ configure.in 23 Aug 2007 00:19:05 -0000 1.100
@@ -1122,9 +1122,21 @@
echo Checking for extra build options
echo --------------------------------
-AC_ARG_ENABLE(ssefast, [ --enable-ssefast Enable currently broken SSE
FAST detectors])
+AC_ARG_ENABLE(ssefast12, [ --enable-ssefast12 Enable currently broken
SSE FAST-12 detector])
+AC_ARG_ENABLE(ssefast9, [ --disable-ssefast9 Disable the probably OK
SSE FAST-9 detector])
+AC_ARG_ENABLE(ssefast10, [ --disable-ssefast10 Disable the probably OK
SSE FAST-10 detector])
-if test "$enable_ssefast" = yes
+if test "$enable_ssefast9" != "no"
+then
+ AC_SUBST(have_faster9, yes)
+fi
+
+if test "$enable_ssefast10" != "no"
+then
+ AC_SUBST(have_faster10, yes)
+fi
+
+if test "$enable_ssefast12" = yes
then
if test "$sse2" = no
then
@@ -1137,7 +1149,7 @@
echo -------------------------------------------------------------------
echo
- AC_SUBST(have_faster,yes)
+ AC_SUBST(have_faster12,yes)
hidden_options="$hidden_options faster_test";
fi