[Toon-members] TooN TODO configure configure.ac README.HELP_IT...

[Edward Rosten]

CVSROOT:        /cvsroot/toon
Module name:    TooN
Changes by:     Edward Rosten <edrosten>        09/04/14 12:57:30

Modified files:
        .              : TODO configure configure.ac 
Removed files:
        .              : README.HELP_IT_IS_BROKEN 

Log message:
        ./configure now works by default.
        
        Uodated TODO list, and other documentation.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/TooN/TODO?cvsroot=toon&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/TooN/configure?cvsroot=toon&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/TooN/configure.ac?cvsroot=toon&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/TooN/README.HELP_IT_IS_BROKEN?cvsroot=toon&r1=1.1&r2=0

Patches:
Index: TODO
===================================================================
RCS file: /cvsroot/toon/TooN/TODO,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- TODO        27 Mar 2009 14:04:54 -0000      1.12
+++ TODO        14 Apr 2009 12:57:29 -0000      1.13
@@ -1,7 +1,6 @@
-BLAS 
-helpers.h
-fix up SVD, SymEigen, Cholesky
-fix up wls, wls_cholesky, irls
-fix up se3, so3, se2
-fix up downhill_simplex
+use BLAS 
+more complete helpers.h
+fix up SVD, SymEigen
+fix up wls_cholesky, irls?
+fix up downhill_simplex?
 iterators

Index: configure
===================================================================
RCS file: /cvsroot/toon/TooN/configure,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- configure   17 Feb 2009 17:11:07 -0000      1.3
+++ configure   14 Apr 2009 12:57:30 -0000      1.4
@@ -1,13 +1,13 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for TooN version-1.0.1.
+# Generated by GNU Autoconf 2.61 for TooN version-2.0.0-beta2.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
-# Copyright T. Drummond, E. Rosten 2006, 2007, 2008
+# Copyright T. Drummond, E. Rosten, G. Reitmayr 2006, 2007, 2008, 2009
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -574,8 +574,8 @@
 # Identity of this package.
 PACKAGE_NAME='TooN'
 PACKAGE_TARNAME='toon'
-PACKAGE_VERSION='version-1.0.1'
-PACKAGE_STRING='TooN version-1.0.1'
+PACKAGE_VERSION='version-2.0.0-beta2'
+PACKAGE_STRING='TooN version-2.0.0-beta2'
 PACKAGE_BUGREPORT=''
 
 ac_subst_vars='SHELL
@@ -1136,7 +1136,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures TooN version-1.0.1 to adapt to many kinds of systems.
+\`configure' configures TooN version-2.0.0-beta2 to adapt to many kinds of 
systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1197,14 +1197,13 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of TooN version-1.0.1:";;
+     short | recursive ) echo "Configuration of TooN version-2.0.0-beta2:";;
    esac
   cat <<\_ACEOF
 
 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-toon2          Enable TooN 2.0. DO NOT USE!
   --enable-typeof=X       Force typeof to be decltype, __typeof__, typeof,
                           boost or none
 
@@ -1280,7 +1279,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-TooN configure version-1.0.1
+TooN configure version-2.0.0-beta2
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1288,7 +1287,7 @@
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
-Copyright T. Drummond, E. Rosten 2006, 2007, 2008
+Copyright T. Drummond, E. Rosten, G. Reitmayr 2006, 2007, 2008, 2009
 _ACEOF
   exit
 fi
@@ -1296,7 +1295,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by TooN $as_me version-1.0.1, which was
+It was created by TooN $as_me version-2.0.0-beta2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -1650,44 +1649,6 @@
 
 
 
-
-toon2=no
-
-# Check whether --enable-toon2 was given.
-if test "${enable_toon2+set}" = set; then
-  enableval=$enable_toon2; toon2=yes
-fi
-
-
-if test "$toon2" != yes
-then
-cat<<FOO
-You're on the completely broken development branch of TooN 2.0, and it WILL NOT
-WORK. If you want a working TooN version, then run, get it using:
-
-cvs -z3 -d:pserver:address@hidden:/cvsroot/toon co -r Maintenance_Branch_1_x 
TooN
-
-or update what you currently have using:
-
-cvs up -r Maintenance_Branch_1_x
-
-or head over to:
-
-http://mi.eng.cam.ac.uk/~er258/cvd/
-
-and get the latest snapshot. If you are trying to hack the latest version of
-TooN in to a working form, then run:
-
-./configure --enable-toon2
-
-FOO
-
-{ { echo "$as_me:$LINENO: error: Please don't use this version of TooN" >&5
-echo "$as_me: error: Please don't use this version of TooN" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2516,6 +2477,29 @@
 fi
 
 
+cat<<FOO
+
+You're on the development branch of TooN 2.0. Everything will probably work, 
but
+the interface is a bit different from TooN-1.x
+
+If you want TooN-1, then get it using:
+
+cvs -z3 -d:pserver:address@hidden:/cvsroot/toon co -r Maintenance_Branch_1_x 
TooN
+
+or update what you currently have using:
+
+cvs up -r Maintenance_Branch_1_x
+
+or head over to:
+
+http://mi.eng.cam.ac.uk/~er258/cvd/
+
+Otherwise, please report any bugs you come across.
+
+
+FOO
+
+
 ac_config_headers="$ac_config_headers internal/config.hh"
 
 ac_config_files="$ac_config_files Makefile"
@@ -2916,7 +2900,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by TooN $as_me version-1.0.1, which was
+This file was extended by TooN $as_me version-2.0.0-beta2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2965,7 +2949,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-TooN config.status version-1.0.1
+TooN config.status version-2.0.0-beta2
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; 
s/[\\""\`\$]/\\\\&/g'`\\"
 

Index: configure.ac
===================================================================
RCS file: /cvsroot/toon/TooN/configure.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- configure.ac        17 Feb 2009 17:11:07 -0000      1.3
+++ configure.ac        14 Apr 2009 12:57:30 -0000      1.4
@@ -1,37 +1,5 @@
-AC_INIT(TooN, version-1.0.1)
-AC_COPYRIGHT([Copyright T. Drummond, E. Rosten 2006, 2007, 2008])
-
-toon2=no
-
-AC_ARG_ENABLE(toon2, [AS_HELP_STRING([--enable-toon2],[Enable TooN 2.0. DO NOT 
USE!])], [toon2=yes])
-
-if test "$toon2" != yes
-then
-cat<<FOO
-You're on the completely broken development branch of TooN 2.0, and it WILL NOT
-WORK. If you want a working TooN version, then run, get it using:
-
-cvs -z3 -d:pserver:address@hidden:/cvsroot/toon co -r Maintenance_Branch_1_x 
TooN
-
-or update what you currently have using:
-
-cvs up -r Maintenance_Branch_1_x
-
-or head over to:
-
-http://mi.eng.cam.ac.uk/~er258/cvd/
-
-and get the latest snapshot. If you are trying to hack the latest version of
-TooN in to a working form, then run:
-
-./configure --enable-toon2
-
-FOO
-
-AC_MSG_ERROR([Please don't use this version of TooN])
-
-fi
-
+AC_INIT(TooN, version-2.0.0-beta2)
+AC_COPYRIGHT([Copyright T. Drummond, E. Rosten, G. Reitmayr 2006, 2007, 2008, 
2009])
 AC_LANG(C++)
 AC_PROG_CXX
 
@@ -72,6 +40,29 @@
 fi
 
 
+cat<<FOO
+
+You're on the development branch of TooN 2.0. Everything will probably work, 
but
+the interface is a bit different from TooN-1.x
+
+If you want TooN-1, then get it using:
+
+cvs -z3 -d:pserver:address@hidden:/cvsroot/toon co -r Maintenance_Branch_1_x 
TooN
+
+or update what you currently have using:
+
+cvs up -r Maintenance_Branch_1_x
+
+or head over to:
+
+http://mi.eng.cam.ac.uk/~er258/cvd/
+
+Otherwise, please report any bugs you come across.
+
+
+FOO
+
+
 AC_CONFIG_HEADERS(internal/config.hh)
 AC_OUTPUT(Makefile)
 

Index: README.HELP_IT_IS_BROKEN
===================================================================
RCS file: README.HELP_IT_IS_BROKEN
diff -N README.HELP_IT_IS_BROKEN
--- README.HELP_IT_IS_BROKEN    2 Dec 2008 12:18:56 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-You're on the completely broken development branch of TooN 2.0, and it WILL NOT
-WORK. If you want a working TooN version, then run, get it using:
-
-cvs -z3 -d:pserver:address@hidden:/cvsroot/toon \
-         co -r Maintenance_Branch_1_x TooN
-
-or update what you currently have using:
-
-cvs up -r Maintenance_Branch_1_x
-
-or head over to:
-
-http://mi.eng.cam.ac.uk/~er258/cvd/
-
-and get the latest snapshot.