libcvd-members
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[libcvd-members] libcvd configure configure.in cvd/documentation...


From: Edward Rosten
Subject: [libcvd-members] libcvd configure configure.in cvd/documentation...
Date: Wed, 04 Jun 2008 22:27:49 +0000

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Edward Rosten <edrosten>        08/06/04 22:27:49

Modified files:
        .              : configure configure.in 
        cvd            : documentation.h 
        cvd_src        : convolution.cc 
        cvd_src/noarch : utility_float.cc 

Log message:
        Fix for older compilers, fixes for non x86.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure?cvsroot=libcvd&r1=1.121&r2=1.122
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure.in?cvsroot=libcvd&r1=1.122&r2=1.123
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/documentation.h?cvsroot=libcvd&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/convolution.cc?cvsroot=libcvd&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/noarch/utility_float.cc?cvsroot=libcvd&r1=1.1&r2=1.2

Patches:
Index: configure
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- configure   3 Jun 2008 00:24:15 -0000       1.121
+++ configure   4 Jun 2008 22:27:47 -0000       1.122
@@ -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 CC CFLAGS 
LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP AWK CXX CXXFLAGS ac_ct_CXX 
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S RANLIB ac_ct_RANLIB major 
minor build build_cpu build_vendor build_os host host_cpu host_vendor host_os 
have_x86 have_mmx have_mmxext have_sse have_sse2 have_sse3 have_32bit 
have_assembler CXXCPP have_dvbuffer have_v4l2buffer have_v4l1buffer 
have_linux_2_4 have_linux_2_6 have_o2buffer osx_hacks have_qtbuffer 
have_videodisplay have_toon have_lapack have_pthread have_png have_jpeg 
have_tiff have_ffmpeg docs have_glob have_memalign have_fast7 have_fast8 
have_fast9 have_fast10 have_fast11 have_fast12 have_ssefast9 have_ssefast10 
have_ssefast12 dep_objects progs testprogs OFLAGS LIBOBJS LTLIBOBJS'
+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 CC CFLAGS 
LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP AWK CXX CXXFLAGS ac_ct_CXX 
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S RANLIB ac_ct_RANLIB major 
minor build build_cpu build_vendor build_os host host_cpu host_vendor host_os 
have_x86 have_mmx have_mmxext have_sse have_sse2 have_sse3 have_32bit 
have_assembler CXXCPP have_dvbuffer have_v4l2buffer have_v4l1buffer 
have_linux_2_4 have_linux_2_6 have_o2buffer osx_hacks have_qtbuffer 
have_videodisplay have_tr1_shared_ptr have_toon have_lapack have_pthread 
have_png have_jpeg have_tiff have_ffmpeg docs have_glob have_memalign 
have_fast7 have_fast8 have_fast9 have_fast10 have_fast11 have_fast12 
have_ssefast9 have_ssefast10 have_ssefast12 dep_objects progs testprogs OFLAGS 
LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -907,6 +907,7 @@
   --without-png           compile without PNG support
   --without-ffmpeg       compile without FFMPEG support
   --withot-toon          Compile without TooN support
+  --withot-tr1_shared_ptr          Compile without tr1::shared_ptr support
   --without-lapack        Disable BLAS and LAPACK.
   --with-acml[=directory] Use BLAS and LAPACK routines from the ACML library 
[located in the specified directory]
   --with-x                use the X Window System
@@ -3349,7 +3350,7 @@
 #Lists of  optional components
 #
 
-all_options="videodisplay jpeg tiff png ffmpeg toon lapack pthread glob 
memalign"
+all_options="videodisplay jpeg tiff png ffmpeg toon lapack pthread glob 
memalign tr1_shared_ptr"
 dodginess_options=
 options=
 simd_all_options=
@@ -6519,6 +6520,12 @@
 
 fi;
 
+# Check whether --with-tr1_shared_ptr or --without-tr1_shared_ptr was given.
+if test "${with_tr1_shared_ptr+set}" = set; then
+  withval="$with_tr1_shared_ptr"
+
+fi;
+
 # Check whether --with-lapack or --without-lapack was given.
 if test "${with_lapack+set}" = set; then
   withval="$with_lapack"
@@ -6885,6 +6892,82 @@
 
 
 
+       if test "$with_tr1_shared_ptr" != no && test "$have_tr1_shared_ptr" != 
yes
+       then
+               if test "$with_tr1_shared_ptr" == ""
+               then
+                       with_tr1_shared_ptr=yes
+               fi
+
+               save_LIBS="$LIBS"
+               save_CXXFLAGS="$CXXFLAGS"
+               a=
+
+       echo "$as_me:$LINENO: checking for tr1::shared_ptr" >&5
+echo $ECHO_N "checking for tr1::shared_ptr... $ECHO_C" >&6
+       cat >conftest.$ac_ext <<_ACEOF
+#include <tr1/memory>
+       int main(){std::tr1::shared_ptr<int> i; return  0;}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; a=1
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+
+               if test x$a == x
+               then
+                       cat >>confdefs.h <<\_ACEOF
+#define CVD_HAVE_TR1_SHARED_PTR 1
+_ACEOF
+
+                       have_tr1_shared_ptr=yes
+
+                       options="$options tr1_shared_ptr"
+
+               else
+                       LIBS="$save_LIBS"
+                       CXXFLAGS="$save_CXXFLAGS"
+               fi
+       fi
+
+       if test "$have_tr1_shared_ptr" != yes
+       then
+               :
+
+       fi
+
+
+
 
        if test "$with_toon" != no && test "$have_toon" != yes
        then
@@ -10497,8 +10580,8 @@
 
 #Libraries
 cvd_src/synchronized,cvd_src/eventobject,cvd_src/thread                pthread 
END
-cvd_src/thread/runnable_batch                   pthread
-cvd_src/nothread/runnable_batch                 END
+cvd_src/thread/runnable_batch                   tr1_shared_ptr pthread
+cvd_src/nothread/runnable_batch                 tr1_shared_ptr END
 
 
 cvd_src/videodisplay,cvd_src/glwindow                  videodisplay END
@@ -11307,6 +11390,7 @@
 s,@osx_hacks@,$osx_hacks,;t t
 s,@have_qtbuffer@,$have_qtbuffer,;t t
 s,@have_videodisplay@,$have_videodisplay,;t t
+s,@have_tr1_shared_ptr@,$have_tr1_shared_ptr,;t t
 s,@have_toon@,$have_toon,;t t
 s,@have_lapack@,$have_lapack,;t t
 s,@have_pthread@,$have_pthread,;t t

Index: configure.in
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure.in,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- configure.in        3 Jun 2008 00:24:15 -0000       1.122
+++ configure.in        4 Jun 2008 22:27:48 -0000       1.123
@@ -28,7 +28,7 @@
 #Lists of  optional components
 #
 
-all_options="videodisplay jpeg tiff png ffmpeg toon lapack pthread glob 
memalign"
+all_options="videodisplay jpeg tiff png ffmpeg toon lapack pthread glob 
memalign tr1_shared_ptr"
 dodginess_options=
 options=
 simd_all_options=
@@ -549,6 +549,7 @@
 AC_ARG_WITH(png, [  --without-png           compile without PNG support])
 AC_ARG_WITH(ffmpeg, [  --without-ffmpeg          compile without FFMPEG 
support])
 AC_ARG_WITH(toon, [  --withot-toon          Compile without TooN support])
+AC_ARG_WITH(tr1_shared_ptr, [  --withot-tr1_shared_ptr          Compile 
without tr1::shared_ptr support])
 AC_ARG_WITH(lapack, [  --without-lapack        Disable BLAS and LAPACK.])
 AC_ARG_WITH(acml, [  --with-acml[[=directory]] Use BLAS and LAPACK routines 
from the ACML library [[located in the specified directory]] ], 
[opt_acml_dir=$withval])
 
@@ -563,6 +564,13 @@
        AC_CHECK_LIB(GL,glDrawPixels, [], [a=1])
 ])
 
+CHECK_FOR_LIBRARY(tr1_shared_ptr, [
+       AC_MSG_CHECKING([for tr1::shared_ptr])
+       AC_COMPILE_IFELSE([#include <tr1/memory>
+       int main(){std::tr1::shared_ptr<int> i; return  0;}], 
[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no); a=1]) 
+
+])
+
 
 CHECK_FOR_LIBRARY(toon, [
        AC_MSG_CHECKING([for TooN])
@@ -895,8 +903,8 @@
 
 #Libraries
 cvd_src/synchronized,cvd_src/eventobject,cvd_src/thread                pthread 
END
-cvd_src/thread/runnable_batch                   pthread
-cvd_src/nothread/runnable_batch                 END
+cvd_src/thread/runnable_batch                   tr1_shared_ptr pthread
+cvd_src/nothread/runnable_batch                 tr1_shared_ptr END
 
 
 cvd_src/videodisplay,cvd_src/glwindow                  videodisplay END

Index: cvd/documentation.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/documentation.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- cvd/documentation.h 16 Apr 2008 23:15:03 -0000      1.16
+++ cvd/documentation.h 4 Jun 2008 22:27:48 -0000       1.17
@@ -95,7 +95,7 @@
        - uCLinux: Blackfin  (cross compile)
        - FreeBSD: x86
        - OpenBSD: XScale
-       - Mac OS X: x86
+       - Mac OS X: x86, PPC
                - Supports the OSX build environment including:
                        - Frameworks
                        - .dylib libraries
@@ -103,7 +103,6 @@
        - MinGW: x86 (native and cross compile)
 
   -Has worked on (current status unknown):
-       - Mac OS X: PPC
        - Linux: PPC
        - Solaris: SPARC
        - IRIX SGI O2: MIPS

Index: cvd_src/convolution.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/convolution.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- cvd_src/convolution.cc      6 May 2008 19:56:02 -0000       1.5
+++ cvd_src/convolution.cc      4 Jun 2008 22:27:49 -0000       1.6
@@ -1,4 +1,5 @@
-#include <cvd/convolution.h>
+#include "cvd/abs.h"
+#include "cvd/convolution.h"
 using namespace std;
 
 namespace CVD {
@@ -186,7 +187,7 @@
        compute_scaling_jacobian(d, sj);
        double v = target_var - compute_van_vliet_variance(d, vj);
        double step = v / (vj[0]*sj[0] + vj[1]*sj[1] + vj[2]*sj[2]);
-       if (std::abs(step) < 1e-6)
+       if (CVD::abs<double>(step) < 1e-6)
            break;
        double exp_step = exp(std::min(std::max(step, -1.0), 1.0));
        scale_d(d, exp_step);

Index: cvd_src/noarch/utility_float.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/noarch/utility_float.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- cvd_src/noarch/utility_float.cc     28 Feb 2008 00:27:24 -0000      1.1
+++ cvd_src/noarch/utility_float.cc     4 Jun 2008 22:27:49 -0000       1.2
@@ -20,7 +20,7 @@
 
        double inner_product(const float* a, const float* b, unsigned int count)
        {
-               inner_product<float>(a, b, count);
+               return inner_product<float>(a, b, count);
        }
 
        double sum_squared_differences(const float* a, const float* b, size_t 
count)




reply via email to

[Prev in Thread] Current Thread [Next in Thread]