[libcvd-members] libcvd configure.in configure

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Edward Rosten <edrosten>        09/06/04 17:10:08

Modified files:
        .              : configure.in configure 

Log message:
        Check for TooN-2 and fail for TooN-1

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure.in?cvsroot=libcvd&r1=1.146&r2=1.147
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure?cvsroot=libcvd&r1=1.145&r2=1.146

Patches:
Index: configure.in
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure.in,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -b -r1.146 -r1.147
--- configure.in        26 May 2009 14:22:27 -0000      1.146
+++ configure.in        4 Jun 2009 17:10:07 -0000       1.147
@@ -627,26 +627,19 @@
 CHECK_FOR_OPTION(toon, [
        AC_MSG_CHECKING([for TooN])
        AC_COMPILE_IFELSE([#include <TooN/TooN.h>
-       int main(){TooN::Vector<2> v;return 0;}], 
[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no); a=1]) 
-
-       AC_MSG_CHECKING([Old TooN])
+       int main(){TooN::Vector<2, double> v=TooN::Zeros;return 0;}], 
[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no); a=1]) 
 
+       if test x$a = x1 
+       then
+               AC_MSG_CHECKING([for old TooN])
        AC_COMPILE_IFELSE([#include <TooN/TooN.h>
-       using namespace TooN;
-       int main()
-       {
-               Matrix<> m1(10,10);
-               Matrix<3,3> m2;
-               m1.slice(0,0,3,3) += m2;
-               return 0;
-       }], [AC_MSG_RESULT(no)],[AC_MSG_RESULT(yes); a=1]) 
+               int main(){TooN::Vector<2> v;return 0;}], 
[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no); a=2]) 
 
        if test x$a = x1 
        then
-               AC_MSG_WARN([Your version of TooN is too old for this version 
of GCC.
-You need a recent version (SNAPSHOT_20080725 or later), or GCC version
-less than 4.2.0.
-               ])
+                       AC_MSG_WARN([Your version of TooN is too old. You need 
version 2.0-beta3 or later.])
+               fi
+               a=1
        fi
 ])
 

Index: configure
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -b -r1.145 -r1.146
--- configure   26 May 2009 14:22:26 -0000      1.145
+++ configure   4 Jun 2009 17:10:07 -0000       1.146
@@ -8477,7 +8477,7 @@
 echo $ECHO_N "checking for TooN... $ECHO_C" >&6; }
        cat >conftest.$ac_ext <<_ACEOF
 #include <TooN/TooN.h>
-       int main(){TooN::Vector<2> v;return 0;}
+       int main(){TooN::Vector<2, double> v=TooN::Zeros;return 0;}
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -8508,19 +8508,13 @@
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+       if test x$a = x1
+       then
        { echo "$as_me:$LINENO: checking Old TooN" >&5
 echo $ECHO_N "checking Old TooN... $ECHO_C" >&6; }
-
        cat >conftest.$ac_ext <<_ACEOF
 #include <TooN/TooN.h>
-       using namespace TooN;
-       int main()
-       {
-               Matrix<> m1(10,10);
-               Matrix<3,3> m2;
-               m1.slice(0,0,3,3) += m2;
-               return 0;
-       }
+               int main(){TooN::Vector<2> v;return 0;}
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -8539,28 +8533,24 @@
         test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { 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: yes" >&5
-echo "${ECHO_T}yes" >&6; }; a=1
+       { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }; a=2
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
        if test x$a = x1
        then
-               { echo "$as_me:$LINENO: WARNING: Your version of TooN is too 
old for this version of GCC.
-You need a recent version (SNAPSHOT_20080725 or later), or GCC version
-less than 4.2.0.
-               " >&5
-echo "$as_me: WARNING: Your version of TooN is too old for this version of GCC.
-You need a recent version (SNAPSHOT_20080725 or later), or GCC version
-less than 4.2.0.
-               " >&2;}
+                       { echo "$as_me:$LINENO: WARNING: Your version of TooN 
is too old. You need version 2.0-beta3 or later." >&5
+echo "$as_me: WARNING: Your version of TooN is too old. You need version 
2.0-beta3 or later." >&2;}
+               fi
+               a=1
        fi