Open Build Service

atmos.spec Changed

_service Deleted

atmos-2.97.3.tar.gz/src/spectral_factory.cpp Deleted

@@ -1,196 +0,0 @@
-/*
-    $Id: spectral_factory.cpp 200 2011-02-03 14:45:13Z matwey $
-    Copyright (C) 2009  Sternberg Astronomical Institute, MSU
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <iomanip>
-#include <fstream>
-
-#include <boost/algorithm/string.hpp>
-#include <boost/filesystem/operations.hpp>
-
-#include "io.h"
-#include "spectral_factory.h"
-#include "weif.h"
-#include "utils.h"
-
-namespace atmos {
-namespace weight {
-
-std::pair< vector_type, vector_type > load_reaction( const boost::filesystem::path& file ) {
-	std::ifstream fstm( file.string().c_str() );
-	if( fstm.fail() )
-		throw std::runtime_error( "Can't open file " + file.string() );
-
-	std::pair< vector_type, vector_type > ret;
-	vector< double >::size_type alloc_size = 10;
-	vector< double >::size_type size = 0;
-
-	ret.first.resize( alloc_size );
-	ret.second.resize( alloc_size );
-
-	std::string cur_line;
-	double cx,cy;
-	while( std::getline( fstm, cur_line ) ) {
-		boost::trim_if( cur_line, boost::is_space() );
-		if( cur_line.size() < 1 || cur_line.at(0) == '#' ) continue;
-		std::istringstream cstm( cur_line );
-		if( !(cstm >> cx >> cy) )
-			throw std::runtime_error( "File format error in " + file.string() );
-		ret.first( size ) = cx;
-		ret.second( size ) = cy;
-		++size;
-		if( size >= ret.first.size() ) {
-			alloc_size += alloc_size;
-			ret.first.resize( alloc_size );
-			ret.second.resize( alloc_size );
-		}
-	}
-
-	ret.first.resize( size );
-	ret.second.resize( size );
-
-	/* Post check */
-	if( size == 0 )
-		throw std::runtime_error( "File " + file.string() + " contains no data" );
-	if( std::adjacent_find( ret.first.begin(), ret.first.end(), std::greater<double>() ) != ret.first.end() )
-		throw std::runtime_error( "File " + file.string() + " contains unsorted data" );
-	if( std::count_if( ret.first.begin(), ret.first.end(), std::bind2nd(std::less<double>(), 0.0 ) ) > 0 )
-		throw std::runtime_error( "File " + file.string() + " contains negative wavelengths" );
-	if( std::count_if( ret.second.begin(), ret.second.end(), std::bind2nd(std::less<double>(), 0.0 ) ) > 0 )
-		throw std::runtime_error( "File " + file.string() + " contains negative data" );
-
-	ret.first = ret.first * 0.001; // convert from nm to mkm
-
-	return ret;
-}
-
-std::pair< vector_type, vector_type > photon_distribution( const vector_type& spectral_lambda, const vector_type& spectral_response, const vector_type& device_lambda, const vector_type& device_response ) {
-	std::pair< vector_type, vector_type > ret;
-
-	assert( spectral_lambda.size() == spectral_response.size() );
-	assert( device_lambda.size() == device_response.size() );
-
-	ret.first.resize( std::min(spectral_lambda.size(), device_lambda.size()) );
-
-	vector_type::iterator it = std::set_intersection( spectral_lambda.begin(), spectral_lambda.end(), device_lambda.begin(), device_lambda.end(), ret.first.begin() );
-	if( it - ret.first.begin() == 0 )
-		throw std::runtime_error( "No match of response and spectrum grids" );
-
-	ret.first.resize( it - ret.first.begin() );
-	ret.second.resize( ret.first.size() );
-
-	vector_type::const_iterator sit = spectral_lambda.begin();
-	vector_type::const_iterator dit = device_lambda.begin();
-	vector_type::iterator rit = ret.second.begin();
-	for( vector_type::const_iterator it = ret.first.begin(); it != ret.first.end(); ++it ) {
-		sit = std::find( sit, spectral_lambda.end(), *it );
-		dit = std::find( dit, device_lambda.end(), *it );
-		*rit = spectral_response( sit.index() ) * device_response( dit.index() );
-		++rit;
-	}
-
-	if( std::count_if( ret.second.begin(), ret.second.end(), std::bind2nd(std::less<double>(), 0.0 ) ) > 0 )
-		throw std::runtime_error( "SED contains negative data" );
-
-	ret.second = ret.second / sum( ret.second );
-
-	return ret;
-}
-
-void dump_weight( const boost::filesystem::path& file, const boost::function1< vector_type, double >& function, const vector_type& grid ) {
-	static const char* name = { "A", "B", "C", "D", "AB", "AC", "AD", "BC", "BD", "CD", "L", "T" };
-	static const unsigned int name_size = sizeof(name) / sizeof(name0);
-	const double wscale = 1e+11;
-
-	std::ofstream fstm( file.string().c_str() );
-	if( fstm.fail() )
-		throw std::runtime_error( "Can't open file " + file.string() );
-
-	fstm.exceptions( std::ifstream::failbit | std::ifstream::badbit );
-
-	fstm << "# Z " << std::setprecision(2) << grid << std::endl;
-	fstm << "# W " << std::setprecision(0) << std::scientific << wscale << std::endl;
-	if( grid.size() < 1 )
-		 return;
-
-	unsigned int result_size = function( grid(0) ).size();
-
-	fstm << "## Alt";
-	for( unsigned int i = 0; i < std::min(name_size, result_size); ++i )
-		fstm << "\tW(" << namei << ")/" <<  std::scientific << wscale;
-	fstm << std::endl;
-
-	for( vector_type::size_type i = 0; i < grid.size(); ++i ){
-		fstm << std::fixed << std::setprecision(3) << grid(i);
-		vector_type result = function( grid(i) );
-		fstm << std::scientific << std::setprecision(4);
-		for( vector_type::size_type j = 0; j < result.size(); ++j ) {
-			fstm << "\t" << result(j) / wscale;
-		}
-		fstm << std::endl;
-	}
-}
-
-factory::factory(const boost::filesystem::path& wd, const boost::filesystem::path& mass_response, const boost::filesystem::path& ccd_response ):
-	m_mass_response(mass_response),
-	m_ccd_response(ccd_response),
-	m_wdir(wd),
-	m_basis_grid( lg_generator(0.0, 0.04, 0.25), 50 ),
-	m_mass_reaction( load_reaction(mass_response) ),
-	m_dimm_reaction( load_reaction(ccd_response) ) {
-
-	if( ! (boost::filesystem::exists( wd ) && boost::filesystem::is_directory( wd )) )
-		throw std::runtime_error( wd.string() + " is not a directory or doesn't exists");
-}
-factory::~factory() {
-}
-const boost::filesystem::path factory::get_spectrum_filename( const std::string& spectype ) const {
-	std::string spectral_type( spectype );
-	boost::to_lower( spectral_type );
-	boost::filesystem::path spect( m_wdir / (spectral_type + ".sp") );
-	return spect;
-}
-const factory::weight_type& factory::nullexposure_weight( const std::string& spectype, const vector<double>& inner_diam, const vector<double>& outer_diam, double dimmbase, double dimmsize ) {
-	storage_type::const_iterator it = m_nullexposure.find( spectype );
-	if( it != m_nullexposure.end() )
-		return it->second;
-
-	std::pair< vector_type, vector_type > spectral_response = load_reaction( get_spectrum_filename( spectype ) );
-
-	std::pair< vector_type, vector_type > mass_response = photon_distribution( spectral_response.first, spectral_response.second, m_mass_reaction.first, m_mass_reaction.second );
-	std::pair< vector_type, vector_type > dimm_response = photon_distribution( spectral_response.first, spectral_response.second, m_dimm_reaction.first, m_dimm_reaction.second );
-
-	std::pair< storage_type::iterator, bool > ret = m_nullexposure.insert( std::make_pair( spectype, weight_type( m_basis_grid, utils::ublas::project( m_basis_grid , atmos::weight::massdimm_weight( mass_response.first, mass_response.second, dimm_response.first, dimm_response.second, inner_diam, outer_diam, dimmsize, dimmbase ) ) ) ) );
-
-	return ret.first->second;
-}
-
-const factory::weight_type& factory::shortexposure_weight( const std::string& spectype, const vector<double>& inner_diam, const vector<double>& outer_diam ) {
-	storage_type::const_iterator it = m_shortexposure.find( spectype );
-	if( it != m_shortexposure.end() )
-		return it->second;
-
-	std::pair< vector_type, vector_type > spectral_response = load_reaction( get_spectrum_filename( spectype ) );
-
-	std::pair< vector_type, vector_type > mass_response = photon_distribution( spectral_response.first, spectral_response.second, m_mass_reaction.first, m_mass_reaction.second );
-
-	std::pair< storage_type::iterator, bool > ret = m_shortexposure.insert( std::make_pair( spectype, weight_type( m_basis_grid, utils::ublas::project( m_basis_grid , atmos::weight::mass_shortexposure_weight( mass_response.first, mass_response.second, inner_diam, outer_diam) ) ) ) );
-
-	return ret.first->second;
-}
-
-}}

atmos-2.97.3.tar.gz/src/spectral_factory.h Deleted

@@ -1,85 +0,0 @@
-/*
-    $Id: spectral_factory.h 200 2011-02-03 14:45:13Z matwey $
-    Copyright (C) 2009  Sternberg Astronomical Institute, MSU
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _SPECTRAL_FACTORY_H
-#define _SPECTRAL_FACTORY_H
-
-#include <map>
-#include <string>
-
-#include <boost/filesystem/path.hpp>
-#include <boost/function.hpp>
-#include <boost/numeric/ublas/vector.hpp>
-
-#include "spline.h"
-#include "nocase_less.h"
-#include "vector_generator.h"
-#include "utils.h"
-#include "weif.h"
-
-namespace atmos {
-namespace weight {
-
-using namespace boost::numeric::ublas;
-using namespace utils::algo;
-using namespace utils::ublas;
-
-std::pair< vector_type, vector_type > load_reaction( const boost::filesystem::path& file );
-std::pair< vector_type, vector_type > photon_distribution( const vector_type& spectral_lambda, const vector_type& spectral_response, const vector_type& device_lambda, const vector_type& device_response );
-
-void dump_weight( const boost::filesystem::path& file, const boost::function1< vector_type, double >& function, const vector_type& grid = vector_generator< lg_generator >( lg_generator(0.0, 0.04, 0.25), 50 ) );
-
-class factory{
-public:
-	typedef atmos::weight::vector_type vector_type;
-	typedef vector< vector_type > vector_vector_type;
-
-	typedef utils::ublas::cubic_spline< vector_type, vector_vector_type, vector_type, vector_vector_type > weight_type;
-	typedef std::map< std::string, weight_type, utils::algo::nocase_less< std::string > > storage_type;
-
-	typedef storage_type::const_iterator const_iterator;
-private:
-	boost::filesystem::path m_mass_response;
-	boost::filesystem::path m_ccd_response;
-	boost::filesystem::path m_wdir;
-
-	vector_generator< lg_generator > m_basis_grid;
-
-	storage_type m_nullexposure;
-	storage_type m_shortexposure;
-
-	std::pair< vector_type, vector_type > m_mass_reaction;
-	std::pair< vector_type, vector_type > m_dimm_reaction;
-private:
-	const boost::filesystem::path get_spectrum_filename( const std::string& spectype ) const;
-public:
-	factory(const boost::filesystem::path& wd, const boost::filesystem::path& mass_response, const boost::filesystem::path& ccd_response );
-	~factory();
-
-	const weight_type& nullexposure_weight( const std::string& spectype, const boost::numeric::ublas::vector<double>& inner_diam, const boost::numeric::ublas::vector<double>& outer_diam, double dimmbase, double dimmsize );
-	const weight_type& shortexposure_weight( const std::string& spectype, const boost::numeric::ublas::vector<double>& inner_diam, const boost::numeric::ublas::vector<double>& outer_diam );
-
-	const const_iterator nullexposure_begin() const { return m_nullexposure.begin(); }
-	const const_iterator nullexposure_end()   const { return m_nullexposure.end(); }
-	const const_iterator shortexposure_begin() const { return m_shortexposure.begin(); }
-	const const_iterator shortexposure_end()   const { return m_shortexposure.end(); }
-};
-
-}}
-
-#endif //_SPECTRAL_FACTORY_H

atmos-2.97.3.tar.gz/INSTALL -> atmos-2.97.4.tar.gz/INSTALL Changed

@@ -4,8 +4,10 @@
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-   This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==================
@@ -13,7 +15,11 @@
    Briefly, the shell commands `./configure; make; make install' should
 configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -42,7 +48,7 @@
 you want to change it or regenerate `configure' using a newer version
 of `autoconf'.
 
-The simplest way to compile this package is:
+   The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
      `./configure' to configure the package for your system.
@@ -53,12 +59,22 @@
   2. Type `make' to compile the package.
 
   3. Optionally, type `make check' to run any self-tests that come with
-     the package.
+     the package, generally using the just-built uninstalled binaries.
 
   4. Type `make install' to install the programs and any data files and
-     documentation.
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
 
-  5. You can remove the program binaries and object files from the
+  6. You can remove the program binaries and object files from the
      source code directory by typing `make clean'.  To also remove the
      files that `configure' created (so you can compile the package for
      a different kind of computer), type `make distclean'.  There is
@@ -67,8 +83,15 @@
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
 
 Compilers and Options
 =====================
@@ -93,7 +116,8 @@
 own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
 
    With a non-GNU `make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
@@ -120,7 +144,8 @@
    By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
@@ -131,15 +156,46 @@
    In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
 
    If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
-Optional Features
-=================
-
    Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
@@ -152,6 +208,13 @@
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
 Particular systems
 ==================
 
@@ -288,7 +351,7 @@
      `configure' can determine that directory automatically.
 
 `--prefix=DIR'
-     Use DIR as the installation prefix.  *Note Installation Names::
+     Use DIR as the installation prefix.  *note Installation Names::
      for more details, including other options available for fine-tuning
      the installation locations.

atmos-2.97.3.tar.gz/Makefile.in -> atmos-2.97.4.tar.gz/Makefile.in Changed

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -135,6 +135,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
@@ -230,7 +231,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --!k*);; \
@@ -255,7 +256,7 @@
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --!k*);; \
@@ -419,7 +420,8 @@
 	  fi; \
 	done
 	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -463,17 +465,17 @@
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac

atmos-2.97.3.tar.gz/aclocal.m4 -> atmos-2.97.4.tar.gz/aclocal.m4 Changed

@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
@@ -13,8 +13,8 @@
 
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
-m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.63,,
-m4_warning(this file was generated for autoconf 2.63.
+m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.68,,
+m4_warning(this file was generated for autoconf 2.68.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.))
@@ -34,7 +34,7 @@
 am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if($1, 1.11, ,
+m4_if($1, 1.11.1, ,
       AC_FATAL(Do not call $0, use AM_INIT_AUTOMAKE($1).))dnl
 )
 
@@ -50,7 +50,7 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN(AM_SET_CURRENT_AUTOMAKE_VERSION,
-AM_AUTOMAKE_VERSION(1.11)dnl
+AM_AUTOMAKE_VERSION(1.11.1)dnl
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
 _AM_AUTOCONF_VERSION(m4_defn(AC_AUTOCONF_VERSION)))

atmos-2.97.3.tar.gz/configure -> atmos-2.97.4.tar.gz/configure Changed

@@ -1,20 +1,24 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for atmos 2.97.3.
+# Generated by GNU Autoconf 2.68 for atmos 2.97.4.
 #
 # Report bugs to <mass-general@curl.sai.msu.ru>.
 #
+#
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
+#
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -22,23 +26,15 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
 as_nl='
 '
 export as_nl
@@ -46,7 +42,13 @@
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -57,7 +59,7 @@
     as_echo_body='eval expr "X$1" : "X\$.*\$"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in
+      case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\$.*\$$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
@@ -80,13 +82,6 @@
   }
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -96,15 +91,16 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+as_myself=
+case $0 in #((
   *\\/* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -116,12 +112,16 @@
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -133,330 +133,307 @@
 LANGUAGE=C
 export LANGUAGE
 
-# Required to use basename.
-if expr a : '$a$' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*$...$'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/$^/^/*$/*$' \| \
-	 X"$0" : 'X$//$$' \| \
-	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/$^/^/*$\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/$\/\/$$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/$\/$.*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
 # CDPATH.
-$as_unset CDPATH
-
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
 else
-  as_have_required=no
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;

atmos-2.97.3.tar.gz/configure.in -> atmos-2.97.4.tar.gz/configure.in Changed

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(atmos, 2.97.3, mass-general@curl.sai.msu.ru)
+AC_INIT(atmos, 2.97.4, mass-general@curl.sai.msu.ru)
 AM_INIT_AUTOMAKE()
 AC_CONFIG_HEADERS(src/config.h)
 AC_CONFIG_SRCDIR(src/atmos.h)
@@ -46,7 +46,8 @@
 	boost/type_traits/is_complex.hpp,,AC_MSG_ERROR(can't find boost headers))
 
 AC_CHECK_HEADERS(boost/math/tools/roots.hpp \
-	         tr1/tuple)
+	boost/math/tools/tuple.hpp \
+	tr1/tuple)
 
 AC_CHECK_HEADERS(gsl/gsl_errno.h \
 	gsl/gsl_integration.h ,,AC_MSG_ERROR(can't find gsl headers))
@@ -56,6 +57,7 @@
 # Checks for library functions.
 AC_CHECK_LIB(boost_program_options, main, , AC_MSG_ERROR(can't find boost program_options library))
 AC_CHECK_LIB(boost_filesystem, main, , AC_MSG_ERROR(can't find boost filesystem library))
+AC_CHECK_LIB(boost_system, main, , AC_MSG_ERROR(can't find boost system library))
 AC_CHECK_LIB(m, main)
 AC_CHECK_LIB(gslcblas, main, , AC_MSG_ERROR(can't find gslcblas library))
 AC_CHECK_LIB(gsl, main, , AC_MSG_ERROR(can't find gsl library))

atmos-2.97.3.tar.gz/src/Makefile.am -> atmos-2.97.4.tar.gz/src/Makefile.am Changed

atmos-2.97.3.tar.gz/src/Makefile.in -> atmos-2.97.4.tar.gz/src/Makefile.in Changed

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -51,8 +51,8 @@
 	atmos-file_output.$(OBJEXT) atmos-indices.$(OBJEXT) \
 	atmos-integrals.$(OBJEXT) atmos-io.$(OBJEXT) \
 	atmos-main.$(OBJEXT) atmos-params.$(OBJEXT) \
-	atmos-profile.$(OBJEXT) atmos-spectral_factory.$(OBJEXT) \
-	atmos-utils.$(OBJEXT) atmos-weif.$(OBJEXT) \
+	atmos-profile.$(OBJEXT) atmos-utils.$(OBJEXT) \
+	atmos-weight_factory.$(OBJEXT) atmos-weif.$(OBJEXT) \
 	atmos-worksheet.$(OBJEXT)
 atmos_OBJECTS = $(am_atmos_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
@@ -110,6 +110,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
@@ -164,6 +165,7 @@
 	atmos.h \
 	average.h \
 	background_factory.h \
+	caching_factory.h \
 	covariance_decomposition.h \
 	dimm.h \
 	fft.h \
@@ -179,13 +181,13 @@
 	params.h \
 	photometry.h \
 	profile.h \
-	spectral_factory.h \
 	spline.h \
 	table_storage.h \
 	typesdef.h \
 	unstable_remove_if.h \
 	utils.h \
 	vector_generator.h \
+	weight_factory.h \
 	weif.h \
 	worksheet.h \
 	background_factory.cpp \
@@ -198,8 +200,8 @@
 	main.cpp \
 	params.cpp \
 	profile.cpp \
-	spectral_factory.cpp \
 	utils.cpp \
+	weight_factory.cpp \
 	weif.cpp \
 	worksheet.cpp
 
@@ -314,9 +316,9 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/atmos-main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/atmos-params.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/atmos-profile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/atmos-spectral_factory.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/atmos-utils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/atmos-weif.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/atmos-weight_factory.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/atmos-worksheet.Po@am__quote@
 
 .cpp.o:
@@ -473,20 +475,6 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atmos_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atmos-profile.obj `if test -f 'profile.cpp'; then $(CYGPATH_W) 'profile.cpp'; else $(CYGPATH_W) '$(srcdir)/profile.cpp'; fi`
 
-atmos-spectral_factory.o: spectral_factory.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atmos_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atmos-spectral_factory.o -MD -MP -MF $(DEPDIR)/atmos-spectral_factory.Tpo -c -o atmos-spectral_factory.o `test -f 'spectral_factory.cpp' || echo '$(srcdir)/'`spectral_factory.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/atmos-spectral_factory.Tpo $(DEPDIR)/atmos-spectral_factory.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='spectral_factory.cpp' object='atmos-spectral_factory.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atmos_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atmos-spectral_factory.o `test -f 'spectral_factory.cpp' || echo '$(srcdir)/'`spectral_factory.cpp
-
-atmos-spectral_factory.obj: spectral_factory.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atmos_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atmos-spectral_factory.obj -MD -MP -MF $(DEPDIR)/atmos-spectral_factory.Tpo -c -o atmos-spectral_factory.obj `if test -f 'spectral_factory.cpp'; then $(CYGPATH_W) 'spectral_factory.cpp'; else $(CYGPATH_W) '$(srcdir)/spectral_factory.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/atmos-spectral_factory.Tpo $(DEPDIR)/atmos-spectral_factory.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='spectral_factory.cpp' object='atmos-spectral_factory.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atmos_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atmos-spectral_factory.obj `if test -f 'spectral_factory.cpp'; then $(CYGPATH_W) 'spectral_factory.cpp'; else $(CYGPATH_W) '$(srcdir)/spectral_factory.cpp'; fi`
-
 atmos-utils.o: utils.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atmos_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atmos-utils.o -MD -MP -MF $(DEPDIR)/atmos-utils.Tpo -c -o atmos-utils.o `test -f 'utils.cpp' || echo '$(srcdir)/'`utils.cpp
 @am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/atmos-utils.Tpo $(DEPDIR)/atmos-utils.Po
@@ -501,6 +489,20 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atmos_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atmos-utils.obj `if test -f 'utils.cpp'; then $(CYGPATH_W) 'utils.cpp'; else $(CYGPATH_W) '$(srcdir)/utils.cpp'; fi`
 
+atmos-weight_factory.o: weight_factory.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atmos_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atmos-weight_factory.o -MD -MP -MF $(DEPDIR)/atmos-weight_factory.Tpo -c -o atmos-weight_factory.o `test -f 'weight_factory.cpp' || echo '$(srcdir)/'`weight_factory.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/atmos-weight_factory.Tpo $(DEPDIR)/atmos-weight_factory.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weight_factory.cpp' object='atmos-weight_factory.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atmos_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atmos-weight_factory.o `test -f 'weight_factory.cpp' || echo '$(srcdir)/'`weight_factory.cpp
+
+atmos-weight_factory.obj: weight_factory.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atmos_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atmos-weight_factory.obj -MD -MP -MF $(DEPDIR)/atmos-weight_factory.Tpo -c -o atmos-weight_factory.obj `if test -f 'weight_factory.cpp'; then $(CYGPATH_W) 'weight_factory.cpp'; else $(CYGPATH_W) '$(srcdir)/weight_factory.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/atmos-weight_factory.Tpo $(DEPDIR)/atmos-weight_factory.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='weight_factory.cpp' object='atmos-weight_factory.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atmos_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atmos-weight_factory.obj `if test -f 'weight_factory.cpp'; then $(CYGPATH_W) 'weight_factory.cpp'; else $(CYGPATH_W) '$(srcdir)/weight_factory.cpp'; fi`
+
 atmos-weif.o: weif.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atmos_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atmos-weif.o -MD -MP -MF $(DEPDIR)/atmos-weif.Tpo -c -o atmos-weif.o `test -f 'weif.cpp' || echo '$(srcdir)/'`weif.cpp
 @am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/atmos-weif.Tpo $(DEPDIR)/atmos-weif.Po

atmos-2.97.3.tar.gz/src/average.h -> atmos-2.97.4.tar.gz/src/average.h Changed

@@ -1,5 +1,5 @@
 /*
-    $Id: average.h 180 2011-01-30 15:56:33Z matwey $
+    $Id: average.h 224 2011-07-11 08:29:18Z matwey $
     Copyright (C) 2010  Sternberg Astronomical Institute, MSU
 
     This program is free software: you can redistribute it and/or modify
@@ -20,158 +20,169 @@
 #define _AVERAGE_H
 
 #include <cmath>
-#include <iterator> // std::iterator_traits
 
-#include <boost/numeric/ublas/matrix_expression.hpp>
+#include <boost/numeric/ublas/fwd.hpp>
 #include <boost/numeric/ublas/symmetric.hpp>
-#include <boost/numeric/ublas/vector_expression.hpp>
 
 #include "apply_to_all.h"
 
 namespace utils {
 namespace algo {
-
+	
 namespace detail {
+	template<class T> struct mean_op {
+		typedef T value_type;
+		typedef T result_type;
+		
+		result_type operator() ( const value_type& x ) const {
+			return x;
+		}
+	};
+	
+	template<class T> struct variance_op {
+		typedef T value_type;
+		typedef T result_type;
 
-struct variance_traits {
-	static double prod( double x, double y ){
-		return x*y;
-	}
-	static float prod( float x, float y ){
-		return x*y;
-	}
-	template< class V1, class V2 > static
-	typename boost::numeric::ublas::vector_binary_traits< V1, V2, boost::numeric::ublas::scalar_multiplies< typename V1::value_type, typename V2::value_type > >::result_type
-	prod( const boost::numeric::ublas::vector_expression< V1 >& e1, const boost::numeric::ublas::vector_expression< V2 >& e2 ) {
-		return element_prod( e1, e2 );
-	}
-	template< class M1, class M2 > static
-	typename boost::numeric::ublas::matrix_binary_traits< M1, M2, boost::numeric::ublas::scalar_multiplies< typename M1::value_type, typename M2::value_type > >::result_type
-	prod( const boost::numeric::ublas::matrix_expression< M1 >& e1, const boost::numeric::ublas::matrix_expression< M2 >& e2 ) {
-		return element_prod( e1, e2 );
-	}
-};
-
-struct error_of_mean_traits {
-	static double sqrt( double x ){
-		return std::sqrt(x);
-	}
-	static float sqrt( float x ){
-		return std::sqrt(x);
-	}
-	template< class V1 > static
-	typename boost::numeric::ublas::vector_unary_traits< V1, utils::ublas::detail::sqrt< typename V1::value_type > >::result_type
-	sqrt( const boost::numeric::ublas::vector_expression< V1 >& e1) {
-		return utils::ublas::sqrt( e1 );
-	}
-	template< class M1 > static
-	typename boost::numeric::ublas::matrix_unary1_traits< M1, utils::ublas::detail::sqrt< typename M1::value_type > >::result_type
-	sqrt( const boost::numeric::ublas::matrix_expression< M1 >& e1) {
-		return utils::ublas::sqrt( e1 );
-	}
-};
+		variance_op( const value_type& mean ): mean(mean) {}
+		
+		result_type operator() ( const value_type& x ) const {
+			return (mean-x)*(mean-x);
+		}
+		
+		value_type mean;
+	};
+	
+	template<class U> struct boost_variance_op {
+		typedef U value_type;
+		typedef U result_type;
+		
+		boost_variance_op( const value_type& mean ): mean(mean) {}
+		
+		result_type operator() ( const value_type& x ) const {
+			using namespace boost::numeric::ublas;
+			
+			return element_prod(mean-x,mean-x);
+		}
+		
+		value_type mean;
+	};
+		
+	template<class U> struct boost_covariance_op {
+		typedef U value_type;
+		typedef boost::numeric::ublas::symmetric_matrix< typename U::value_type > result_type;
+		
+		boost_covariance_op( const value_type& mean ): mean(mean) {}
+		
+		result_type operator() ( const value_type& x ) const {
+			using namespace boost::numeric::ublas;
+			
+			return outer_prod(mean-x,mean-x);
+		}
+		
+		value_type mean;
+	};
+	
+	
+	/* fwd */
+	template<class T> struct mean_traits;
+	template<class T> struct variance_traits;
+	template<class T> struct covariance_traits;
+	template<class T> struct error_of_mean_traits;
+	
+	template<class T> struct mean_traits {
+		typedef mean_op<T> op_type;
+	};
+	template<class T> struct variance_traits {
+		typedef variance_op<T> op_type;
+	};
+	template<class T> struct variance_traits< boost::numeric::ublas::vector<T> > {
+		typedef boost_variance_op< boost::numeric::ublas::vector<T> > op_type;
+	};
+	template<class T> struct variance_traits< boost::numeric::ublas::matrix<T> > {
+		typedef boost_variance_op< boost::numeric::ublas::matrix<T> > op_type;
+	};
+	template<class T> struct variance_traits< boost::numeric::ublas::symmetric_matrix<T> > {
+		typedef boost_variance_op< boost::numeric::ublas::symmetric_matrix<T> > op_type;
+	};
+	template<class T> struct variance_traits< boost::numeric::ublas::banded_matrix<T> > {
+		typedef boost_variance_op< boost::numeric::ublas::banded_matrix<T> > op_type;
+	};
+	template<class T> struct covariance_traits< boost::numeric::ublas::vector<T> > {
+		typedef boost_covariance_op< boost::numeric::ublas::vector<T> > op_type;
+	};
+	template<class T> struct error_of_mean_traits {
+		typedef typename variance_traits<T>::op_type op_type;
+		static inline T sqrt( const T& x ) {
+			return std::sqrt(x);
+		}
+	};
+	template<class T> struct error_of_mean_traits< boost::numeric::ublas::vector<T> > {
+		typedef boost::numeric::ublas::vector<T> value_type;
+		
+		typedef typename variance_traits< value_type >::op_type op_type;
+		static inline value_type sqrt( const value_type x ) {
+			return utils::ublas::sqrt(x);
+		}
+	};
+	template<class T> struct error_of_mean_traits< boost::numeric::ublas::symmetric_matrix<T> > {
+		typedef boost::numeric::ublas::symmetric_matrix<T> value_type;
+
+		typedef typename variance_traits< value_type >::op_type op_type;
+		static inline value_type sqrt( const value_type x ) {
+			return utils::ublas::sqrt(x);
+		}
+	};
+}
 
-struct covariance_traits {
-	template< class V1, class V2 > static
-	boost::numeric::ublas::symmetric_adaptor< const typename boost::numeric::ublas::vector_matrix_binary_traits<V1, V2, boost::numeric::ublas::scalar_multiplies<typename V1::value_type, typename V2::value_type> >::result_type, boost::numeric::ublas::upper >
-	prod( const boost::numeric::ublas::vector_expression< V1 >& e1, const boost::numeric::ublas::vector_expression< V2 >& e2 ) {
-		typedef typename boost::numeric::ublas::vector_matrix_binary_traits<V1, V2, boost::numeric::ublas::scalar_multiplies<typename V1::value_type, typename V2::value_type> >::result_type outer_prod_type;
-		return boost::numeric::ublas::symmetric_adaptor< const outer_prod_type, boost::numeric::ublas::upper >( outer_prod( e1, e2 ) );
+/* average */
+template<class Iterator, class Op> typename Op::result_type accumulate( Iterator begin, Iterator end, Op op ) {
+	typedef typename Op::result_type result_type;
+	
+	if( begin == end ) return result_type();
+	
+	result_type result = op(*begin++);
+	
+	while( begin != end ) {
+		result += op(*begin++);
 	}
-};
 	
+	return result;
 }
 
-template<class T> struct mean {
-public:
-	typedef T value_type;
-	typedef T result_type;
+/* mean */
+template<class Iterator> typename detail::mean_traits< typename std::iterator_traits< Iterator >::value_type >::op_type::result_type mean( Iterator begin, Iterator end ) {
+	typedef typename std::iterator_traits< Iterator >::value_type value_type;
+	typedef typename detail::mean_traits< value_type >::op_type op_type;
 
-	void operator() ( result_type& result, const value_type& x ) const {
-		result += x;
-	}

atmos-2.97.4.tar.gz/src/caching_factory.h Added

@@ -0,0 +1,82 @@
+/*
+    $Id: caching_factory.h 225 2011-07-11 18:10:13Z matwey $
+    Copyright (C) 2011  Sternberg Astronomical Institute, MSU
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _CACHING_FACTORY_H
+#define _CACHING_FACTORY_H
+
+#ifndef GET_OBJECT_MAX_LENGTH
+#define GET_OBJECT_MAX_LENGTH 8
+#endif
+
+#include <map>
+
+#include <boost/functional/value_factory.hpp>
+
+#include <boost/preprocessor/arithmetic/inc.hpp>
+#include <boost/preprocessor/repetition/enum_binary_params.hpp>
+#include <boost/preprocessor/repetition/enum_params.hpp>
+#include <boost/preprocessor/repetition/repeat.hpp>
+
+namespace utils {
+namespace algo {
+
+template< class T, class Key, class Create = boost::value_factory<T>, class Container = std::map<Key,T> > class caching_factory {
+public:
+	typedef T       value_type;
+	typedef Key     key_type;
+	typedef Container container_type;
+	typedef Create  creator_type;
+	
+	typedef typename container_type::const_iterator const_iterator;
+private:
+	container_type  storage_;
+	creator_type    create_;
+public:
+	explicit caching_factory( Create create = Create() ): create_(create) {
+	}
+
+#ifdef GENERATE_GET_OBJECT
+#error "GENERATE_GET_OBJECT(z, n, _) is already defined"
+#else
+#define GENERATE_GET_OBJECT(z, n, _) \
+	template<BOOST_PP_ENUM_PARAMS_Z(z, BOOST_PP_INC(n), class T)> \
+	const typename container_type::mapped_type& operator() (BOOST_PP_ENUM_BINARY_PARAMS_Z(z, BOOST_PP_INC(n), T, p)) { \
+		typename container_type::const_iterator it = storage_.find(Key(BOOST_PP_ENUM_PARAMS_Z(z, BOOST_PP_INC(n), p))); \
+		if( it != storage_.end() ) { \
+			return it->second; \
+		} \
+		\
+		std::pair< typename container_type::iterator, bool > ret = storage_.insert( std::make_pair(\
+			Key(BOOST_PP_ENUM_PARAMS_Z(z, BOOST_PP_INC(n), p)), \
+			create_(BOOST_PP_ENUM_PARAMS_Z(z, BOOST_PP_INC(n), p))) ); \
+		\
+		return ret.first->second; \
+	}
+	
+BOOST_PP_REPEAT(GET_OBJECT_MAX_LENGTH, GENERATE_GET_OBJECT, nil)
+
+#undef GENERATE_GET_OBJECT
+#endif
+	const const_iterator begin() const { return storage_.begin(); }
+	const const_iterator end()   const { return storage_.end(); }
+};
+
+} // algo
+} // utils
+
+#endif // _CACHING_FACTORY_H

atmos-2.97.3.tar.gz/src/config.h.in -> atmos-2.97.4.tar.gz/src/config.h.in Changed

atmos-2.97.3.tar.gz/src/integrals.cpp -> atmos-2.97.4.tar.gz/src/integrals.cpp Changed

@@ -1,5 +1,5 @@
 /*
-    $Id: integrals.cpp 210 2011-03-02 18:59:06Z matwey $
+    $Id: integrals.cpp 228 2011-07-12 17:55:19Z matwey $
     Copyright (C) 2009  Sternberg Astronomical Institute, MSU
 
     This program is free software: you can redistribute it and/or modify
@@ -117,33 +117,36 @@
 
 }
 
-functor_factory::dcf_matrix_type functor_factory::calculate( const weight_type& wf, const vector_type& powers ) {
+namespace detail {
+functor_creator::result_type functor_creator::operator() ( const std::string& spectral_type, const weight_type& null_wf, const weight_type& second_wf ) const {
+	static const vector_type moment_powers = init_moment_powers();
+	static const vector_type wind_moment_powers = init_wind_moment_powers();
+
+	return result_type( calculate( null_wf, moment_powers ), moment_powers, calculate( second_wf, wind_moment_powers ), wind_moment_powers );
+}
+matrix_type functor_creator::calculate( const weight_type& wf, const vector_type& powers ) {
 	using namespace boost::numeric::ublas;
 	using namespace utils::algo;
 	using namespace utils::ublas;
 
+	typedef matrix_type            result_type;
+	typedef matrix_type::size_type size_type;
+	
 	const double max_cond = 1667;
 	const double bound_altitude = 0.38; // Height of the boundary layer kilometers to fit the Cn2-integral
 	const double top_altitude   = 25.0; // Height of the hight layer kilometers
 
 	const vector<double> grid( utils::ublas::vector_generator< lg_generator > ( lg_generator(0.0, 0.04, 0.25), 50 ) );
-
-	typedef dcf_matrix_type            result_type;
-	typedef dcf_matrix_type::size_type size_type;
-
 	vector<double>::const_iterator lower = std::find_if( grid.begin(), grid.end(), std::bind2nd( std::greater< double >(), bound_altitude) );
 	vector<double>::const_reverse_iterator higher = std::find_if( grid.rbegin(), grid.rend(), std::bind2nd( std::less< double >(), top_altitude) );
-	/* FIXME: Weights::grid_type::const_iterator */
-
-	// both layer altitudes and grid are compile-time contants, so it is assertion.
-	assert( lower != grid.end() );
+	assert( lower != grid.end() ); // both layer altitudes and grid are compile-time contants, so it is assertion.
 	assert( higher != grid.rend() );
-
-	result_type res( powers.size(), atmos::indices_size );
-
 	vector_range< const vector<double> > h( grid, range( lower.index(), higher.index()+1 ) );
-	matrix< double > wfv = vector_of_vector_to_matrix( project( grid, wf) );
+	
+	matrix< double > wfv = vector_of_vector_to_matrix( project( h, wf) );
 
+	result_type res( powers.size(), atmos::indices_size );
+	
 	for( vector_type::size_type ipow = 0; ipow < powers.size(); ipow++ ) {
 		double moment_power = powers(ipow);
 		double weight_power = moment_power / 2.0;
@@ -152,7 +155,7 @@
 		vector<double> alt    = utils::ublas::exp( log( h )*moment_power ) * scale;
 		vector<double> weight = utils::ublas::exp( log( h )*weight_power );
 
-		matrix<double> A( trans( subrange( wfv, 0, atmos::indices_size, lower.index(), higher.index()+1 ) ) );
+		matrix<double> A( trans( subrange( wfv, 0, atmos::indices_size, 0, wfv.size2() ) ) );
 		matrix<double> left( identity_matrix<double>( A.size1() ) );
 		matrix<double> right( identity_matrix<double>( A.size2() ) );
 
@@ -179,32 +182,21 @@
 
 	return res;
 }
-functor_factory::functor_factory() {
+functor_key::functor_key( const std::string& spectral_type, const weight_type& null_wf, const weight_type& second_wf ):
+	spectral_type(spectral_type) {
 }
-functor_factory::functor_factory( const functor_factory& factory ) {
-	m_storage = factory.m_storage;
+bool functor_key::operator==( const functor_key& key ) const {
+	return !(*this < key) && !(key < *this);
 }
-void functor_factory::swap( functor_factory& factory ) throw() {
-	m_storage.swap( factory.m_storage );
+bool functor_key::operator!=( const functor_key& key ) const {
+	return *this < key || key < *this;
 }
-functor_factory& functor_factory::operator=( const functor_factory& factory ) {
-	functor_factory tmp( factory );
-	tmp.swap( *this );
-	return *this;
-}
-functor_factory::~functor_factory() {
+bool functor_key::operator< ( const functor_key& key ) const {
+	if( nocase_less_( spectral_type, key.spectral_type ) ) {
+		return true;
+	}
+	return false;
 }
-const functor_factory::functor_type& functor_factory::operator() ( const std::string& spectral_type, const weight_type& null_wf, const weight_type& second_wf ) {
-	static const vector_type moment_powers = init_moment_powers();
-	static const vector_type wind_moment_powers = init_wind_moment_powers();
-
-	storage_type::const_iterator it = m_storage.find( spectral_type );
-	if( it != m_storage.end() )
-		return it->second;
-
-	std::pair< storage_type::iterator, bool > ret = m_storage.insert( std::make_pair( spectral_type, functor_type( calculate( null_wf, moment_powers ), moment_powers, calculate( second_wf, wind_moment_powers ), wind_moment_powers ) ) );
-
-	return ret.first->second;
 }
 
 functor::result_type functor::operator() ( const indices_type& indices, const indices_type& wind_indices, const indesis_type& desi, double mz ) const {
@@ -213,12 +205,12 @@
 	
 	assert( indices.size1() == atmos::channels );
 	assert( indices.size2() == atmos::channels );
-	assert( indesis.size()  == atmos::channels );
+	assert( desi.size()  == atmos::channels );
 
 	vector_type aints = reorder_flat(indices);
 	aints = prod( m_indices_dcf, aints );
 
-	assert( npower == aints.size() );
+	assert( m_powers.size() == aints.size() );
 	for( size_type i = 0; i < m_powers.size(); ++i ){
 		aints(i) = aints(i) / std::pow( mz, 1.0 + m_powers(i) );
 		if( !std::isfinite(aints(i)) || aints(i) < 0.0 )
@@ -228,7 +220,7 @@
 	vector_type wind_aints = reorder_flat(wind_indices);
 	wind_aints = prod( m_wind_indices_dcf, wind_aints );
 		
-	assert( wind_npower == wind_aints.size() );
+	assert( m_wind_powers.size() == wind_aints.size() );
 	for( size_type i = 0; i < m_wind_powers.size(); ++i ){
 		wind_aints(i) = wind_aints(i) / std::pow( mz, 1.0 + m_wind_powers(i) );
 		if( !std::isfinite(wind_aints(i)) || wind_aints(i) < 0.0 )

atmos-2.97.3.tar.gz/src/integrals.h -> atmos-2.97.4.tar.gz/src/integrals.h Changed

@@ -1,5 +1,5 @@
 /*
-    $Id: integrals.h 210 2011-03-02 18:59:06Z matwey $
+    $Id: integrals.h 226 2011-07-12 13:13:12Z matwey $
     Copyright (C) 2009  Sternberg Astronomical Institute, MSU
 
     This program is free software: you can redistribute it and/or modify
@@ -24,6 +24,7 @@
 #include <boost/numeric/ublas/vector.hpp>
 #include <boost/tuple/tuple.hpp>
 
+#include "caching_factory.h"
 #include "indices.h"
 #include "nocase_less.h"
 #include "table_storage.h"
@@ -38,6 +39,8 @@
 
 	typedef vector_type moments_type;
 	typedef atmos::indices::indesis_type::value_type desi_type;
+	
+	typedef boost::function1< vector<double>, double > weight_type;
 
 	enum moment_power {
 		moment_0 = 0,
@@ -99,29 +102,36 @@
 	}
 };
 
-class functor_factory;
+//class functor_factory;
 class functor;
 
-class functor_factory {
-	public:
-		typedef matrix_type dcf_matrix_type;
-		typedef boost::function1< vector<double>, double > weight_type;
-		typedef functor functor_type;
-		typedef std::map< std::string, functor_type, utils::algo::nocase_less< std::string > > storage_type;
+namespace detail {
+	using namespace utils::algo;
+	
+	struct functor_creator {
+		typedef functor result_type;
+		
+		result_type operator() ( const std::string& spectral_type, const weight_type& null_wf, const weight_type& second_wf ) const;
+		
 	private:
-		storage_type m_storage;
-
-		dcf_matrix_type calculate( const weight_type& wf, const vector_type& powers );
-	public:
-		functor_factory();
-		functor_factory( const functor_factory& factory );
-		void swap( functor_factory& factory ) throw();
-		functor_factory& operator=( const functor_factory& factory );
-		~functor_factory();
-
-		const functor_type& operator() ( const std::string& spectral_type, const weight_type& null_wf, const weight_type& second_wf );
+		static matrix_type calculate( const weight_type& wf, const vector_type& powers );
+	};
+	
+	struct functor_key {
+		functor_key( const std::string& spectral_type, const weight_type& null_wf, const weight_type& second_wf );
+	
+		bool operator==( const functor_key& key ) const;
+		bool operator!=( const functor_key& key ) const;
+		bool operator< ( const functor_key& key ) const;
+	private:
+		const std::string spectral_type;
+		
+		nocase_less< std::string > nocase_less_;
+	};
 };
 
+typedef utils::algo::caching_factory< functor, detail::functor_key, detail::functor_creator > functor_factory;
+
 class functor {
 	public:
 		typedef matrix_type dcf_matrix_type;

atmos-2.97.3.tar.gz/src/lambert.h -> atmos-2.97.4.tar.gz/src/lambert.h Changed

@@ -1,5 +1,5 @@
 /*
-    $Id: lambert.h 191 2011-01-31 13:40:08Z matwey $
+    $Id: lambert.h 259 2011-09-24 10:24:36Z matwey $
     Copyright (C) 2010  Sternberg Astronomical Institute, MSU
 
     This program is free software: you can redistribute it and/or modify
@@ -35,7 +35,16 @@
 
 #ifndef HAVE_BOOST_MATH_TOOLS_ROOTS_HPP
 #warning "Please, consider using Boost >= 1.35.0"
-#include <tr1/tuple>
+#endif
+
+#ifdef HAVE_BOOST_MATH_TOOLS_TUPLE_HPP
+#include <boost/math/tools/tuple.hpp>
+#define TUPLE_TYPE boost::math::tuple
+#define MAKE_TUPLE boost::math::make_tuple
+#else
+#include <boost/tr1/tuple.hpp>
+#define TUPLE_TYPE std::tr1::tuple
+#define MAKE_TUPLE std::tr1::make_tuple
 #endif
 
 namespace utils {
@@ -73,9 +82,9 @@
 
 	lambert_W0_functor( T const& target ) : a(target) {
 	}
-	std::tr1::tuple<T, T, T> operator()(T const& z) {
+	TUPLE_TYPE<T, T, T> operator()(T const& z) {
 		using namespace std;
-		return std::tr1::make_tuple( z - a * exp( -z ), z + value_type(1), z + value_type(2) );
+		return MAKE_TUPLE( z - a * exp( -z ), z + value_type(1), z + value_type(2) );
 	}
 	private:
 	T a;

atmos-2.97.3.tar.gz/src/profile.cpp -> atmos-2.97.4.tar.gz/src/profile.cpp Changed

@@ -1,5 +1,5 @@
 /*
-    $Id: profile.cpp 199 2011-02-03 09:38:16Z matwey $
+    $Id: profile.cpp 230 2011-07-13 08:54:35Z matwey $
     Copyright (C) 2009  Sternberg Astronomical Institute, MSU
 
     This program is free software: you can redistribute it and/or modify
@@ -31,6 +31,7 @@
 #include "atmos.h"
 #include "apply_to_all.h"
 #include "covariance_decomposition.h"
+#include "integrals.h"
 #include "profile.h"
 #include "utils.h"
 
@@ -92,12 +93,6 @@
 }
 namespace profile {
 
-const double MAXCHI2 = 999.0;
-const double JPOW_SEE = 0.6 ;
-const double LPOW_SEE = -0.2;
-const double KL = 1.1486983549970351; // 0.5 ** LPOW_SEE
-const double KS = 1.73588e+07;
-
 functor::functor( const grid_type& grid, const mixture_covariance_type& cov_matrix, double secz, const weight_type& basewf ):
 	m_grid( grid ),
 	m_weight_matrix( utils::ublas::aetkin_weight_matrix(cov_matrix) ),
@@ -121,13 +116,13 @@
 
 	ret.residual = prod( m_problem_matrix, ret.cn2 ) - weighted_indices;
 
-	ret.chi2 = std::min( inner_prod( ret.residual, ret.residual ), MAXCHI2 );
+	ret.chi2 = inner_prod( ret.residual, ret.residual );
 
 	ret.cn2 /= m_secz;
 	return ret;
 }
 double functor::seeing( const cn2_type& cn2 ) const {
-	return KS*KL*std::pow( sum( cn2 ), JPOW_SEE );
+	return atmos::integrals::seeing( sum(cn2) );
 }
 vector_type functor::indices_residual( const residual_type& residual ) const {
 	return prod( m_invweight_matrix, residual );

atmos-2.97.3.tar.gz/src/profile.h -> atmos-2.97.4.tar.gz/src/profile.h Changed

atmos-2.97.3.tar.gz/src/weif.cpp -> atmos-2.97.4.tar.gz/src/weif.cpp Changed

@@ -1,5 +1,5 @@
 /*
-    $Id: weif.cpp 200 2011-02-03 14:45:13Z matwey $
+    $Id: weif.cpp 232 2011-07-13 12:34:21Z matwey $
     Copyright (C) 2010  Sternberg Astronomical Institute, MSU
 
     This program is free software: you can redistribute it and/or modify
@@ -39,6 +39,8 @@
 const double KM2CM  = 1E5 ;
 const int  WORKSPACE = 10000;
 
+static gsl::set_error_handler_off set_error_handler_off_;
+
 struct mass_params {
 	typedef boost::function1< std::complex<double>, double > sfun_type;
 
@@ -98,12 +100,14 @@
 	return cf*( 1.0 - 2.0*cos(p.phi)*cos(p.phi)*j0(b) + 2.0*cos(2*p.phi)*j1(b)/b );
 }
 
-template <class T> T nexthigher(T k) {
-    if (k == 0) return 1;
-    k--;
-    for (int i=1; i < std::numeric_limits<T>::digits; i<<=1) k = k | k >> i;
-    return k+1;
+size_t next_pow2( size_t x ) {
+	if( !(x&(x-1)) ) return x;
+	for( size_t i = 1; i < std::numeric_limits<size_t>::digits; i<<=1 ) {
+		x |= (x >> i);
+	}
+	return (x & ~(x >> 1)) << 1;
 }
+
 template<class V,class V2> typename V::const_iterator lambda_effective( const V& lambda, const V2& dist ) {
 	typedef typename V::value_type value_type;
 	typedef typename V::const_iterator const_iterator;
@@ -115,18 +119,25 @@
 }
 
 std::pair< vector_type, vector< complex_type > > spectral_band_fourier( const vector<double>& lambda, const vector<double>& dist, unsigned int center ) {
-	const int GRIDFACT = 4 ;    // 0 - no stretch, 1 - stretch twice, 2 - stretch 4-times etc.
-	double dlambda = lambda(1) - lambda(0);
-	int dist_ftnn = 2*GRIDFACT*nexthigher(dist.size());
-	vector< std::complex<double> > dist_ft = zero_vector< std::complex<double> >( dist_ftnn );
-	vector< double > dist_freq( dist_ftnn/2 );
-	for( vector<double>::size_type l = 0; l < dist_freq.size(); l++ ) dist_freq(l) = l/(dlambda*MKM2CM)/dist_ftnn;
-	for( vector<double>::size_type l = 0; l < dist.size(); l++ ) {      // Fill in the data array for FFT:
-		vector<double>::size_type j = ( l < center ) ? dist_ftnn + l - center : l - center;
+	typedef vector<double>::size_type size_type;
+	
+	const size_type grid_factor = 4;
+	const double dlambda = lambda(1) - lambda(0);
+	const size_type distft_size = 2 * grid_factor * next_pow2( dist.size() );
+	
+	vector< std::complex<double> > dist_ft = zero_vector< std::complex<double> >( distft_size );
+	for( vector<double>::size_type l = 0; l < dist.size(); l++ ) {
+		vector<double>::size_type j = ( l < center ) ? distft_size + l - center : l - center;
 		dist_ft(j) = dist(l);
 	}
-	noalias( dist_ft ) = utils::ublas::fft_radix2( dist_ft ); // Compute the Fourier transform of the center-shifted SED:
-	return std::make_pair( dist_freq, subrange( dist_ft, 0, dist_ftnn/2 ) );
+	noalias( dist_ft ) = utils::ublas::fft_radix2( dist_ft );
+	
+	vector< double > freq( distft_size/2 );
+	for( vector<double>::size_type i = 0; i < freq.size(); ++i ) {
+		freq(i) = i/(dlambda*MKM2CM)/(distft_size);
+	}
+	
+	return std::make_pair( freq, subrange( dist_ft, 0, distft_size/2 ) );
 }
 
 namespace detail {

atmos-2.97.4.tar.gz/src/weight_factory.cpp Added

@@ -0,0 +1,254 @@
+/*
+    $Id: weight_factory.cpp 231 2011-07-13 10:04:03Z matwey $
+    Copyright (C) 2009  Sternberg Astronomical Institute, MSU
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <algorithm>
+#include <iomanip>
+#include <fstream>
+
+#include <boost/format.hpp>
+#include <boost/algorithm/string.hpp>
+#include <boost/filesystem/operations.hpp>
+
+#include "io.h"
+#include "weight_factory.h"
+#include "weif.h"
+#include "utils.h"
+
+namespace atmos {
+namespace weight {
+
+namespace detail {
+weight_wrapper::weight_wrapper( context_reference_type ctx, const weight_type& weight ): local_context_type(ctx), weight_(weight) {
+}
+
+vector_type weight_wrapper::operator() (const value_type& x) {
+	if( x < context().m_basis_grid(0) || x > context().m_basis_grid( context().m_basis_grid.size()-1 ) ) {
+		throw std::out_of_range( (boost::format("Grid height %1% is out of ragne") % x ).str() );
+	}
+	return weight_(x);
+}
+
+mass_weight_key::mass_weight_key( const std::string& spectype, const vector_type& inner_diam, const vector_type& outer_diam ):
+	spectype(spectype), inner_diam(inner_diam), outer_diam(outer_diam) {
+}
+
+bool mass_weight_key::operator==( const mass_weight_key& key ) const {
+	return !(*this < key) && !(key < *this);
+}
+bool mass_weight_key::operator!=( const mass_weight_key& key ) const {
+	return *this < key || key < *this;
+}
+bool mass_weight_key::operator< ( const mass_weight_key& key ) const {
+	if( nocase_less_( spectype, key.spectype ) ) {
+		return true;
+	} else if( nocase_less_( key.spectype, spectype ) ) {
+		return false;
+	}
+	if( std::lexicographical_compare( inner_diam.begin(), inner_diam.end(), key.inner_diam.begin(), key.inner_diam.end() ) ) {
+		return true;
+	} else if( std::lexicographical_compare( key.inner_diam.begin(), key.inner_diam.end(), inner_diam.begin(), inner_diam.end() ) ) {
+		return false;
+	}
+	if( std::lexicographical_compare( outer_diam.begin(), outer_diam.end(), key.outer_diam.begin(), key.outer_diam.end() ) ) {
+		return true;
+	} else if( std::lexicographical_compare( key.outer_diam.begin(), key.outer_diam.end(),  outer_diam.begin(), outer_diam.end() ) ) {
+		return false;
+	}
+	
+	return false;
+}
+std::ostream& mass_weight_key::print( std::ostream& stm ) const {
+	return stm << spectype;
+}
+
+massdimm_weight_key::massdimm_weight_key( const std::string& spectype, const vector_type& inner_diam, const vector_type& outer_diam, double dimmbase, double dimmsize ):
+	mass_weight_key(spectype, inner_diam, outer_diam),
+	dimmbase(dimmbase), dimmsize(dimmsize) {
+}
+
+bool massdimm_weight_key::operator==( const massdimm_weight_key& key ) const {
+	return !(*this < key) && !(key < *this);
+}
+bool massdimm_weight_key::operator!=( const massdimm_weight_key& key ) const {
+	return *this < key || key < *this;
+}
+bool massdimm_weight_key::operator< ( const massdimm_weight_key& key ) const {
+	if( mass_weight_key::operator< (key) ) {
+		return true;
+	} else if( key.mass_weight_key::operator< (*this) ) {
+		return false;
+	}
+	
+	if( dimmbase < key.dimmbase ) { return true; } else if( key.dimmbase < dimmbase ) { return false; }
+	if( dimmsize < key.dimmsize ) { return true; } else if( key.dimmsize < dimmsize ) { return false; }
+	
+	return false;
+}
+std::ostream& operator<< ( std::ostream& stm, const mass_weight_key& key ) {
+	return key.print(stm);
+}
+std::ostream& operator<< ( std::ostream& stm, const massdimm_weight_key& key ) {
+	return key.print(stm);
+}
+}
+
+std::pair< vector_type, vector_type > load_reaction( const boost::filesystem::path& file ) {
+	std::ifstream fstm( file.string().c_str() );
+	if( fstm.fail() )
+		throw std::runtime_error( "Can't open file " + file.string() );
+
+	std::pair< vector_type, vector_type > ret;
+	vector< double >::size_type alloc_size = 10;
+	vector< double >::size_type size = 0;
+
+	ret.first.resize( alloc_size );
+	ret.second.resize( alloc_size );
+
+	std::string cur_line;
+	double cx,cy;
+	while( std::getline( fstm, cur_line ) ) {
+		boost::trim_if( cur_line, boost::is_space() );
+		if( cur_line.size() < 1 || cur_line.at(0) == '#' ) continue;
+		std::istringstream cstm( cur_line );
+		if( !(cstm >> cx >> cy) )
+			throw std::runtime_error( "File format error in " + file.string() );
+		ret.first( size ) = cx;
+		ret.second( size ) = cy;
+		++size;
+		if( size >= ret.first.size() ) {
+			alloc_size += alloc_size;
+			ret.first.resize( alloc_size );
+			ret.second.resize( alloc_size );
+		}
+	}
+
+	ret.first.resize( size );
+	ret.second.resize( size );
+
+	/* Post check */
+	if( size == 0 )
+		throw std::runtime_error( "File " + file.string() + " contains no data" );
+	if( std::adjacent_find( ret.first.begin(), ret.first.end(), std::greater<double>() ) != ret.first.end() )
+		throw std::runtime_error( "File " + file.string() + " contains unsorted data" );
+	if( std::count_if( ret.first.begin(), ret.first.end(), std::bind2nd(std::less<double>(), 0.0 ) ) > 0 )
+		throw std::runtime_error( "File " + file.string() + " contains negative wavelengths" );
+	if( std::count_if( ret.second.begin(), ret.second.end(), std::bind2nd(std::less<double>(), 0.0 ) ) > 0 )
+		throw std::runtime_error( "File " + file.string() + " contains negative data" );
+
+	ret.first = ret.first * 0.001; // convert from nm to mkm
+
+	return ret;
+}
+
+std::pair< vector_type, vector_type > photon_distribution( const vector_type& spectral_lambda, const vector_type& spectral_response, const vector_type& device_lambda, const vector_type& device_response ) {
+	std::pair< vector_type, vector_type > ret;
+
+	assert( spectral_lambda.size() == spectral_response.size() );
+	assert( device_lambda.size() == device_response.size() );
+
+	ret.first.resize( std::min(spectral_lambda.size(), device_lambda.size()) );
+
+	vector_type::iterator it = std::set_intersection( spectral_lambda.begin(), spectral_lambda.end(), device_lambda.begin(), device_lambda.end(), ret.first.begin() );
+	if( it - ret.first.begin() == 0 )
+		throw std::runtime_error( "No match of response and spectrum grids" );
+
+	ret.first.resize( it - ret.first.begin() );
+	ret.second.resize( ret.first.size() );
+
+	vector_type::const_iterator sit = spectral_lambda.begin();
+	vector_type::const_iterator dit = device_lambda.begin();
+	vector_type::iterator rit = ret.second.begin();
+	for( vector_type::const_iterator it = ret.first.begin(); it != ret.first.end(); ++it ) {
+		sit = std::find( sit, spectral_lambda.end(), *it );
+		dit = std::find( dit, device_lambda.end(), *it );
+		*rit = spectral_response( sit.index() ) * device_response( dit.index() );
+		++rit;
+	}
+
+	if( std::count_if( ret.second.begin(), ret.second.end(), std::bind2nd(std::less<double>(), 0.0 ) ) > 0 )
+		throw std::runtime_error( "SED contains negative data" );
+
+	ret.second = ret.second / sum( ret.second );
+
+	return ret;
+}
+
+void dump_weight( const boost::filesystem::path& file, const boost::function1< vector_type, double >& function, const vector_type& grid ) {
+	static const char* name = { "A", "B", "C", "D", "AB", "AC", "AD", "BC", "BD", "CD", "L", "T" };
+	static const unsigned int name_size = sizeof(name) / sizeof(name0);
+	const double wscale = 1e+11;
+
+	std::ofstream fstm( file.string().c_str() );
+	if( fstm.fail() )
+		throw std::runtime_error( "Can't open file " + file.string() );
+

atmos-2.97.4.tar.gz/src/weight_factory.h Added

@@ -0,0 +1,180 @@
+/*
+    $Id: weight_factory.h 231 2011-07-13 10:04:03Z matwey $
+    Copyright (C) 2009  Sternberg Astronomical Institute, MSU
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _SPECTRAL_FACTORY_H
+#define _SPECTRAL_FACTORY_H
+
+#include <map>
+#include <string>
+
+#include <boost/filesystem/path.hpp>
+#include <boost/function.hpp>
+#include <boost/numeric/ublas/vector.hpp>
+
+#include "caching_factory.h"
+#include "spline.h"
+#include "local_context.h"
+#include "nocase_less.h"
+#include "vector_generator.h"
+#include "utils.h"
+#include "weif.h"
+
+namespace atmos {
+namespace weight {
+
+using namespace boost::numeric::ublas;
+using namespace utils::algo;
+using namespace utils::ublas;
+using utils::local_context;
+
+std::pair< vector_type, vector_type > load_reaction( const boost::filesystem::path& file );
+std::pair< vector_type, vector_type > photon_distribution( const vector_type& spectral_lambda, const vector_type& spectral_response, const vector_type& device_lambda, const vector_type& device_response );
+
+void dump_weight( const boost::filesystem::path& file, const boost::function1< vector_type, double >& function, const vector_type& grid = vector_generator< lg_generator >( lg_generator(0.0, 0.04, 0.25), 49 ) );
+
+typedef vector< vector_type > vector_vector_type;
+
+class factory;
+
+namespace detail {
+	struct weight_wrapper: public local_context<const factory> {
+		typedef boost::function1< vector_type, value_type > weight_type;
+		typedef vector_type result_type;
+		
+		weight_wrapper( context_reference_type ctx, const weight_type& weight );
+		
+		vector_type operator() (const value_type& x);
+	private:
+		weight_type weight_;
+	};
+	template<class T> struct mass_weight_creator: public local_context<const factory> {
+		typedef weight_wrapper result_type;
+		typedef T weight_type;
+	
+		mass_weight_creator( context_reference_type ctx ): local_context_type(ctx) {
+		}
+		
+		result_type operator() ( const std::string& spectype, const vector_type& inner_diam, const vector_type& outer_diam ) const ;
+	};
+	template<class T> struct massdimm_weight_creator: public mass_weight_creator<T> {
+		typedef typename mass_weight_creator<T>::context_reference_type context_reference_type;
+		typedef typename mass_weight_creator<T>::result_type result_type;
+		typedef typename mass_weight_creator<T>::weight_type weight_type;
+		
+		massdimm_weight_creator( context_reference_type ctx ): mass_weight_creator<T>(ctx) {
+		}
+		
+		result_type operator() ( const std::string& spectype, const vector_type& inner_diam, const vector_type& outer_diam, double dimmbase, double dimmsize ) const;
+	};
+	struct mass_weight_key {
+		mass_weight_key( const std::string& spectype, const vector_type& inner_diam, const vector_type& outer_diam );
+	
+		bool operator==( const mass_weight_key& key ) const;
+		bool operator!=( const mass_weight_key& key ) const;
+		bool operator< ( const mass_weight_key& key ) const;
+		
+		std::ostream& print( std::ostream& stm ) const;
+	private:
+		const std::string spectype;
+		const vector_type inner_diam;
+		const vector_type outer_diam;
+		
+		nocase_less< std::string > nocase_less_;
+	};
+	struct massdimm_weight_key: public mass_weight_key {
+		massdimm_weight_key( const std::string& spectype, const vector_type& inner_diam, const vector_type& outer_diam, double dimmbase, double dimmsize );
+		
+		bool operator==( const massdimm_weight_key& key ) const;
+		bool operator!=( const massdimm_weight_key& key ) const;
+		bool operator< ( const massdimm_weight_key& key ) const;
+	private:
+		double dimmbase;
+		double dimmsize;
+	};
+	
+	std::ostream& operator<< ( std::ostream& stm, const mass_weight_key& key );
+	std::ostream& operator<< ( std::ostream& stm, const massdimm_weight_key& key );
+}
+
+class factory {
+	friend class detail::weight_wrapper;
+	friend class detail::massdimm_weight_creator< massdimm_weight >;
+	friend class detail::mass_weight_creator< mass_shortexposure_weight >;
+public:
+	typedef detail::massdimm_weight_creator< massdimm_weight >       nullexposure_weight_creator;
+	typedef detail::mass_weight_creator< mass_shortexposure_weight > shortexposure_weight_creator;
+	
+	typedef detail::weight_wrapper nullexposure_weight_type;
+	typedef detail::weight_wrapper shortexposure_weight_type;
+	
+	typedef detail::massdimm_weight_key nullexposure_key;
+	typedef detail::mass_weight_key     shortexposure_key;
+	
+	typedef caching_factory< nullexposure_weight_type, nullexposure_key, nullexposure_weight_creator >    nullexposure_factory_type;
+	typedef caching_factory< shortexposure_weight_type, shortexposure_key, shortexposure_weight_creator > shortexposure_factory_type;
+private:
+	boost::filesystem::path m_mass_response;
+	boost::filesystem::path m_ccd_response;
+	boost::filesystem::path m_wdir;
+
+	vector_generator< lg_generator > m_basis_grid;
+
+	nullexposure_factory_type  m_nullexposure_factory;
+	shortexposure_factory_type m_shortexposure_factory;
+
+	std::pair< vector_type, vector_type > m_mass_reaction;
+	std::pair< vector_type, vector_type > m_dimm_reaction;
+private:
+	const boost::filesystem::path get_spectrum_filename( const std::string& spectype ) const;
+public:
+	factory(const boost::filesystem::path& wd, const boost::filesystem::path& mass_response, const boost::filesystem::path& ccd_response );
+	~factory();
+
+	const nullexposure_weight_type&  nullexposure_weight( const std::string& spectype, const boost::numeric::ublas::vector<double>& inner_diam, const boost::numeric::ublas::vector<double>& outer_diam, double dimmbase, double dimmsize );
+	const shortexposure_weight_type& shortexposure_weight( const std::string& spectype, const boost::numeric::ublas::vector<double>& inner_diam, const boost::numeric::ublas::vector<double>& outer_diam );
+
+	const nullexposure_factory_type::const_iterator  nullexposure_begin() const { return m_nullexposure_factory.begin(); }
+	const nullexposure_factory_type::const_iterator  nullexposure_end()   const { return m_nullexposure_factory.end(); }
+	const shortexposure_factory_type::const_iterator shortexposure_begin() const { return m_shortexposure_factory.begin(); }
+	const shortexposure_factory_type::const_iterator shortexposure_end()   const { return m_shortexposure_factory.end(); }
+};
+
+namespace detail {
+template<class T> typename mass_weight_creator<T>::result_type mass_weight_creator<T>::operator() ( const std::string& spectype, const vector_type& inner_diam, const vector_type& outer_diam ) const {
+	typedef cubic_spline< vector_type, vector_vector_type, vector_type, vector_vector_type > spline_type;
+	
+	std::pair< vector_type, vector_type > spectral_response = load_reaction( context().get_spectrum_filename( spectype ) );
+	std::pair< vector_type, vector_type > mass_response = photon_distribution( spectral_response.first, spectral_response.second, context().m_mass_reaction.first, context().m_mass_reaction.second );
+
+	return result_type( context(), spline_type( context().m_basis_grid, utils::ublas::project( context().m_basis_grid, weight_type( mass_response.first, mass_response.second, inner_diam, outer_diam) ) ) );
+};
+template<class T> typename massdimm_weight_creator<T>::result_type massdimm_weight_creator<T>::operator() ( const std::string& spectype, const vector_type& inner_diam, const vector_type& outer_diam, double dimmbase, double dimmsize ) const {
+	typedef cubic_spline< vector_type, vector_vector_type, vector_type, vector_vector_type > spline_type;
+	
+	std::pair< vector_type, vector_type > spectral_response = load_reaction( this->context().get_spectrum_filename( spectype ) );
+	std::pair< vector_type, vector_type > mass_response = photon_distribution( spectral_response.first, spectral_response.second, this->context().m_mass_reaction.first, this->context().m_mass_reaction.second );
+	std::pair< vector_type, vector_type > dimm_response = photon_distribution( spectral_response.first, spectral_response.second, this->context().m_dimm_reaction.first, this->context().m_dimm_reaction.second );
+
+	return result_type( this->context(), spline_type( this->context().m_basis_grid, utils::ublas::project( this->context().m_basis_grid, weight_type( mass_response.first, mass_response.second, dimm_response.first, dimm_response.second, inner_diam, outer_diam, dimmsize, dimmbase ) ) ) );
+};
+}
+
+
+}}
+
+#endif //_SPECTRAL_FACTORY_H

atmos-2.97.3.tar.gz/src/worksheet.cpp -> atmos-2.97.4.tar.gz/src/worksheet.cpp Changed

@@ -1,5 +1,5 @@
 /*
-    $Id: worksheet.cpp 210 2011-03-02 18:59:06Z matwey $
+    $Id: worksheet.cpp 226 2011-07-12 13:13:12Z matwey $
     Copyright (C) 2009  Sternberg Astronomical Institute, MSU
 
     This program is free software: you can redistribute it and/or modify
@@ -48,7 +48,8 @@
 	public local_context< worksheet > {
 public:
 	typedef context_type::input::time_type time_type;
-	typedef context_type::weight_factory_type::weight_type weight_type;
+	typedef context_type::weight_factory_type::nullexposure_weight_type nullexposure_weight_type;
+	typedef context_type::weight_factory_type::shortexposure_weight_type shortexposure_weight_type;
 private:
 	std::string m_spectral;
 	yalpa::equatorial<double> m_coords;
@@ -56,8 +57,8 @@
 	object( const yalpa::equatorial<double> ecoords, const std::string& spectral, context_reference_type ctx ): local_context_type( ctx ), m_spectral(spectral), m_coords(ecoords) {}
 
 	double airmass( const time_type& time ) const;
-	const weight_type& weight();
-	const weight_type& short_weight();
+	const nullexposure_weight_type& weight();
+	const shortexposure_weight_type& short_weight();
 	const std::string& sclass() const { return m_spectral; }
 };
 
@@ -187,7 +188,7 @@
 		const boost::posix_time::ptime& meantime = m_accumulation_begin + (m_accumulation_end-m_accumulation_begin)/2;
 
 		typedef context_type::integrals_factory_type integrals_factory_type;
-		typedef integrals_factory_type::functor_type integrals_functor_type;
+		typedef integrals_factory_type::value_type   integrals_functor_type;
 		typedef integrals_functor_type::result_type  integrals_result_type;
 		typedef profile::functor                    restoration_functor_type;
 		typedef restoration_functor_type::result_type restoration_result_type;
@@ -201,17 +202,17 @@
 			double dimm_turbulence_err = 0.0;
 
 			if( m_dimm.size() > 1 ) {
-				dimm::vars_type xvars = average( m_dimm.xvars().begin(), m_dimm.xvars().end(), mean< dimm::vars_type >() );
-				dimm::vars_type yvars = average( m_dimm.yvars().begin(), m_dimm.yvars().end(), mean< dimm::vars_type >() );
+				dimm::vars_type xvars = mean( m_dimm.xvars().begin(), m_dimm.xvars().end() );
+				dimm::vars_type yvars = mean( m_dimm.yvars().begin(), m_dimm.yvars().end() );
 
 				/* low vars correction */
 				dimm::correct_low_vars( m_dimm.xvars().begin(), m_dimm.xvars().end(), xvars(0) );
 				dimm::correct_low_vars( m_dimm.yvars().begin(), m_dimm.yvars().end(), yvars(0) );
-				xvars = average( m_dimm.xvars().begin(), m_dimm.xvars().end(), mean< dimm::vars_type >() );
-				yvars = average( m_dimm.yvars().begin(), m_dimm.yvars().end(), mean< dimm::vars_type >() );
+				xvars = mean( m_dimm.xvars().begin(), m_dimm.xvars().end() );
+				yvars = mean( m_dimm.yvars().begin(), m_dimm.yvars().end() );
 				
-				dimm::vars_type xerrs = average( m_dimm.xvars().begin(), m_dimm.xvars().end(), error_of_mean< dimm::vars_type >(xvars) );
-				dimm::vars_type yerrs = average( m_dimm.yvars().begin(), m_dimm.yvars().end(), error_of_mean< dimm::vars_type >(yvars) );
+				dimm::vars_type xerrs = error_of_mean( m_dimm.xvars().begin(), m_dimm.xvars().end(), xvars );
+				dimm::vars_type yerrs = error_of_mean( m_dimm.yvars().begin(), m_dimm.yvars().end(), yvars );
 
 				double Jlong = dimm::turbulence( context().m_pproxy.dimm_scale(), context().m_pproxy.dimm_Klongitudinal(), xvars(1) );
 				double Jlong_err = dimm::turbulence( context().m_pproxy.dimm_scale(), context().m_pproxy.dimm_Klongitudinal(), xerrs(1) );
@@ -224,12 +225,12 @@
 				dimm_seeing_err = 0.6*dimm_turbulence_err;
 			}
 
-			indices::flux_type flux_avg = average( m_indices.flux().begin(), m_indices.flux().end(), mean< indices::flux_type >() );
-			indices::flux_type flux_err = average( m_indices.flux().begin(), m_indices.flux().end(), error_of_mean< indices::flux_type >(flux_avg) );
-			indices::indices_type indices_avg = average( m_indices.indices().begin(), m_indices.indices().end(), mean<indices::indices_type>() );
-			indices::indices_type indices_err = average( m_indices.indices().begin(), m_indices.indices().end(), error_of_mean<indices::indices_type>(indices_avg) );
-			indices::indesis_type indesis_avg = average( m_indices.indesis().begin(), m_indices.indesis().end(), mean<indices::indesis_type>() );
-			indices::indesis_type indesis_err = average( m_indices.indesis().begin(), m_indices.indesis().end(), error_of_mean<indices::indesis_type>(indesis_avg) );
+			indices::flux_type flux_avg = mean( m_indices.flux().begin(), m_indices.flux().end() );
+			indices::flux_type flux_err = error_of_mean( m_indices.flux().begin(), m_indices.flux().end(), flux_avg );
+			indices::indices_type indices_avg = mean( m_indices.indices().begin(), m_indices.indices().end() );
+			indices::indices_type indices_err = error_of_mean( m_indices.indices().begin(), m_indices.indices().end(), indices_avg );
+			indices::indesis_type indesis_avg = mean( m_indices.indesis().begin(), m_indices.indesis().end() );
+			indices::indesis_type indesis_err = error_of_mean( m_indices.indesis().begin(), m_indices.indesis().end(), indesis_avg );
 
 			context().m_file_output.indices( meantime, indices_avg, indices_err, indesis_avg, indesis_err );
 			context().m_file_output.fluxes( meantime, flux_avg, flux_err );
@@ -243,12 +244,12 @@
 				integrals.push_back( moments.get<0>(), moments.get<1>(), moments.get<2>() );
 			}
 
-			integrals::moments_type moments = average( integrals.moments().begin(), integrals.moments().end(), mean< integrals::moments_type >() );
-			integrals::moments_type moments_err = average( integrals.moments().begin(), integrals.moments().end(), error_of_mean< integrals::moments_type >(moments) );
-			integrals::moments_type wind_moments = average( integrals.wind_moments().begin(), integrals.wind_moments().end(), mean< integrals::moments_type >() );
-			integrals::moments_type wind_moments_err = average( integrals.wind_moments().begin(), integrals.wind_moments().end(), error_of_mean< integrals::moments_type >(wind_moments) );
-			integrals::desi_type desi = average( integrals.desi().begin(), integrals.desi().end(), mean< integrals::desi_type >() );
-			integrals::desi_type desi_err = average( integrals.desi().begin(), integrals.desi().end(), error_of_mean< integrals::desi_type >(desi) );
+			integrals::moments_type moments = mean( integrals.moments().begin(), integrals.moments().end() );
+			integrals::moments_type moments_err = error_of_mean( integrals.moments().begin(), integrals.moments().end(), moments );
+			integrals::moments_type wind_moments = mean( integrals.wind_moments().begin(), integrals.wind_moments().end() );
+			integrals::moments_type wind_moments_err = error_of_mean( integrals.wind_moments().begin(), integrals.wind_moments().end(), wind_moments );
+			integrals::desi_type desi = mean( integrals.desi().begin(), integrals.desi().end() );
+			integrals::desi_type desi_err = error_of_mean( integrals.desi().begin(), integrals.desi().end(), desi );
 
 			double moment_0 = moments(integrals::moment_0);
 			double moment_2 = moments(integrals::moment_2);
@@ -284,8 +285,8 @@
 			}
 			
 			/* covariate mixture */
-			mixture::mixture_type mixture_avg = average( mixture_samples.mixture().begin(), mixture_samples.mixture().end(), mean< mixture::mixture_type >() );
-			symmetric_matrix< double > mixture_covariance = average( mixture_samples.mixture().begin(), mixture_samples.mixture().end(), covariance< mixture::mixture_type >(mixture_avg) );
+			mixture::mixture_type mixture_avg = mean( mixture_samples.mixture().begin(), mixture_samples.mixture().end() );
+			symmetric_matrix< double > mixture_covariance = covariance( mixture_samples.mixture().begin(), mixture_samples.mixture().end(), mixture_avg );
 			/* prepare grid */
 
 			restoration_functor_type rfun(
@@ -303,10 +304,10 @@
 			profile.unstable_remove_if( profile::filter::chi2_gt_than( context().m_va"chi2-threshold".as<double>() ) );
 
 			if( profile.size() ) {
-				double chi2_avg = average( profile.chi2().begin(), profile.chi2().end(), mean< double >() );
-				vector< double > cn2_avg = average( profile.cn2().begin(), profile.cn2().end(), mean< vector< double > >() );
-				vector< double > cn2_err = average( profile.cn2().begin(), profile.cn2().end(), error_of_mean< vector< double > >( cn2_avg ) );
-				vector< double > residual_avg = average( profile.residual().begin(), profile.residual().end(), mean< vector< double > >() );
+				double chi2_avg = mean( profile.chi2().begin(), profile.chi2().end() );
+				vector< double > cn2_avg = mean( profile.cn2().begin(), profile.cn2().end() );
+				vector< double > cn2_err = error_of_mean( profile.cn2().begin(), profile.cn2().end(), cn2_avg );
+				vector< double > residual_avg = mean( profile.residual().begin(), profile.residual().end() );
 
 				context().m_file_output.profile( meantime, "X", rfun.seeing( cn2_avg ), chi2_avg, cn2_avg, cn2_err, grid );
 				context().m_file_output.residual( meantime, "X", element_div( rfun.indices_residual( residual_avg ), mixture_avg ) );
@@ -325,7 +326,7 @@
 	double secz2 = secz1 - 1.0;
 	return secz1 - secz2*( 0.0018167 + secz2*( 0.002875 + 0.0008083*secz2 ) );
 }
-const worksheet::object::weight_type& worksheet::object::weight() {
+const worksheet::object::nullexposure_weight_type& worksheet::object::weight() {
 	return context().m_weight_factory.nullexposure_weight(
 		m_spectral,
 		context().m_pproxy.inner_diam(),
@@ -333,7 +334,7 @@
 		context().m_pproxy.dimm_aperture_base(),
 		context().m_pproxy.dimm_aperture_size() );
 }
-const worksheet::object::weight_type& worksheet::object::short_weight() {
+const worksheet::object::shortexposure_weight_type& worksheet::object::short_weight() {
 	return context().m_weight_factory.shortexposure_weight(
 		m_spectral,
 		context().m_pproxy.inner_diam(),
@@ -469,10 +470,10 @@
 }
 void worksheet::post() {
 	if( m_va.count("dump-weight") ) {
-		for( weight_factory_type::const_iterator it = weight_factory().nullexposure_begin(); it != weight_factory().nullexposure_end(); ++it ) {
+		for( weight_factory_type::nullexposure_factory_type::const_iterator it = weight_factory().nullexposure_begin(); it != weight_factory().nullexposure_end(); ++it ) {
 			atmos::weight::dump_weight( ( boost::format("weight-%1%.wf") % it->first ).str(), it->second );
 		}
-		for( weight_factory_type::const_iterator it = weight_factory().shortexposure_begin(); it != weight_factory().shortexposure_end(); ++it ) {
+		for( weight_factory_type::shortexposure_factory_type::const_iterator it = weight_factory().shortexposure_begin(); it != weight_factory().shortexposure_end(); ++it ) {
 			atmos::weight::dump_weight( ( boost::format("weight-short-%1%.wf") % it->first ).str(), it->second );
 		}
 	}

atmos-2.97.3.tar.gz/src/worksheet.h -> atmos-2.97.4.tar.gz/src/worksheet.h Changed

atmos-2.97.3.tar.gz/third-party/Makefile.in -> atmos-2.97.4.tar.gz/third-party/Makefile.in Changed

atmos-2.97.3.tar.gz/third-party/lsp/INSTALL -> atmos-2.97.4.tar.gz/third-party/lsp/INSTALL Changed

@@ -4,8 +4,10 @@
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-   This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==================
@@ -13,7 +15,11 @@
    Briefly, the shell commands `./configure; make; make install' should
 configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -42,7 +48,7 @@
 you want to change it or regenerate `configure' using a newer version
 of `autoconf'.
 
-The simplest way to compile this package is:
+   The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
      `./configure' to configure the package for your system.
@@ -53,12 +59,22 @@
   2. Type `make' to compile the package.
 
   3. Optionally, type `make check' to run any self-tests that come with
-     the package.
+     the package, generally using the just-built uninstalled binaries.
 
   4. Type `make install' to install the programs and any data files and
-     documentation.
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
 
-  5. You can remove the program binaries and object files from the
+  6. You can remove the program binaries and object files from the
      source code directory by typing `make clean'.  To also remove the
      files that `configure' created (so you can compile the package for
      a different kind of computer), type `make distclean'.  There is
@@ -67,8 +83,15 @@
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
 
 Compilers and Options
 =====================
@@ -93,7 +116,8 @@
 own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
 
    With a non-GNU `make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
@@ -120,7 +144,8 @@
    By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
@@ -131,15 +156,46 @@
    In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
 
    If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
-Optional Features
-=================
-
    Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
@@ -152,6 +208,13 @@
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
 Particular systems
 ==================
 
@@ -288,7 +351,7 @@
      `configure' can determine that directory automatically.
 
 `--prefix=DIR'
-     Use DIR as the installation prefix.  *Note Installation Names::
+     Use DIR as the installation prefix.  *note Installation Names::
      for more details, including other options available for fine-tuning
      the installation locations.

atmos-2.97.3.tar.gz/third-party/lsp/Makefile.in -> atmos-2.97.4.tar.gz/third-party/lsp/Makefile.in Changed

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -135,6 +135,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
@@ -229,7 +230,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --!k*);; \
@@ -254,7 +255,7 @@
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --!k*);; \
@@ -418,7 +419,8 @@
 	  fi; \
 	done
 	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -462,17 +464,17 @@
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac

atmos-2.97.3.tar.gz/third-party/lsp/aclocal.m4 -> atmos-2.97.4.tar.gz/third-party/lsp/aclocal.m4 Changed

@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
@@ -13,8 +13,8 @@
 
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
-m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.63,,
-m4_warning(this file was generated for autoconf 2.63.
+m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.68,,
+m4_warning(this file was generated for autoconf 2.68.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.))
@@ -34,7 +34,7 @@
 am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if($1, 1.11, ,
+m4_if($1, 1.11.1, ,
       AC_FATAL(Do not call $0, use AM_INIT_AUTOMAKE($1).))dnl
 )
 
@@ -50,7 +50,7 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN(AM_SET_CURRENT_AUTOMAKE_VERSION,
-AM_AUTOMAKE_VERSION(1.11)dnl
+AM_AUTOMAKE_VERSION(1.11.1)dnl
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
 _AM_AUTOCONF_VERSION(m4_defn(AC_AUTOCONF_VERSION)))

atmos-2.97.3.tar.gz/third-party/lsp/configure -> atmos-2.97.4.tar.gz/third-party/lsp/configure Changed

@@ -1,20 +1,24 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for lsp 0.1.0.
+# Generated by GNU Autoconf 2.68 for lsp 0.1.0.
 #
 # Report bugs to <matwey.kornilov@gmail.com>.
 #
+#
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
+#
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -22,23 +26,15 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
 as_nl='
 '
 export as_nl
@@ -46,7 +42,13 @@
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -57,7 +59,7 @@
     as_echo_body='eval expr "X$1" : "X\$.*\$"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in
+      case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\$.*\$$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
@@ -80,13 +82,6 @@
   }
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -96,15 +91,16 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+as_myself=
+case $0 in #((
   *\\/* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -116,12 +112,16 @@
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -133,330 +133,307 @@
 LANGUAGE=C
 export LANGUAGE
 
-# Required to use basename.
-if expr a : '$a$' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*$...$'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/$^/^/*$/*$' \| \
-	 X"$0" : 'X$//$$' \| \
-	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/$^/^/*$\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/$\/\/$$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/$\/$.*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
 # CDPATH.
-$as_unset CDPATH
-
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
 else
-  as_have_required=no
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;

atmos-2.97.3.tar.gz/third-party/lsp/doc/Makefile.in -> atmos-2.97.4.tar.gz/third-party/lsp/doc/Makefile.in Changed

atmos-2.97.3.tar.gz/third-party/lsp/include/Makefile.in -> atmos-2.97.4.tar.gz/third-party/lsp/include/Makefile.in Changed

atmos-2.97.3.tar.gz/third-party/lsp/include/config.h.in -> atmos-2.97.4.tar.gz/third-party/lsp/include/config.h.in Changed

atmos-2.97.3.tar.gz/third-party/lsp/include/lsp/Makefile.in -> atmos-2.97.4.tar.gz/third-party/lsp/include/lsp/Makefile.in Changed

atmos-2.97.3.tar.gz/third-party/lsp/include/lsp/nnls.h -> atmos-2.97.4.tar.gz/third-party/lsp/include/lsp/nnls.h Changed

atmos-2.97.3.tar.gz/third-party/lsp/include/lsp/schur_decomposition.h -> atmos-2.97.4.tar.gz/third-party/lsp/include/lsp/schur_decomposition.h Changed

atmos-2.97.3.tar.gz/third-party/lsp/include/lsp/tridiagonal_transform.h -> atmos-2.97.4.tar.gz/third-party/lsp/include/lsp/tridiagonal_transform.h Changed

atmos-2.97.3.tar.gz/third-party/lsp/test/Makefile.in -> atmos-2.97.4.tar.gz/third-party/lsp/test/Makefile.in Changed

atmos-2.97.3.tar.gz/third-party/yalpa/INSTALL -> atmos-2.97.4.tar.gz/third-party/yalpa/INSTALL Changed

@@ -4,8 +4,10 @@
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-   This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==================
@@ -13,7 +15,11 @@
    Briefly, the shell commands `./configure; make; make install' should
 configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -42,7 +48,7 @@
 you want to change it or regenerate `configure' using a newer version
 of `autoconf'.
 
-The simplest way to compile this package is:
+   The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
      `./configure' to configure the package for your system.
@@ -53,12 +59,22 @@
   2. Type `make' to compile the package.
 
   3. Optionally, type `make check' to run any self-tests that come with
-     the package.
+     the package, generally using the just-built uninstalled binaries.
 
   4. Type `make install' to install the programs and any data files and
-     documentation.
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
 
-  5. You can remove the program binaries and object files from the
+  6. You can remove the program binaries and object files from the
      source code directory by typing `make clean'.  To also remove the
      files that `configure' created (so you can compile the package for
      a different kind of computer), type `make distclean'.  There is
@@ -67,8 +83,15 @@
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
 
 Compilers and Options
 =====================
@@ -93,7 +116,8 @@
 own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
 
    With a non-GNU `make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
@@ -120,7 +144,8 @@
    By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
@@ -131,15 +156,46 @@
    In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
 
    If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
-Optional Features
-=================
-
    Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
@@ -152,6 +208,13 @@
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
 Particular systems
 ==================
 
@@ -288,7 +351,7 @@
      `configure' can determine that directory automatically.
 
 `--prefix=DIR'
-     Use DIR as the installation prefix.  *Note Installation Names::
+     Use DIR as the installation prefix.  *note Installation Names::
      for more details, including other options available for fine-tuning
      the installation locations.

atmos-2.97.3.tar.gz/third-party/yalpa/Makefile.in -> atmos-2.97.4.tar.gz/third-party/yalpa/Makefile.in Changed

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -123,6 +123,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -146,6 +147,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -158,6 +160,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
@@ -170,6 +173,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -203,7 +207,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -275,7 +278,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --!k*);; \
@@ -300,7 +303,7 @@
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --!k*);; \
@@ -464,7 +467,8 @@
 	  fi; \
 	done
 	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -508,17 +512,17 @@
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac

atmos-2.97.3.tar.gz/third-party/yalpa/aclocal.m4 -> atmos-2.97.4.tar.gz/third-party/yalpa/aclocal.m4 Changed

@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
@@ -13,8 +13,8 @@
 
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
-m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.63,,
-m4_warning(this file was generated for autoconf 2.63.
+m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.68,,
+m4_warning(this file was generated for autoconf 2.68.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.))
@@ -34,7 +34,7 @@
 am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if($1, 1.11, ,
+m4_if($1, 1.11.1, ,
       AC_FATAL(Do not call $0, use AM_INIT_AUTOMAKE($1).))dnl
 )
 
@@ -50,7 +50,7 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN(AM_SET_CURRENT_AUTOMAKE_VERSION,
-AM_AUTOMAKE_VERSION(1.11)dnl
+AM_AUTOMAKE_VERSION(1.11.1)dnl
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
 _AM_AUTOCONF_VERSION(m4_defn(AC_AUTOCONF_VERSION)))

atmos-2.97.3.tar.gz/third-party/yalpa/config.guess -> atmos-2.97.4.tar.gz/third-party/yalpa/config.guess Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-04-27'
+timestamp='2009-11-20'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -180,7 +180,7 @@
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -213,19 +213,19 @@
 	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE_ARCH}-${VENDOR}-openbsd${UNAME_RELEASE}
 	exit ;;
     *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-${VENDOR}-ekkobsd${UNAME_RELEASE}
 	exit ;;
     *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-${VENDOR}-solidbsd${UNAME_RELEASE}
 	exit ;;
     macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerpc-${VENDOR}-mirbsd${UNAME_RELEASE}
 	exit ;;
     *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-${VENDOR}-mirbsd${UNAME_RELEASE}
 	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
@@ -290,13 +290,13 @@
 	echo alpha-dec-winnt3.5
 	exit ;;
     Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
+	echo m68k-${VENDOR}-sysv4
 	exit ;;
     *:AamigaOoSs:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
+	echo ${UNAME_MACHINE}-${VENDOR}-amigaos
 	exit ;;
     *:MmorphOoSs:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
+	echo ${UNAME_MACHINE}-${VENDOR}-morphos
 	exit ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
@@ -311,7 +311,7 @@
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
     arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
+	echo arm-${VENDOR}-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
@@ -343,6 +343,9 @@
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/^.*//'`
 	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
 	SUN_ARCH="i386"
@@ -416,7 +419,7 @@
         echo m68k-hades-mint${UNAME_RELEASE}
         exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
+        echo m68k-${VENDOR}-mint${UNAME_RELEASE}
         exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
@@ -666,7 +669,7 @@
 	    # => hppa64-hp-hpux11.23
 
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -727,9 +730,9 @@
 	exit ;;
     i*86:OSF1:*:*)
 	if  -x /usr/sbin/sysversion  ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	    echo ${UNAME_MACHINE}-${VENDOR}-osf1mk
 	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
+	    echo ${UNAME_MACHINE}-${VENDOR}-osf1
 	fi
 	exit ;;
     parisc*:Lites*:*:*)
@@ -789,19 +792,19 @@
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit ;;
     sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	echo sparc-${VENDOR}-bsdi${UNAME_RELEASE}
 	exit ;;
     *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-${VENDOR}-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
 	case ${UNAME_MACHINE} in
 	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
+		echo i386-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
 	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
+		echo x86_64-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
+		echo ${UNAME_MACHINE}-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
@@ -817,21 +820,24 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:3456*)
+    *:Interix*:*)
     	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd | genuineintel)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
+	    authenticamd | genuineintel | EM64T)
+		echo x86_64-${VENDOR}-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
+		echo ia64-${VENDOR}-interix${UNAME_RELEASE}
 		exit ;;
 	esac ;;
     34586:Windows_95:* | 34586:Windows_98:* | 34586:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -842,25 +848,39 @@
 	echo ${UNAME_MACHINE}-pc-uwin
 	exit ;;
     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
+	echo x86_64-${VENDOR}-cygwin
 	exit ;;
     p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
+	echo powerpcle-${VENDOR}-cygwin
 	exit ;;

atmos-2.97.3.tar.gz/third-party/yalpa/config.sub -> atmos-2.97.4.tar.gz/third-party/yalpa/config.sub Changed

atmos-2.97.3.tar.gz/third-party/yalpa/configure -> atmos-2.97.4.tar.gz/third-party/yalpa/configure Changed

@@ -1,20 +1,24 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yalpa 0.1.
+# Generated by GNU Autoconf 2.68 for yalpa 0.1.
 #
 # Report bugs to <matwey.kornilov@gmail.com>.
 #
+#
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
+#
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -22,23 +26,15 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
 as_nl='
 '
 export as_nl
@@ -46,7 +42,13 @@
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -57,7 +59,7 @@
     as_echo_body='eval expr "X$1" : "X\$.*\$"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in
+      case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\$.*\$$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
@@ -80,13 +82,6 @@
   }
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -96,15 +91,16 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+as_myself=
+case $0 in #((
   *\\/* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -116,12 +112,16 @@
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -133,330 +133,315 @@
 LANGUAGE=C
 export LANGUAGE
 
-# Required to use basename.
-if expr a : '$a$' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*$...$'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/$^/^/*$/*$' \| \
-	 X"$0" : 'X$//$$' \| \
-	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/$^/^/*$\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/$\/\/$$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/$\/$.*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
 # CDPATH.
-$as_unset CDPATH
-
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
 else
-  as_have_required=no
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;

atmos-2.97.3.tar.gz/third-party/yalpa/doc/Makefile.in -> atmos-2.97.4.tar.gz/third-party/yalpa/doc/Makefile.in Changed

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -68,6 +68,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -91,6 +92,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -103,6 +105,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
@@ -115,6 +118,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -148,7 +152,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

atmos-2.97.3.tar.gz/third-party/yalpa/include/Makefile.in -> atmos-2.97.4.tar.gz/third-party/yalpa/include/Makefile.in Changed

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -108,6 +108,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -131,6 +132,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -143,6 +145,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
@@ -155,6 +158,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -188,7 +192,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -252,7 +255,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --!k*);; \
@@ -277,7 +280,7 @@
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --!k*);; \

atmos-2.97.3.tar.gz/third-party/yalpa/include/yalpa/Makefile.in -> atmos-2.97.4.tar.gz/third-party/yalpa/include/yalpa/Makefile.in Changed

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -95,6 +95,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -118,6 +119,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -130,6 +132,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
@@ -142,6 +145,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -175,7 +179,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

atmos-2.97.3.tar.gz/third-party/yalpa/include/yalpa/yalpa_config.h.in -> atmos-2.97.4.tar.gz/third-party/yalpa/include/yalpa/yalpa_config.h.in Changed

atmos-2.97.3.tar.gz/third-party/yalpa/ltmain.sh -> atmos-2.97.4.tar.gz/third-party/yalpa/ltmain.sh Changed

@@ -1,9 +1,9 @@
-# Generated from ltmain.m4sh.
 
-# ltmain.sh (GNU libtool) 2.2.6
+# libtool (GNU libtool) 2.4
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -32,50 +32,56 @@
 #
 # Provide generalized library-building support services.
 #
-#     --config             show all configuration variables
-#     --debug              enable verbose shell tracing
-# -n, --dry-run            display commands without modifying any files
-#     --features           display basic configuration information and exit
-#     --mode=MODE          use operation mode MODE
-#     --preserve-dup-deps  don't remove duplicate dependency libraries
-#     --quiet, --silent    don't print informational messages
-#     --tag=TAG            use configuration variables from tag TAG
-# -v, --verbose            print informational messages (default)
-#     --version            print version information
-# -h, --help               print short or long help message
+#       --config             show all configuration variables
+#       --debug              enable verbose shell tracing
+#   -n, --dry-run            display commands without modifying any files
+#       --features           display basic configuration information and exit
+#       --mode=MODE          use operation mode MODE
+#       --preserve-dup-deps  don't remove duplicate dependency libraries
+#       --quiet, --silent    don't print informational messages
+#       --no-quiet, --no-silent
+#                            print informational messages (default)
+#       --tag=TAG            use configuration variables from tag TAG
+#   -v, --verbose            print more informational messages than default
+#       --no-verbose         don't print the extra informational messages
+#       --version            print version information
+#   -h, --help, --help-all   print short, long, or detailed help message
 #
 # MODE must be one of the following:
 #
-#       clean              remove files from the build directory
-#       compile            compile a source file into a libtool object
-#       execute            automatically set library path, then run a program
-#       finish             complete the installation of libtool libraries
-#       install            install libraries or executables
-#       link               create a library or an executable
-#       uninstall          remove libraries from an installed directory
+#         clean              remove files from the build directory
+#         compile            compile a source file into a libtool object
+#         execute            automatically set library path, then run a program
+#         finish             complete the installation of libtool libraries
+#         install            install libraries or executables
+#         link               create a library or an executable
+#         uninstall          remove libraries from an installed directory
 #
-# MODE-ARGS vary depending on the MODE.
+# MODE-ARGS vary depending on the MODE.  When passed as first option,
+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
 # Try `$progname --help --mode=MODE' for a more detailed description of MODE.
 #
 # When reporting a bug, please describe a test case to reproduce it and
 # include the following information:
 #
-#       host-triplet:	$host
-#       shell:		$SHELL
-#       compiler:		$LTCC
-#       compiler flags:		$LTCFLAGS
-#       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6
-#       automake:		$automake_version
-#       autoconf:		$autoconf_version
+#         host-triplet:	$host
+#         shell:		$SHELL
+#         compiler:		$LTCC
+#         compiler flags:		$LTCFLAGS
+#         linker:		$LD (gnu? $with_gnu_ld)
+#         $progname:	(GNU libtool) 2.4
+#         automake:	$automake_version
+#         autoconf:	$autoconf_version
 #
 # Report bugs to <bug-libtool@gnu.org>.
+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+# General help using GNU software: <http://www.gnu.org/gethelp/>.
 
-PROGRAM=ltmain.sh
+PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.2.6
+VERSION=2.4
 TIMESTAMP=""
-package_revision=1.3012
+package_revision=1.3293
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -91,10 +97,15 @@
 BIN_SH=xpg4; export BIN_SH # for Tru64
 DUALCASE=1; export DUALCASE # for MKS sh
 
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
 # NLS nuisances: We save the old values to restore during execute mode.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
 lt_user_locale=
 lt_safe_locale=
 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
@@ -107,24 +118,33 @@
 	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
 	fi"
 done
+LC_ALL=C
+LANGUAGE=C
+export LANGUAGE LC_ALL
 
 $lt_unset CDPATH
 
 
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
 
 
 
 : ${CP="cp -f"}
-: ${ECHO="echo"}
-: ${EGREP="/usr/bin/grep -E"}
-: ${FGREP="/usr/bin/grep -F"}
-: ${GREP="/usr/bin/grep"}
+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+: ${EGREP="grep -E"}
+: ${FGREP="grep -F"}
+: ${GREP="grep"}
 : ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="/opt/local/bin/gsed"}
+: ${SED="sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -144,6 +164,27 @@
 dirname="s,/^/*$,,"
 basename="s,^.*/,,"
 
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+} # func_dirname may be replaced by extended shell implementation
+
+
+# func_basename file
+func_basename ()
+{
+    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+} # func_basename may be replaced by extended shell implementation
+
+
 # func_dirname_and_basename file append nondir_replacement
 # perform func_basename and func_dirname in a single function
 # call:
@@ -158,33 +199,183 @@
 # those functions but instead duplicate the functionality here.
 func_dirname_and_basename ()
 {
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+    # Extract subdirectory from the argument.
+    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`

atmos-2.97.3.tar.gz/third-party/yalpa/m4/libtool.m4 -> atmos-2.97.4.tar.gz/third-party/yalpa/m4/libtool.m4 Changed

@@ -1,7 +1,8 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+#                 Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -10,7 +11,8 @@
 
 m4_define(_LT_COPYING, dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+#                 Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -37,7 +39,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 )
 
-# serial 56 LT_INIT
+# serial 57 LT_INIT
 
 
 # LT_PREREQ(VERSION)
@@ -66,6 +68,7 @@
 # ------------------
 AC_DEFUN(LT_INIT,
 AC_PREREQ(2.58)dnl We use AC_INCLUDES_DEFAULT
+AC_REQUIRE(AC_CONFIG_AUX_DIR_DEFAULT)dnl
 AC_BEFORE($0, LT_LANG)dnl
 AC_BEFORE($0, LT_OUTPUT)dnl
 AC_BEFORE($0, LTDL_INIT)dnl
@@ -82,6 +85,8 @@
 AC_REQUIRE(LTOBSOLETE_VERSION)dnl
 m4_require(_LT_PROG_LTMAIN)dnl
 
+_LT_SHELL_INIT(SHELL=${CONFIG_SHELL-/bin/sh})
+
 dnl Parse OPTIONS
 _LT_SET_OPTIONS($0, $1)
 
@@ -118,7 +123,7 @@
     *) break;;
   esac
 done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 )
 
 
@@ -138,6 +143,9 @@
 m4_defun(_LT_SETUP,
 AC_REQUIRE(AC_CANONICAL_HOST)dnl
 AC_REQUIRE(AC_CANONICAL_BUILD)dnl
+AC_REQUIRE(_LT_PREPARE_SED_QUOTE_VARS)dnl
+AC_REQUIRE(_LT_PROG_ECHO_BACKSLASH)dnl
+
 _LT_DECL(, host_alias, 0, The host system)dnl
 _LT_DECL(, host, 0)dnl
 _LT_DECL(, host_os, 0)dnl
@@ -160,10 +168,13 @@
 dnl
 m4_require(_LT_FILEUTILS_DEFAULTS)dnl
 m4_require(_LT_CHECK_SHELL_FEATURES)dnl
+m4_require(_LT_PATH_CONVERSION_FUNCTIONS)dnl
 m4_require(_LT_CMD_RELOAD)dnl
 m4_require(_LT_CHECK_MAGIC_METHOD)dnl
+m4_require(_LT_CHECK_SHAREDLIB_FROM_LINKLIB)dnl
 m4_require(_LT_CMD_OLD_ARCHIVE)dnl
 m4_require(_LT_CMD_GLOBAL_SYMBOLS)dnl
+m4_require(_LT_WITH_SYSROOT)dnl
 
 _LT_CONFIG_LIBTOOL_INIT(
 # See if we are running on zsh, and set the options which allow our
@@ -179,7 +190,6 @@
 _LT_CHECK_OBJDIR
 
 m4_require(_LT_TAG_COMPILER)dnl
-_LT_PROG_ECHO_BACKSLASH
 
 case $host_os in
 aix3*)
@@ -193,23 +203,6 @@
   ;;
 esac
 
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/$"`$\\$/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/$"`\\$/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
 # Global variables:
 ofile=libtool
 can_build_shared=yes
@@ -250,6 +243,28 @@
 )# _LT_SETUP
 
 
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun(_LT_PREPARE_SED_QUOTE_VARS,
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/$"`$\\$/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/$"`\\$/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+)
+
 # _LT_PROG_LTMAIN
 # ---------------
 # Note that this code is called both from `configure', and `config.status'
@@ -408,7 +423,7 @@
 # declaration there will have the same value as in `configure'.  VARNAME
 # must have a single quote delimited value for this to work.
 m4_define(_LT_CONFIG_STATUS_DECLARE,
-$1='`$ECHO "X$$1" | $Xsed -e "$delay_single_quote_subst"`')
+$1='`$ECHO "$$1" | $SED "$delay_single_quote_subst"`')
 
 
 # _LT_CONFIG_STATUS_DECLARATIONS
@@ -418,7 +433,7 @@
 # embedded single quotes properly.  In configure, this macro expands
 # each variable declared with _LT_DECL (and _LT_TAGDECL) into:
 #
-#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
 m4_defun(_LT_CONFIG_STATUS_DECLARATIONS,
 m4_foreach(_lt_var, m4_quote(lt_decl_all_varnames),
     m4_n(_LT_CONFIG_STATUS_DECLARE(_lt_var))))
@@ -517,12 +532,20 @@
 LTCFLAGS='$LTCFLAGS'
 compiler='$compiler_DEFAULT'
 
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
 # Quote evaled strings.
 for var in lt_decl_all_varnames( \
 , lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *\\\\\\\`\\"\\\$*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -533,9 +556,9 @@
 # Double-quote double-evaled strings.
 for var in lt_decl_all_varnames( \
 , lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *\\\\\\\`\\"\\\$*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -543,16 +566,38 @@
     esac
 done
 
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\$0 --fallback-echo"')dnl "

atmos-2.97.3.tar.gz/third-party/yalpa/m4/ltoptions.m4 -> atmos-2.97.4.tar.gz/third-party/yalpa/m4/ltoptions.m4 Changed

@@ -1,13 +1,14 @@
 # Helper functions for option handling.                    -*- Autoconf -*-
 #
-#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
+#   Inc.
 #   Written by Gary V. Vaughan, 2004
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 6 ltoptions.m4
+# serial 7 ltoptions.m4
 
 # This is to help aclocal find these macros, as it can't see m4_define.
 AC_DEFUN(LTOPTIONS_VERSION, m4_if(1))
@@ -125,7 +126,7 @@
 enable_win32_dll=yes
 
 case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
   AC_CHECK_TOOL(AS, as, false)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   AC_CHECK_TOOL(OBJDUMP, objdump, false)
@@ -133,13 +134,13 @@
 esac
 
 test -z "$AS" && AS=as
-_LT_DECL(, AS,      0, Assembler program)dnl
+_LT_DECL(, AS,      1, Assembler program)dnl
 
 test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL(, DLLTOOL, 0, DLL creation program)dnl
+_LT_DECL(, DLLTOOL, 1, DLL creation program)dnl
 
 test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL(, OBJDUMP, 0, Object dumper program)dnl
+_LT_DECL(, OBJDUMP, 1, Object dumper program)dnl
 )# win32-dll
 
 AU_DEFUN(AC_LIBTOOL_WIN32_DLL,

atmos-2.97.3.tar.gz/third-party/yalpa/m4/ltversion.m4 -> atmos-2.97.4.tar.gz/third-party/yalpa/m4/ltversion.m4 Changed

atmos-2.97.3.tar.gz/third-party/yalpa/m4/lt~obsolete.m4 -> atmos-2.97.4.tar.gz/third-party/yalpa/m4/lt~obsolete.m4 Changed

@@ -1,13 +1,13 @@
 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
-#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004.
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 4 lt~obsolete.m4
+# serial 5 lt~obsolete.m4
 
 # These exist entirely to fool aclocal when bootstrapping libtool.
 #
@@ -77,7 +77,6 @@
 m4_ifndef(_LT_AC_LANG_CXX,		AC_DEFUN(_LT_AC_LANG_CXX))
 m4_ifndef(_LT_AC_LANG_F77,		AC_DEFUN(_LT_AC_LANG_F77))
 m4_ifndef(_LT_AC_LANG_GCJ,		AC_DEFUN(_LT_AC_LANG_GCJ))
-m4_ifndef(AC_LIBTOOL_RC,		AC_DEFUN(AC_LIBTOOL_RC))
 m4_ifndef(AC_LIBTOOL_LANG_C_CONFIG,	AC_DEFUN(AC_LIBTOOL_LANG_C_CONFIG))
 m4_ifndef(_LT_AC_LANG_C_CONFIG,	AC_DEFUN(_LT_AC_LANG_C_CONFIG))
 m4_ifndef(AC_LIBTOOL_LANG_CXX_CONFIG,	AC_DEFUN(AC_LIBTOOL_LANG_CXX_CONFIG))
@@ -90,3 +89,10 @@
 m4_ifndef(_LT_AC_LANG_RC_CONFIG,	AC_DEFUN(_LT_AC_LANG_RC_CONFIG))
 m4_ifndef(AC_LIBTOOL_CONFIG,		AC_DEFUN(AC_LIBTOOL_CONFIG))
 m4_ifndef(_LT_AC_FILE_LTDLL_C,	AC_DEFUN(_LT_AC_FILE_LTDLL_C))
+m4_ifndef(_LT_REQUIRED_DARWIN_CHECKS,	AC_DEFUN(_LT_REQUIRED_DARWIN_CHECKS))
+m4_ifndef(_LT_AC_PROG_CXXCPP,		AC_DEFUN(_LT_AC_PROG_CXXCPP))
+m4_ifndef(_LT_PREPARE_SED_QUOTE_VARS,	AC_DEFUN(_LT_PREPARE_SED_QUOTE_VARS))
+m4_ifndef(_LT_PROG_ECHO_BACKSLASH,	AC_DEFUN(_LT_PROG_ECHO_BACKSLASH))
+m4_ifndef(_LT_PROG_F77,		AC_DEFUN(_LT_PROG_F77))
+m4_ifndef(_LT_PROG_FC,		AC_DEFUN(_LT_PROG_FC))
+m4_ifndef(_LT_PROG_CXX,		AC_DEFUN(_LT_PROG_CXX))

atmos-2.97.3.tar.gz/third-party/yalpa/src/Makefile.in -> atmos-2.97.4.tar.gz/third-party/yalpa/src/Makefile.in Changed

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -114,6 +114,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -137,6 +138,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -149,6 +151,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
@@ -161,6 +164,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -194,7 +198,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

atmos-2.97.3.tar.gz/third-party/yalpa/test/Makefile.in -> atmos-2.97.4.tar.gz/third-party/yalpa/test/Makefile.in Changed

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -96,6 +96,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -119,6 +120,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -131,6 +133,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
@@ -143,6 +146,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -176,7 +180,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

Changes of Revision 14