Open Build Service

atmos.spec Changed

@@ -1,5 +1,5 @@
 #
-# spec file for package atmos (Version 2.97.4)
+# spec file for package atmos (Version 2.97.5)
 #
 # Copyright (c) 2011 Matwey V. Kornilov.
 # This file and all modifications and additions to the pristine
@@ -13,13 +13,11 @@
 BuildRequires:  make gcc gcc-c++ gsl-devel boost-devel
 Summary:        MASS/DIMM data processing tool
 Name:           atmos
-Version:        2.97.4
+Version:        2.97.5
 Release:        1
 Source:         %{name}-%{version}.tar.gz
 Source1:        spectra.tar.gz
 Source2:        crv.tar.gz
-Patch0:         atmos-r269.diff
-Patch1:         yalpa-copysign.diff
 License:        GPL-3.0+
 Group:          Productivity/Scientific/Astronomy
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -37,8 +35,6 @@
 
 %prep
 %setup
-%patch0
-%patch1
 
 %build
 CPPFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix}
@@ -64,6 +60,8 @@
 %attr(644,root,root) %{_datadir}/atmos/spectra/*
 
 %changelog
+* Thu Oct 02 2014 - matwey.kornilov@gmail.com
+- version 2.97.5
 * Thu Dec 01 2011 - matwey.kornilov@gmail.com
 - version 2.97.4
 - patches for boost value_factory

atmos-r269.diff Deleted

@@ -1,43 +0,0 @@
---- configure.in	(revision 259)
-+++ configure.in	(revision 269)
-@@ -47,6 +47,7 @@
- 
- AC_CHECK_HEADERS(boost/math/tools/roots.hpp \
- 	boost/math/tools/tuple.hpp \
-+	boost/functional/value_factory.hpp \
- 	tr1/tuple)
- 
- AC_CHECK_HEADERS(gsl/gsl_errno.h \
---- src/caching_factory.h	(revision 259)
-+++ src/caching_factory.h	(revision 269)
-@@ -25,8 +25,19 @@
- 
- #include <map>
- 
--#include <boost/functional/value_factory.hpp>
-+#ifdef HAVE_CONFIG_H
-+# include "config.h" 
-+#else
-+# define HAVE_BOOST_FUNCTIONAL_VALUE_FACTORY_HPP
-+#endif
- 
-+#ifdef HAVE_BOOST_FUNCTIONAL_VALUE_FACTORY_HPP
-+# include <boost/functional/value_factory.hpp>
-+# define DEFAULT_CREATE_FACTORY_TOKEN =boost::value_factory<T>
-+#else
-+# define DEFAULT_CREATE_FACTORY_TOKEN
-+#endif
-+
- #include <boost/preprocessor/arithmetic/inc.hpp>
- #include <boost/preprocessor/repetition/enum_binary_params.hpp>
- #include <boost/preprocessor/repetition/enum_params.hpp>
-@@ -35,7 +46,8 @@
- namespace utils {
- namespace algo {
- 
--template< class T, class Key, class Create = boost::value_factory<T>, class Container = std::map<Key,T> > class caching_factory {
-+template< class T, class Key, class Create DEFAULT_CREATE_FACTORY_TOKEN, class Container = std::map<Key,T> > class caching_factory {
-+#undef DEFAULT_CREATE_FACTORY_TOKEN
- public:
- 	typedef T       value_type;
- 	typedef Key     key_type;

yalpa-copysign.diff Deleted

@@ -1,96 +0,0 @@
---- third-party/yalpa/test/io.cpp	(revision 0)
-+++ third-party/yalpa/test/io.cpp	(revision 16)
-@@ -0,0 +1,21 @@
-+#include <iostream>
-+#include <sstream>
-+#include <string>
-+
-+#include <yalpa/io.h>
-+#include <yalpa/spheric.h>
-+
-+int main( int argc, char** argv ){
-+	using namespace yalpa;
-+
-+	double ra;
-+
-+	std::string str1="-00 02 03";
-+	std::istringstream stm1(str1);
-+	
-+	stm1 >> std::hours >> std::sexagesimal >> yalpa::make_angle(ra);
-+	std::cout << ra << std::endl;
-+	std::cout << std::degrees << std::sexagesimal << yalpa::make_angle(ra) << std::endl;
-+	
-+	return 0;
-+}
---- third-party/yalpa/test/Makefile.am	(revision 14)
-+++ third-party/yalpa/test/Makefile.am	(revision 16)
-@@ -1,4 +1,4 @@
--bin_PROGRAMS = convert julian sun
-+bin_PROGRAMS = convert julian sun io
- convert_SOURCES = convert.cpp
- convert_CPPFLAGS = -I @abs_top_srcdir@/include
- convert_LDADD = @abs_top_builddir@/src/libyalpa.la
-@@ -8,3 +8,6 @@
- sun_SOURCES = sun.cpp
- sun_CPPFLAGS = -I @abs_top_srcdir@/include
- sun_LDADD = @abs_top_builddir@/src/libyalpa.la
-+io_SOURCES = io.cpp
-+io_CPPFLAGS = -I @abs_top_srcdir@/include
-+io_LDADD = @abs_top_builddir@/src/libyalpa.la
---- third-party/yalpa/include/yalpa/io.h	(revision 14)
-+++ third-party/yalpa/include/yalpa/io.h	(revision 16)
-@@ -23,6 +23,8 @@
- #include <iosfwd>
- #include <iostream>
- 
-+#include <boost/math/special_functions/sign.hpp>
-+
- namespace yalpa {
- 	
- 	template<class T> struct angle {
-@@ -81,14 +83,16 @@
- 			if( is_degrees(stm) ){
- 				T degree = val()/M_PI*180;
- 				if( is_sexagesimal(stm) ) {
--					stm << int(degree) << stm.fill() << int(std::abs(60*std::fmod(degree,1.0))) << stm.fill() << std::abs((3600*std::fmod(degree,1.0/60.0)));
-+					if( val() < 0 ) { stm << "-"; }
-+					stm << int(std::abs(degree)) << stm.fill() << int(std::abs(60*std::fmod(degree,1.0))) << stm.fill() << std::abs((3600*std::fmod(degree,1.0/60.0)));
- 				} else {
- 					stm << degree;
- 				}
- 			}else if( is_hours(stm) ){
- 				T hour = val()/M_PI*12;
- 				if( is_sexagesimal(stm) ) {
--					stm << int(hour) << stm.fill() << int(std::abs(60*std::fmod(hour,1.0))) << stm.fill() << std::abs((3600*std::fmod(hour,1.0/60.0)));
-+					if( val() < 0 ) { stm << "-"; }
-+					stm << int(std::abs(hour)) << stm.fill() << int(std::abs(60*std::fmod(hour,1.0))) << stm.fill() << std::abs((3600*std::fmod(hour,1.0/60.0)));
- 				} else {
- 					stm << hour;
- 				}
-@@ -99,6 +103,8 @@
- 		return stm;
- 	}
- 	template<class T> std::istream& operator>>( std::istream& stm, yalpa::angle<T> val ) {
-+		using boost::math::copysign;
-+		
- 		std::istream::sentry se(stm);
- 		if( se ){
- 			if( is_degrees(stm) ){
-@@ -106,7 +112,7 @@
- 				if( is_sexagesimal(stm) ) {
- 					T deg,min,sec;
- 					stm >> deg >> min >> sec;
--					val() = ( deg < 0 ? -1 : 1 ) * ( std::abs(deg) + min/60.0 + sec/3600.0 ) / 180.0 * M_PI;
-+					val() = copysign( ( std::abs(deg) + min/60.0 + sec/3600.0 ) / 180.0 * M_PI, deg );
- 				} else {
- 					stm >> degree;
- 					val() = degree / 180.0 * M_PI;
-@@ -116,7 +122,7 @@
- 				if( is_sexagesimal(stm) ) {
- 					T hour,min,sec;
- 					stm >> hour >> min >> sec;
--					val() = ( hour < 0 ? -1 : 1 ) * ( std::abs(hour) + min/60.0 + sec/3600.0 ) / 12.0 * M_PI;
-+					val() = copysign( ( std::abs(hour) + min/60.0 + sec/3600.0 ) / 12.0 * M_PI, hour );
- 				} else {
- 					stm >> hour;
- 					val() = hour / 12.0 * M_PI;

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

@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -226,6 +226,11 @@
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
@@ -304,9 +309,10 @@
 overridden in the site shell script).
 
 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
 
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
@@ -362,4 +368,3 @@
 
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
-

atmos-2.97.4.tar.gz/Makefile.am -> atmos-2.97.5.tar.gz/Makefile.am Changed

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

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.12.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in 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.
@@ -15,6 +14,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -54,21 +70,30 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir dist dist-all distcheck
+	cscope distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
+CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^$^/*$/.*$$,\1,'; \
@@ -96,7 +121,10 @@
   reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -185,11 +213,11 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = third-party src
+SUBDIRS = third-party src test
 all: all-recursive
 
 .SUFFIXES:
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -225,11 +253,11 @@
 $(am__aclocal_m4_deps):
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (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):
 	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
@@ -293,6 +321,10 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
+cscopelist-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
+	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -356,8 +388,32 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+
+clean-cscope:
+	-rm -f cscope.files
+
+cscope.files: clean-cscope cscopelist-recursive cscopelist
+
+cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
@@ -393,13 +449,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -428,36 +481,36 @@
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
 
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__post_remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz

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

@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.1 -*- Autoconf -*-
+
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 # 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.
@@ -13,28 +13,30 @@
 
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
-m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.68,,
-m4_warning(this file was generated for autoconf 2.68.
+m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.69,,
+m4_warning(this file was generated for autoconf 2.69.
 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'.))
+To do so, use the procedure documented by the package, typically 'autoreconf'.))
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
 #
 # 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 8
+
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN(AM_AUTOMAKE_VERSION,
-am__api_version='1.11'
+am__api_version='1.12'
 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.1, ,
+m4_if($1, 1.12.1, ,
       AC_FATAL(Do not call $0, use AM_INIT_AUTOMAKE($1).))dnl
 )
 
@@ -50,22 +52,24 @@
 # 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.1)dnl
+AM_AUTOMAKE_VERSION(1.12.1)dnl
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
 _AM_AUTOCONF_VERSION(m4_defn(AC_AUTOCONF_VERSION)))
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
 #
 # 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 2
+
 # For projects using AC_CONFIG_AUX_DIR(foo), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory.  The problem is that $srcdir (and
@@ -84,7 +88,7 @@
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -110,22 +114,21 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
 #
 # 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 9
+# serial 10
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN(AM_CONDITIONAL,
-AC_PREREQ(2.52)dnl
- ifelse($1, TRUE,  AC_FATAL($0: invalid condition: $1),
-	$1, FALSE, AC_FATAL($0: invalid condition: $1))dnl
+AC_PREREQ(2.52)dnl
+ m4_if($1, TRUE,  AC_FATAL($0: invalid condition: $1),
+       $1, FALSE, AC_FATAL($0: invalid condition: $1))dnl
 AC_SUBST($1_TRUE)dnl
 AC_SUBST($1_FALSE)dnl
 _AM_SUBST_NOTMAKE($1_TRUE)dnl
@@ -144,16 +147,15 @@
 Usually this means the macro was only invoked conditionally.)
 fi))
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
 #
 # 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 10
+# serial 17
 
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery.  Also note that it means that autoscan, seeing
@@ -163,7 +165,7 @@
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -176,12 +178,13 @@
 AC_REQUIRE(AM_MAKE_INCLUDE)dnl
 AC_REQUIRE(AM_DEP_TRACK)dnl
 
-ifelse($1, CC,   depcc="$CC"   am_compiler_list=,
-       $1, CXX,  depcc="$CXX"  am_compiler_list=,
-       $1, OBJC, depcc="$OBJC" am_compiler_list='gcc3 gcc',
-       $1, UPC,  depcc="$UPC"  am_compiler_list=,
-       $1, GCJ,  depcc="$GCJ"  am_compiler_list='gcc3 gcc',
-                   depcc="$$1"   am_compiler_list=)
+m4_if($1, CC,   depcc="$CC"   am_compiler_list=,
+      $1, CXX,  depcc="$CXX"  am_compiler_list=,
+      $1, OBJC, depcc="$OBJC" am_compiler_list='gcc3 gcc',
+      $1, OBJCXX, depcc="$OBJCXX" am_compiler_list='gcc3 gcc',
+      $1, UPC,  depcc="$UPC"  am_compiler_list=,
+      $1, GCJ,  depcc="$GCJ"  am_compiler_list='gcc3 gcc',
+                    depcc="$$1"   am_compiler_list=)
 
 AC_CACHE_CHECK(dependency style of $depcc,
                am_cv_$1_dependencies_compiler_type,
@@ -189,8 +192,9 @@
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -229,16 +233,16 @@
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -247,16 +251,16 @@
       test "$am__universal" = false || continue

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

@@ -1,13 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for atmos 2.97.4.
+# Generated by GNU Autoconf 2.69 for atmos 2.97.5.
 #
 # 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, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -169,7 +192,8 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -214,21 +238,25 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -331,6 +359,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -452,6 +488,10 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $0, causing all sort of problems
   # (the dirname of $0 is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -486,16 +526,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -507,28 +547,8 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???sx*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g'"
@@ -560,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='atmos'
 PACKAGE_TARNAME='atmos'
-PACKAGE_VERSION='2.97.4'
-PACKAGE_STRING='atmos 2.97.4'
+PACKAGE_VERSION='2.97.5'
+PACKAGE_STRING='atmos 2.97.5'
 PACKAGE_BUGREPORT='mass-general@curl.sai.msu.ru'
 PACKAGE_URL=''
 
@@ -614,6 +634,7 @@
 am__fastdepCXX_FALSE
 am__fastdepCXX_TRUE
 CXXDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -1162,8 +1183,6 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe

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

atmos-2.97.4.tar.gz/depcomp -> atmos-2.97.5.tar.gz/depcomp Changed

@@ -1,10 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-03-27.16; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
 
 # 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
@@ -28,7 +27,7 @@
 
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
@@ -40,11 +39,11 @@
 
 Environment variables:
   depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
+  tmpdepfile  Temporary file to use when outputting dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
@@ -57,6 +56,12 @@
     ;;
 esac
 
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
@@ -90,10 +95,24 @@
    # This is just like msvisualcpp but w/o cygpath translation.
    # Just convert the backslash-escaped backslashes to single forward
    # slashes to satisfy depend.m4
-   cygpath_u="sed s,\\\\\\\\,/,g"
+   cygpath_u='sed s,\\\\,/,g'
    depmode=msvisualcpp
 fi
 
+if test "$depmode" = msvc7msys; then
+   # This is just like msvc7 but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u='sed s,\\\\,/,g'
+   depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
+   gccflag=-qmakedep=gcc,-MF
+   depmode=gcc
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -148,20 +167,21 @@
 ## The second -e expression handles DOS-style file names with drive letters.
   sed -e 's/^^:*: / /' \
       -e 's/^'$alpha':\/^:*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
+## This next piece of magic avoids the "deleted header file" problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
+  tr ' ' "$nl" < "$tmpdepfile" |
+## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+      | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -193,18 +213,15 @@
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
     # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
+    # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
     | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> "$depfile"
+    tr "$nl" ' ' >> "$depfile"
     echo >> "$depfile"
 
     # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
    >> "$depfile"
   else
@@ -216,10 +233,17 @@
   rm -f "$tmpdepfile"
   ;;
 
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies
   # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
   dir=`echo "$object" | sed -e 's|/^/*$|/|'`
@@ -249,12 +273,11 @@
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
+    # Each line is of the form 'foo.o: dependent.h'.
     # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
+    # '$object: dependent.h' and one to simply 'dependent.h:'.
     sed -e "s,^.*\.a-z*:,$object:," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the .
-    sed -e 's,^.*\.a-z*:	 *,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+    sed -e 's,^.*\.a-z*:'"$tab"' *,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -265,23 +288,26 @@
   ;;
 
 icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
+  # However on
+  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
   # ICC 7.0 will fill foo.d with something like
   #    foo.o: sub/foo.c
   #    foo.o: sub/foo.h
-  # which is wrong.  We want:
+  # which is wrong.  We want
   #    sub/foo.o: sub/foo.c
   #    sub/foo.o: sub/foo.h
   #    sub/foo.c:
   #    sub/foo.h:
   # ICC 7.1 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
+  # and will wrap long lines using '\':
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
-
+  # tcc 0.9.26 (FIXME still under development at the moment of writing)
+  # will emit a similar output, but also prepend the continuation lines
+  # with horizontal tabulation characters.
   "$@" -MD -MF "$tmpdepfile"
   stat=$?
   if test $stat -eq 0; then :
@@ -290,15 +316,21 @@
     exit $stat
   fi
   rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.

atmos-2.97.4.tar.gz/install-sh -> atmos-2.97.5.tar.gz/install-sh Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-11-20.07; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
@@ -156,6 +156,10 @@
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+	# Protect names problematic for 'test' and other utilities.
+	case $dst_arg in
+	  -* | =!) dst_arg=./$dst_arg;;
+	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | =!) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -194,13 +202,17 @@
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call `install-sh -d' without argument.
+  # It's OK to call 'install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for 'test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | =!) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -347,7 +354,7 @@
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
+		   # other-writable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in
@@ -385,7 +392,7 @@
 
       case $dstdir in
 	/*) prefix='/';;
-	-*) prefix='./';;
+	-=!*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@
 
       for d
       do
-	test -z "$d" && continue
+	test X"$d" = X && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then

atmos-2.97.4.tar.gz/missing -> atmos-2.97.5.tar.gz/missing Changed

@@ -1,10 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.18; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -26,7 +25,7 @@
 # the same distribution terms that you use for the rest of that program.
 
 if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
+  echo 1>&2 "Try '$0 --help' for more information"
   exit 1
 fi
 
@@ -34,7 +33,7 @@
 sed_output='s/.* --output =$^ *$.*/\1/p'
 sed_minuso='s/.* -o $^ *$.*/\1/p'
 
-# In the cases where this matters, `missing' is being run in the
+# In the cases where this matters, 'missing' is being run in the
 # srcdir already.
 if test -f configure.ac; then
   configure_ac=configure.ac
@@ -65,7 +64,7 @@
     echo "\
 $0 OPTION... PROGRAM ARGUMENT...
 
-Handle \`PROGRAM ARGUMENT...' for when PROGRAM is missing, or return an
+Handle 'PROGRAM ARGUMENT...' for when PROGRAM is missing, or return an
 error status if there is no known handling for PROGRAM.
 
 Options:
@@ -74,21 +73,20 @@
   --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
+  aclocal      touch file 'aclocal.m4'
+  autoconf     touch file 'configure'
+  autoheader   touch file 'config.h.in'
   autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.ch', if possible, from existing .ch
-  flex         create \`lex.yy.c', if possible, from existing .c
+  automake     touch all 'Makefile.in' files
+  bison        create 'y.tab.ch', if possible, from existing .ch
+  flex         create 'lex.yy.c', if possible, from existing .c
   help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
+  lex          create 'lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.ch', if possible, from existing .ch
+  yacc         create 'y.tab.ch', if possible, from existing .ch
 
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
 
 Send bug reports to <bug-automake@gnu.org>."
     exit $?
@@ -100,8 +98,8 @@
     ;;
 
   -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
+    echo 1>&2 "$0: Unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
     exit 1
     ;;
 
@@ -122,22 +120,13 @@
     # Not GNU programs, they don't have --version.
     ;;
 
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
   *)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
        exit 1
     elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
        # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
+       # running '$TOOL --version' or '$TOOL --help' to check whether
        # $TOOL exists and not knowing $TOOL uses missing.
        exit 1
     fi
@@ -149,27 +138,27 @@
 case $program in
   aclocal*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
+WARNING: '$1' is $msg.  You should only need it if
+         you modified 'acinclude.m4' or '${configure_ac}'.  You might want
+         to install the Automake and Perl packages.  Grab them from
          any GNU archive site."
     touch aclocal.m4
     ;;
 
   autoconf*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+WARNING: '$1' is $msg.  You should only need it if
+         you modified '${configure_ac}'.  You might want to install the
+         Autoconf and GNU m4 packages.  Grab them from any GNU
          archive site."
     touch configure
     ;;
 
   autoheader*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+WARNING: '$1' is $msg.  You should only need it if
+         you modified 'acconfig.h' or '${configure_ac}'.  You might want
+         to install the Autoconf and GNU m4 packages.  Grab them
          from any GNU archive site."
     files=`sed -n 's/^ *ACM_CONFIG_HEADER($^)*$).*/\1/p' ${configure_ac}`
     test -z "$files" && files="config.h"
@@ -186,9 +175,9 @@
 
   automake*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
+WARNING: '$1' is $msg.  You should only need it if
+         you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'.
+         You might want to install the Automake and Perl packages.
          Grab them from any GNU archive site."
     find . -type f -name Makefile.am -print |
 	   sed 's/\.am$/.in/' |
@@ -197,10 +186,10 @@
 
   autom4te*)
     echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
+WARNING: '$1' is needed, but is $msg.
          You might have modified some files without having the
          proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
+         You can get '$1' as part of Autoconf from any GNU
          archive site."
 
     file=`echo "$*" | sed -n "$sed_output"`
@@ -220,13 +209,13 @@
 
   bison*|yacc*)
     echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
+WARNING: '$1' $msg.  You should only need it if
+         you modified a '.y' file.  You may need the Bison package
          in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
+         Bison from any GNU archive site."
     rm -f y.tab.c y.tab.h
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -250,13 +239,13 @@
 
   lex*|flex*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
+WARNING: '$1' is $msg.  You should only need it if
+         you modified a '.l' file.  You may need the Flex package
          in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
+         Flex from any GNU archive site."
     rm -f lex.yy.c

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

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

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.12.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in 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.
@@ -16,6 +15,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,7 +51,7 @@
 bin_PROGRAMS = atmos$(EXEEXT)
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/config.h.in
+	$(srcdir)/config.h.in $(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -70,6 +86,11 @@
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(atmos_SOURCES)
 DIST_SOURCES = $(atmos_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,7 +181,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-atmos_CPPFLAGS = -I @abs_top_srcdir@/third-party/lsp/include -I @abs_top_srcdir@/third-party/yalpa/include
+atmos_CPPFLAGS = -I @abs_top_srcdir@/third-party/lsp/include -I @abs_top_srcdir@/third-party/yalpa/include -DBOOST_UBLAS_SHALLOW_ARRAY_ADAPTOR
 atmos_SOURCES = apply_to_all.h \
 	atmos.h \
 	average.h \
@@ -184,6 +205,7 @@
 	spline.h \
 	table_storage.h \
 	typesdef.h \
+	ublas_math.h \
 	unstable_remove_if.h \
 	utils.h \
 	vector_generator.h \
@@ -244,10 +266,8 @@
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
+	@if test ! -f $@; then rm -f stamp-h1; else :; fi
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -261,8 +281,11 @@
 	-rm -f config.h stamp-h1
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
 	while read p p1; do if test -f $$p; \
@@ -296,7 +319,7 @@
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-atmos$(EXEEXT): $(atmos_OBJECTS) $(atmos_DEPENDENCIES) 
+atmos$(EXEEXT): $(atmos_OBJECTS) $(atmos_DEPENDENCIES) $(EXTRA_atmos_DEPENDENCIES) 
 	@rm -f atmos$(EXEEXT)
 	$(CXXLINK) $(atmos_OBJECTS) $(atmos_LDADD) $(LIBS)
 
@@ -580,6 +603,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -630,10 +667,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -717,7 +759,7 @@
 .MAKE: all install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic ctags distclean distclean-compile \
+	clean-generic cscopelist ctags distclean distclean-compile \
 	distclean-generic distclean-hdr distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-binPROGRAMS install-data install-data-am install-dvi \

atmos-2.97.4.tar.gz/src/apply_to_all.h -> atmos-2.97.5.tar.gz/src/apply_to_all.h Changed

@@ -1,5 +1,5 @@
 /*
-    $Id: apply_to_all.h 180 2011-01-30 15:56:33Z matwey $
+    $Id: apply_to_all.h 273 2012-02-22 09:42:17Z matwey $
     Copyright (C) 2009  Sternberg Astronomical Institute, MSU
 
     This program is free software: you can redistribute it and/or modify
@@ -19,75 +19,12 @@
 #ifndef _APPLY_TO_ALL_H
 #define _APPLY_TO_ALL_H
 
-#include <cmath>
-
-#include <boost/numeric/ublas/matrix_expression.hpp>
-#include <boost/numeric/ublas/vector_expression.hpp>
-
-#include "lambert.h"
+#include <boost/numeric/ublas/matrix.hpp>
+#include <boost/numeric/ublas/vector.hpp>
 
 namespace utils {
 namespace ublas {
 
-namespace detail {
-	template <class T> class inv {
-	public:
-		typedef T value_type;
-		typedef T result_type;
-		static result_type apply( const value_type& x) {
-			return value_type(1) / x;
-		}
-	};
-	template <class T> class exp {
-	public:
-		typedef T value_type;
-		typedef T result_type;
-		static result_type apply( const value_type& x) {
-			return std::exp( x );
-		}
-	};
-	template <class T> class log {
-	public:
-		typedef T value_type;
-		typedef T result_type;
-		static result_type apply( const value_type& x) {
-			return std::log( x );
-		}
-	};
-	template <class T> class lambert_W0 {
-	public:
-		typedef T value_type;
-		typedef T result_type;
-		static result_type apply( const value_type& x) {
-			return utils::math::lambert_W0(x);
-		}
-	};
-	template <class T> class sqrt {
-	public:
-		typedef T value_type;
-		typedef T result_type;
-		static result_type apply( const value_type& x) {
-			return std::sqrt(x);
-		}
-	};
-	template <class T> class xp1 {
-	public:
-		typedef T value_type;
-		typedef T result_type;
-		static result_type apply( const value_type& x) {
-			return x + value_type(1);
-		}
-	};
-	template <class T> class abs {
-	public:
-		typedef T value_type;
-		typedef T result_type;
-		static result_type apply( const value_type& x) {
-			return std::abs(x);
-		}
-	};
-}
-
 using namespace boost::numeric::ublas;
 
 /* examples from effective ublas are used here */
@@ -100,69 +37,6 @@
 	return expression_type (e ());
 }
 
-template<class E> BOOST_UBLAS_INLINE typename vector_unary_traits<E, detail::inv< typename E::value_type > >::result_type inv(const vector_expression<E> &e ) {
-	typedef typename E::value_type value_type;
-	return apply_to_all( e, detail::inv< value_type >() );
-}
-template<class E> BOOST_UBLAS_INLINE typename matrix_unary1_traits<E, detail::inv< typename E::value_type > >::result_type inv(const matrix_expression<E> &e ) {
-	typedef typename E::value_type value_type;
-	return apply_to_all( e, detail::inv< value_type >() );
-}
-
-template<class E> BOOST_UBLAS_INLINE typename vector_unary_traits<E, detail::exp< typename E::value_type > >::result_type exp(const vector_expression<E> &e ) {
-	typedef typename E::value_type value_type;
-	return apply_to_all( e, detail::exp< value_type >() );
-}
-template<class E> BOOST_UBLAS_INLINE typename matrix_unary1_traits<E, detail::exp< typename E::value_type > >::result_type exp(const matrix_expression<E> &e ) {
-	typedef typename E::value_type value_type;
-	return apply_to_all( e, detail::exp< value_type >() );
-}
-
-template<class E> BOOST_UBLAS_INLINE typename vector_unary_traits<E, detail::log< typename E::value_type > >::result_type log(const vector_expression<E> &e ) {
-	typedef typename E::value_type value_type;
-	return apply_to_all( e, detail::log< value_type >() );
-}
-template<class E> BOOST_UBLAS_INLINE typename matrix_unary1_traits<E, detail::log< typename E::value_type > >::result_type log(const matrix_expression<E> &e ) {
-	typedef typename E::value_type value_type;
-	return apply_to_all( e, detail::log< value_type >() );
-}
-
-template<class E> BOOST_UBLAS_INLINE typename vector_unary_traits<E, detail::sqrt< typename E::value_type > >::result_type sqrt(const vector_expression<E> &e ) {
-	typedef typename E::value_type value_type;
-	return apply_to_all( e, detail::sqrt< value_type >() );
-}
-template<class E> BOOST_UBLAS_INLINE typename matrix_unary1_traits<E, detail::sqrt< typename E::value_type > >::result_type sqrt(const matrix_expression<E> &e ) {
-	typedef typename E::value_type value_type;
-	return apply_to_all( e, detail::sqrt< value_type >() );
-}
-
-template<class E> BOOST_UBLAS_INLINE typename vector_unary_traits<E, detail::xp1< typename E::value_type > >::result_type xp1(const vector_expression<E> &e ) {
-	typedef typename E::value_type value_type;
-	return apply_to_all( e, detail::xp1< value_type >() );
-}
-template<class E> BOOST_UBLAS_INLINE typename matrix_unary1_traits<E, detail::xp1< typename E::value_type > >::result_type xp1(const matrix_expression<E> &e ) {
-	typedef typename E::value_type value_type;
-	return apply_to_all( e, detail::xp1< value_type >() );
-}
-
-template<class E> BOOST_UBLAS_INLINE typename vector_unary_traits<E, detail::lambert_W0< typename E::value_type > >::result_type lambert_W0(const vector_expression<E> &e ) {
-	typedef typename E::value_type value_type;
-	return apply_to_all( e, detail::lambert_W0< value_type >() );
-}
-template<class E> BOOST_UBLAS_INLINE typename matrix_unary1_traits<E, detail::lambert_W0< typename E::value_type > >::result_type lambert_W0(const matrix_expression<E> &e ) {
-	typedef typename E::value_type value_type;
-	return apply_to_all( e, detail::lambert_W0< value_type >() );
-}
-
-template<class E> BOOST_UBLAS_INLINE typename vector_unary_traits<E, detail::abs< typename E::value_type > >::result_type abs(const vector_expression<E> &e ) {
-	typedef typename E::value_type value_type;
-	return apply_to_all( e, detail::abs< value_type >() );
-}
-template<class E> BOOST_UBLAS_INLINE typename matrix_unary1_traits<E, detail::abs< typename E::value_type > >::result_type abs(const matrix_expression<E> &e ) {
-	typedef typename E::value_type value_type;
-	return apply_to_all( e, detail::abs< value_type >() );
-}
-
 } //ublas
 } //utils

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

atmos-2.97.4.tar.gz/src/caching_factory.h -> atmos-2.97.5.tar.gz/src/caching_factory.h Changed

@@ -1,5 +1,5 @@
 /*
-    $Id: caching_factory.h 225 2011-07-11 18:10:13Z matwey $
+    $Id: caching_factory.h 269 2011-12-01 10:24:29Z matwey $
     Copyright (C) 2011  Sternberg Astronomical Institute, MSU
 
     This program is free software: you can redistribute it and/or modify
@@ -25,7 +25,18 @@
 
 #include <map>
 
-#include <boost/functional/value_factory.hpp>
+#ifdef HAVE_CONFIG_H
+# include "config.h" 
+#else
+# define HAVE_BOOST_FUNCTIONAL_VALUE_FACTORY_HPP
+#endif
+
+#ifdef HAVE_BOOST_FUNCTIONAL_VALUE_FACTORY_HPP
+# include <boost/functional/value_factory.hpp>
+# define DEFAULT_CREATE_FACTORY_TOKEN =boost::value_factory<T>
+#else
+# define DEFAULT_CREATE_FACTORY_TOKEN
+#endif
 
 #include <boost/preprocessor/arithmetic/inc.hpp>
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
@@ -35,7 +46,8 @@
 namespace utils {
 namespace algo {
 
-template< class T, class Key, class Create = boost::value_factory<T>, class Container = std::map<Key,T> > class caching_factory {
+template< class T, class Key, class Create DEFAULT_CREATE_FACTORY_TOKEN, class Container = std::map<Key,T> > class caching_factory {
+#undef DEFAULT_CREATE_FACTORY_TOKEN
 public:
 	typedef T       value_type;
 	typedef Key     key_type;

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

atmos-2.97.4.tar.gz/src/covariance_decomposition.h -> atmos-2.97.5.tar.gz/src/covariance_decomposition.h Changed

atmos-2.97.4.tar.gz/src/file_input.cpp -> atmos-2.97.5.tar.gz/src/file_input.cpp Changed

@@ -1,5 +1,5 @@
 /*
-    $Id: file_input.cpp 180 2011-01-30 15:56:33Z matwey $
+    $Id: file_input.cpp 276 2012-02-22 10:59:50Z matwey $
     Copyright (C) 2009  Sternberg Astronomical Institute, MSU
 
     This program is free software: you can redistribute it and/or modify
@@ -138,11 +138,17 @@
 	static rho1_type rho1( atmos::channels, atmos::channels ); // NOTE: thread unsafe
 	static rho2_type rho2( atmos::channels ); // NOTE: thread unsafe
 	
-	stm >> timestamp >>
-	flux(0) >> flux(1) >> flux(2) >> flux(3) >> // flux vector
-	vars(0,0) >> vars(1,1) >> vars(2,2) >> vars(3,3) >> vars(0,1) >> vars(0,2) >> vars(0,3) >> vars(1,2) >> vars(1,3) >> vars(2,3) >> // vars matrix
-	rho1(0,0) >> rho1(1,1) >> rho1(2,2) >> rho1(3,3) >> rho1(0,1) >> rho1(0,2) >> rho1(0,3) >> rho1(1,2) >> rho1(1,3) >> rho1(2,3) >> // rho1 matrix
-	rho2(0) >> rho2(1) >> rho2(2) >> rho2(3); // rho2 vector;
+	stm >> timestamp;
+	for( flux_type::size_type i = 0; i < flux.size(); ++i ) { stm >> flux(i); } // flux vector
+	for( vars_type::size_type i = 0; i < BOOST_UBLAS_SAME(vars.size1(),vars.size2()); ++i ) { stm >> vars(i,i); } // variances
+	for( vars_type::size_type i = 0; i < vars.size1() - 1; ++i ) {
+		for( vars_type::size_type j = i + 1; j < vars.size2(); ++j ) {	stm >> vars(i,j); } // variances
+	} 
+	for( rho1_type::size_type i = 0; i < BOOST_UBLAS_SAME(rho1.size1(),rho1.size2()); ++i ) { stm >> rho1(i,i); } // rho1
+	for( rho1_type::size_type i = 0; i < rho1.size1() - 1; ++i ) {
+		for( rho1_type::size_type j = i + 1; j < rho1.size2(); ++j ) { stm >> rho1(i,j); } // rho1
+	}
+	for( rho2_type::size_type i = 0; i < rho2.size(); ++i ) { stm >> rho2(i); } // rho2
 
 	on_measurements( timestamp, flux, vars, rho1, rho2 );
 }
@@ -157,13 +163,17 @@
 	static double left_fwhm,left_elp;
 	static double right_fwhm,right_elp;
 	static double background_flux,background_err;
-	stm >> timestamp >>
-	framenum >>
-	left_flux(0) >> right_flux(0) >> left_flux(1) >> right_flux(1) >> left_flux(2) >> right_flux(2) >>
-	xvars(0) >> yvars(0) >> xvars(1) >> yvars(1) >> xvars(2) >> yvars(2) >> xvars(3) >> yvars(3) >>
-	common(0) >> common(1) >> common(2) >> common(3) >>
-	left_fwhm >> left_elp >> right_fwhm >> right_elp >>
-	background_flux >> background_err;
+	stm >> timestamp >> framenum;
+	for( dimm_flux_type::size_type i = 0; i < BOOST_UBLAS_SAME(left_flux.size(),right_flux.size()); ++i ) {
+		stm >> left_flux(i) >> right_flux(i);
+	}
+	for( dimm_vars_type::size_type i = 0; i < BOOST_UBLAS_SAME(xvars.size(),yvars.size()); ++i ) {
+		stm >> xvars(i) >> yvars(i);
+	}
+	for( dimm_vars_type::size_type i = 0; i < common.size(); ++i ) {
+		stm >> common(i);
+	}
+	stm >> left_fwhm >> left_elp >> right_fwhm >> right_elp >> background_flux >> background_err;
 	
 	on_dimm( timestamp, framenum, left_flux, right_flux, xvars, yvars );
 }

atmos-2.97.4.tar.gz/src/file_output.cpp -> atmos-2.97.5.tar.gz/src/file_output.cpp Changed

@@ -1,5 +1,5 @@
 /*
-    $Id: file_output.cpp 207 2011-03-01 19:02:17Z matwey $
+    $Id: file_output.cpp 288 2014-10-02 07:39:38Z matwey $
     Copyright (C) 2009  Sternberg Astronomical Institute, MSU
 
     This program is free software: you can redistribute it and/or modify
@@ -57,7 +57,7 @@
 		<< std::fixed << datum( desi_time_constant, desi_time_constant_rerr ) << " "
 		<< std::fixed << datum( time_constant, time_constant_rerr ) << std::endl;
 }
-void file::profile( const time_type& time, const std::string& method, double cn2seeing, double chi2, const vector_type& cn2, const vector_type& ecn2, const vector_type& grid ){
+void file::profile( const time_type& time, const std::string& method, double cn2seeing, double chi2, const cn2_type& cn2, const cn2_type& cn2_err, const grid_type& grid ){
 	assert( cn2.size() == ecn2.size() );
 	assert( cn2.size() == grid.size() );
 
@@ -65,49 +65,74 @@
 	m_stm << "T " << time << " " << method << " "
 		<< std::setw(2) << cn2.size() << " " << std::setprecision(2)
 		<< std::fixed << chi2 << " " << cn2seeing;
-	for( vector_type::size_type i = 0; i < cn2.size(); i++)
-		m_stm << " " << std::fixed << grid(i)
-			<< std::scientific  << " " << cn2(i) << " " << ecn2(i);
+	for( cn2_type::size_type i = 0; i < BOOST_UBLAS_SAME(cn2.size(),cn2_err.size()); ++i ) {
+		m_stm << " " << std::fixed << grid(i) << std::scientific  << " " << cn2(i) << " " << cn2_err(i);
+	}
 	m_stm << std::endl;
 }
-void file::residual( const time_type& time, const std::string& method, const vector_type& o_csi ) {
+void file::residual( const time_type& time, const std::string& method, const residual_type& residual, const boost::optional<std::pair<double, double> >& residual_dimm ) {
+	assert( residual.size() == atmos::indices_size  );
+
 	boost::io::ios_all_saver asaver( m_stm );
-	m_stm << "R " << time << " " << method << " "
-		<< std::setprecision(3) << std::fixed;
-	for( vector_type::size_type i = 0; i < o_csi.size(); i++ )
-		m_stm << "  " << o_csi(i);
+	m_stm << "R " << time << " " << method << std::setprecision(3) << std::fixed;
+	for( residual_type::size_type i = 0; i < BOOST_UBLAS_SAME(residual.size1(),residual.size2()); ++i ) {
+		m_stm << " " << residual(i,i);
+	}
+	for( residual_type::size_type i = 0; i < residual.size1() - 1; ++i ) {
+		for( residual_type::size_type j = i + 1; j < residual.size2(); ++j ) {
+			m_stm << " " << residual(i,j);
+		}
+	}
+	if( residual_dimm ) {
+		m_stm << " " << residual_dimm->first << " " << residual_dimm->second;
+	}
 	m_stm << std::endl;
 }
-void file::fluxes( const time_type& time, const vector_type& result_flux ) {
+void file::fluxes( const time_type& time, const flux_type& result_flux ) {
+	assert( result_flux.size() == atmos::channels  );
+
 	boost::io::ios_all_saver asaver( m_stm );
-	assert( result_flux.size() >= 4 );
-	m_stm << "F " << time << " " << std::fixed << datum( result_flux(0) ) << ' ' << datum( result_flux(1) ) << ' ' << datum( result_flux(2) ) << ' ' << datum( result_flux(3) ) << std::endl;
+	m_stm << "F " << time << std::fixed;
+	for( flux_type::size_type i = 0; i < result_flux.size(); ++i ) {
+		m_stm << " " << datum(result_flux(i));
+	}
+	m_stm << std::endl;
 }
-void file::fluxes( const time_type& time, const vector_type& result_flux, const vector_type& result_flux_err ) {
-	boost::io::ios_all_saver asaver( m_stm );
+void file::fluxes( const time_type& time, const vector_type& result_flux, const flux_type& result_flux_err ) {
 	assert( result_flux.size() == atmos::channels );
 	assert( result_flux.size() == result_flux_err.size() );
-	m_stm << "F " << time << " " << std::fixed
-	<< datum( result_flux(0), result_flux_err(0)/result_flux(0) ) << ' '
-	<< datum( result_flux(1), result_flux_err(1)/result_flux(1) ) << ' '
-	<< datum( result_flux(2), result_flux_err(2)/result_flux(2) ) << ' '
-	<< datum( result_flux(3), result_flux_err(3)/result_flux(3) ) << std::endl;
-}
-void file::indices( const time_type& time, const symmetric_matrix_type& result_indx, const symmetric_matrix_type& result_indx_err, const vector_type& result_desi, const vector_type& result_desi_err ) {
+
 	boost::io::ios_all_saver asaver( m_stm );
-	ios_indic_saver isaver( m_stm );
+	m_stm << "F " << time << std::fixed;
+	for( flux_type::size_type i = 0; i < BOOST_UBLAS_SAME(result_flux.size(),result_flux_err.size()); ++i ) {
+		m_stm << " " << datum(result_flux(i),result_flux_err(i)/result_flux(i));
+	}
+	m_stm << std::endl;
+}
+void file::indices( const time_type& time, const indices_type& result_indx, const indices_type& result_indx_err, const indesis_type& result_desi, const indesis_type& result_desi_err ) {
 	assert( result_desi.size() == atmos::channels );
 	assert( result_indx.size1() == atmos::channels );
 	assert( result_indx.size2() == atmos::channels );
 	assert( result_desi.size() == result_desi_err.size() );
 	assert( result_indx.size1() == result_indx_err.size1() );
 	assert( result_indx.size1() == result_indx_err.size2() );
-	m_stm << "I " << time << std::indic << std::fixed <<
-		datum( result_indx(0,0), result_indx_err(0,0)/result_indx(0,0) ) << datum( result_indx(1,1), result_indx_err(1,1)/result_indx(1,1) ) << datum( result_indx(2,2), result_indx_err(2,2)/result_indx(2,2) ) << datum( result_indx(3,3), result_indx_err(3,3)/result_indx(3,3) ) <<
-		datum( result_indx(0,1), result_indx_err(0,1)/result_indx(0,1) ) << datum( result_indx(0,2), result_indx_err(0,2)/result_indx(0,2) ) << datum( result_indx(0,3), result_indx_err(0,3)/result_indx(0,3) ) <<
-		datum( result_indx(1,2), result_indx_err(1,2)/result_indx(1,2) ) << datum( result_indx(1,3), result_indx_err(1,3)/result_indx(1,3) ) <<
-		datum( result_indx(2,3), result_indx_err(2,3)/result_indx(2,3) ) <<
-		datum( result_desi(0), result_desi_err(0)/result_desi(0) ) << datum( result_desi(1), result_desi_err(1)/result_desi(1) ) << datum( result_desi(2), result_desi_err(2)/result_desi(2) ) << datum( result_desi(3), result_desi_err(3)/result_desi(3) ) << std::endl;
+
+	boost::io::ios_all_saver asaver( m_stm );
+	ios_indic_saver isaver( m_stm );
+
+	m_stm << "I " << time << std::indic << std::fixed;
+	for( indices_type::size_type i = 0; i < BOOST_UBLAS_SAME(result_indx.size1(),result_indx.size2()); ++i ) {
+		m_stm << " " << datum( result_indx(i,i), result_indx_err(i,i)/result_indx(i,i) );
+	}
+	for( indices_type::size_type i = 0; i < BOOST_UBLAS_SAME(result_indx.size1(),result_indx_err.size1()) - 1; ++i ) {
+		for( indices_type::size_type j = i + 1; j < BOOST_UBLAS_SAME(result_indx.size2(),result_indx_err.size2()); ++j ) {
+			m_stm << " " << datum( result_indx(i,j), result_indx_err(i,j)/result_indx(i,j) );
+		}
+	}
+	for( indesis_type::size_type i = 0; i < BOOST_UBLAS_SAME(result_desi.size(),result_desi_err.size()); ++i ) {
+		m_stm << " " << datum( result_desi(i), result_desi_err(i)/result_desi(i) );
+	}
+	m_stm << std::endl;
 }
 void file::parameter( const time_type& time, const std::string& key, const std::string& value ) {
 	boost::io::ios_all_saver asaver( m_stm );

atmos-2.97.4.tar.gz/src/file_output.h -> atmos-2.97.5.tar.gz/src/file_output.h Changed

@@ -1,5 +1,5 @@
 /*
-    $Id: file_output.h 207 2011-03-01 19:02:17Z matwey $
+    $Id: file_output.h 279 2012-02-23 14:27:56Z matwey $
     Copyright (C) 2009  Sternberg Astronomical Institute, MSU
 
     This program is free software: you can redistribute it and/or modify
@@ -25,6 +25,7 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/numeric/ublas/symmetric.hpp>
 #include <boost/numeric/ublas/vector.hpp>
+#include <boost/optional.hpp>
 
 #include "typesdef.h" // object
 
@@ -38,9 +39,23 @@
 typedef vector< value_type > vector_type;
 typedef symmetric_matrix< value_type > symmetric_matrix_type;
 
+typedef vector_type flux_type;
+typedef symmetric_matrix_type indices_type;
+typedef vector_type indesis_type;
+typedef vector_type cn2_type;
+typedef vector_type grid_type;
+typedef symmetric_matrix_type residual_type;
 typedef object object_type;
 
 class file {
+public:
+	typedef atmos::output::flux_type flux_type;
+	typedef atmos::output::indices_type indices_type;
+	typedef atmos::output::indesis_type indesis_type;
+	typedef atmos::output::cn2_type cn2_type;
+	typedef atmos::output::grid_type grid_type;
+	typedef atmos::output::residual_type residual_type;
+	typedef atmos::output::object_type object_type;
 private:
 	std::ostream& m_stm;
 public:
@@ -51,11 +66,11 @@
 	void normal( const time_type& time, double mz );
 	void background( const time_type& time );
 	void atmosphere( const time_type& time, double free_seeing, double free_seeing_rerr, double dimm_seeing, double dimm_seeing_rerr, double dimm_turbulence, double dimm_turbulence_rerr, double isoplanatic_angle, double isoplanatic_angle_rerr, double altitude_eff, double altitude_eff_rerr, double desi_time_constant, double desi_time_constant_rerr, double time_constant, double time_constant_rerr, double moment_0, double moment_0_rerr, double moment_2, double moment_2_rerr );
-	void profile( const time_type& time, const std::string& method, double cn2seeing, double chi2, const vector_type& cn2, const vector_type& ecn2, const vector_type& grid );
-	void residual( const time_type& time, const std::string& method, const vector_type& o_csi );
-	void fluxes( const time_type& time, const vector_type& result_flux );
-	void fluxes( const time_type& time, const vector_type& result_flux, const vector_type& result_flux_err );
-	void indices( const time_type& time, const symmetric_matrix_type& result_indx, const symmetric_matrix_type& result_indx_err, const vector_type& result_desi, const vector_type& result_desi_err );
+	void profile( const time_type& time, const std::string& method, double cn2seeing, double chi2, const cn2_type& cn2, const cn2_type& cn2_err, const grid_type& grid );
+	void residual( const time_type& time, const std::string& method, const residual_type& residual, const boost::optional<std::pair<double,double> >& residual_dimm = boost::optional<std::pair<double,double> >() );
+	void fluxes( const time_type& time, const flux_type& result_flux );
+	void fluxes( const time_type& time, const flux_type& result_flux, const flux_type& result_flux_err );
+	void indices( const time_type& time, const indices_type& result_indx, const indices_type& result_indx_err, const indesis_type& result_desi, const indesis_type& result_desi_err );
 	void parameter( const time_type& time, const std::string& key, const std::string& value );
 	void objectinfo( const time_type& time, const object_type& obj );

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

@@ -1,5 +1,5 @@
 /*
-    $Id: integrals.cpp 228 2011-07-12 17:55:19Z matwey $
+    $Id: integrals.cpp 277 2012-02-22 18:48:39Z matwey $
     Copyright (C) 2009  Sternberg Astronomical Institute, MSU
 
     This program is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
 #include <lsp/singular_decomposition.h>
 
 #include "atmos.h"
-#include "apply_to_all.h"
+#include "ublas_math.h"
 #include "integrals.h"
 #include "vector_generator.h"
 #include "utils.h"
@@ -55,17 +55,18 @@
 
 	return k*k_lambda*std::pow( moment53, power );
 }
-value_type time_constant_desi( const value_type& desi ) {
+value_type time_constant_desi( const value_type& desi, const value_type& exposure ) {
 	const value_type power = -3.0/5.0;
+	const value_type exposure_power = 5.0/6.0;
 	const value_type k = 0.175;
 
-	return k*std::pow( desi, power );
+	return k*std::pow( exposure, exposure_power )*std::pow( desi, power );
 }
-value_type time_constant( const value_type& wind_moment0, const value_type& moment0 ) {
+value_type time_constant( const value_type& wind_moment0, const value_type& moment0, const value_type& exposure ) {
 	const value_type power = -0.1;
 	const value_type k_lambda = 0.43527528164806206 * 6.3095734448019363e-08; // lambda^6/5
 	const value_type k = 0.058 * 1e3;
-	const value_type k_wind = 6e6 / 6;
+	const value_type k_wind = 6 / ( 6e-6 * exposure*exposure ); // 6 / (2*(2**2-1**2) tau**2 )
 
 	return k*k_lambda*std::pow( moment0, power )/std::sqrt( k_wind*wind_moment0 );
 }
@@ -79,11 +80,11 @@
 std::pair< value_type, value_type > isoplanatic_angle( const value_type& moment53, const value_type& moment53_rerr ) {
 	return std::make_pair( isoplanatic_angle(moment53), 3.0/5.0*moment53_rerr );
 }
-std::pair< value_type, value_type > time_constant_desi( const value_type& desi, const value_type& desi_rerr ) {
-	return std::make_pair( time_constant_desi(desi), 3.0/5.0*desi_rerr );
+std::pair< value_type, value_type > time_constant_desi( const value_type& desi, const value_type& desi_rerr, const value_type& exposure ) {
+	return std::make_pair( time_constant_desi( desi, exposure ), 3.0/5.0*desi_rerr );
 }
-std::pair< value_type, value_type > time_constant( const value_type& wind_moment0, const value_type& wind_moment0_rerr, const value_type& moment0, const value_type& moment0_rerr ) {
-	return std::make_pair( time_constant( wind_moment0, moment0), std::sqrt(0.1*moment0_rerr*moment0_rerr + 0.5*wind_moment0_rerr*wind_moment0_rerr) );
+std::pair< value_type, value_type > time_constant( const value_type& wind_moment0, const value_type& wind_moment0_rerr, const value_type& moment0, const value_type& moment0_rerr, const value_type& exposure ) {
+	return std::make_pair( time_constant( wind_moment0, moment0, exposure ), std::sqrt(0.1*moment0_rerr*moment0_rerr + 0.5*wind_moment0_rerr*wind_moment0_rerr) );
 }
 
 namespace {
@@ -103,18 +104,6 @@
 	return powers;
 }
 
-// FIXME:
-vector_type reorder_flat( const atmos::indices::indices_type& indices ) {
-	assert( indices.size1() == atmos::channels );
-	assert( indices.size2() == atmos::channels );
-
-	vector_type inds( atmos::indices_size );
-	inds(0) = indices(0,0); inds(1) = indices(1,1); inds(2) = indices(2,2); inds(3) = indices(3,3);
-	inds(4) = indices(0,1); inds(5) = indices(0,2); inds(6) = indices(0,3);
-	inds(7) = indices(1,2); inds(8) = indices(1,3); inds(9) = indices(2,3);
-	return inds;
-}
-
 }
 
 namespace detail {
@@ -152,8 +141,8 @@
 		double weight_power = moment_power / 2.0;
 		double scale = pow( 1000.0, moment_power );
 
-		vector<double> alt    = utils::ublas::exp( log( h )*moment_power ) * scale;
-		vector<double> weight = utils::ublas::exp( log( h )*weight_power );
+		vector<double> alt    = utils::ublas::pow(h, moment_power) * scale;
+		vector<double> weight = utils::ublas::pow(h, weight_power);
 
 		matrix<double> A( trans( subrange( wfv, 0, atmos::indices_size, 0, wfv.size2() ) ) );
 		matrix<double> left( identity_matrix<double>( A.size1() ) );
@@ -207,8 +196,7 @@
 	assert( indices.size2() == atmos::channels );
 	assert( desi.size()  == atmos::channels );
 
-	vector_type aints = reorder_flat(indices);
-	aints = prod( m_indices_dcf, aints );
+	vector_type aints = prod( m_indices_dcf, atmos::weight::as_vector(indices) );
 
 	assert( m_powers.size() == aints.size() );
 	for( size_type i = 0; i < m_powers.size(); ++i ){
@@ -217,8 +205,7 @@
 			aints(i) = 0.0;
 	}
 
-	vector_type wind_aints = reorder_flat(wind_indices);
-	wind_aints = prod( m_wind_indices_dcf, wind_aints );
+	vector_type wind_aints = prod( m_wind_indices_dcf, atmos::weight::as_vector(wind_indices) );
 		
 	assert( m_wind_powers.size() == wind_aints.size() );
 	for( size_type i = 0; i < m_wind_powers.size(); ++i ){

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

@@ -1,5 +1,5 @@
 /*
-    $Id: integrals.h 226 2011-07-12 13:13:12Z matwey $
+    $Id: integrals.h 271 2011-12-12 08:27:21Z matwey $
     Copyright (C) 2009  Sternberg Astronomical Institute, MSU
 
     This program is free software: you can redistribute it and/or modify
@@ -52,14 +52,14 @@
 	value_type seeing( const value_type& moment0 );
 	value_type effective_altitude( const value_type& moment0, const value_type& moment1 );
 	value_type isoplanatic_angle( const value_type& moment53 );
-	value_type time_constant_desi( const value_type& desi );
-	value_type time_constant( const value_type& wind_moment0, const value_type& moment0 );
+	value_type time_constant_desi( const value_type& desi, const value_type& exposure );
+	value_type time_constant( const value_type& wind_moment0, const value_type& moment0, const value_type& exposure );
 
 	std::pair< value_type, value_type > seeing( const value_type& moment0, const value_type& moment0_rerr );
 	std::pair< value_type, value_type > effective_altitude( const value_type& moment0, const value_type& moment0_rerr, const value_type& moment1, const value_type& moment1_rerr );
 	std::pair< value_type, value_type > isoplanatic_angle( const value_type& moment53, const value_type& moment53_rerr );
-	std::pair< value_type, value_type > time_constant_desi( const value_type& desi, const value_type& desi_rerr );
-	std::pair< value_type, value_type > time_constant( const value_type& wind_moment0, const value_type& wind_moment0_rerr, const value_type& moment0, const value_type& moment0_rerr );
+	std::pair< value_type, value_type > time_constant_desi( const value_type& desi, const value_type& desi_rerr, const value_type& exposure );
+	std::pair< value_type, value_type > time_constant( const value_type& wind_moment0, const value_type& wind_moment0_rerr, const value_type& moment0, const value_type& moment0_rerr, const value_type& exposure );
 
 namespace detail {
 	struct sample {

atmos-2.97.4.tar.gz/src/photometry.h -> atmos-2.97.5.tar.gz/src/photometry.h Changed

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

@@ -1,5 +1,5 @@
 /*
-    $Id: profile.cpp 230 2011-07-13 08:54:35Z matwey $
+    $Id: profile.cpp 279 2012-02-23 14:27:56Z matwey $
     Copyright (C) 2009  Sternberg Astronomical Institute, MSU
 
     This program is free software: you can redistribute it and/or modify
@@ -34,24 +34,10 @@
 #include "integrals.h"
 #include "profile.h"
 #include "utils.h"
+#include "weif.h"
 
 namespace atmos {
 namespace mixture {
-
-namespace {
-	
-vector_type reorder_flat( const atmos::indices::indices_type& indices ) {
-	assert( indices.size1() == atmos::channels );
-	assert( indices.size2() == atmos::channels );
-	
-	vector_type inds( atmos::indices_size );
-	inds(0) = indices(0,0); inds(1) = indices(1,1); inds(2) = indices(2,2); inds(3) = indices(3,3);
-	inds(4) = indices(0,1); inds(5) = indices(0,2); inds(6) = indices(0,3);
-	inds(7) = indices(1,2); inds(8) = indices(1,3); inds(9) = indices(2,3);
-	return inds;
-}
-
-}
 	
 storage::storage( size_type reserve ):
 	table_storage< detail::sample >( reserve ),
@@ -61,6 +47,7 @@
 	table_storage< detail::sample >( indices.size() ),
 	m_mixture_column( *this, boost::mem_fn(&detail::sample::mixture) ) {
 	using namespace boost::numeric::ublas;
+	using namespace atmos::weight;
 	
 	if( dimm.size() > 1 ) {
 		double dimmscale2 = dimmscale*dimmscale;
@@ -72,20 +59,16 @@
 			while( it != indices.end() ) {
 				if( dimm_next != dimm.end() && dimm_next->timestamp <= it->timestamp )
 					break;
-
-				mixture_type mixture( atmos::indices_size + atmos::dimm_indices_size );
-				project( mixture, range(0,atmos::indices_size) ) = reorder_flat(it->indices);
-				mixture(10) = dimmscale2 * dimm_current->xvars(1) * 1e+11;
-				mixture(11) = dimmscale2 * dimm_current->yvars(1) * 1e+11;
+				
+				push_back(repack_massdimm(as_vector(it->indices), dimmscale2*dimm_current->xvars(1), dimmscale2*dimm_current->yvars(1)));
 				++it;
-				push_back( mixture );
 			}
 			dimm_current = dimm_next;
 			++dimm_next;
 		}
 	} else {
 		for( indices::storage::const_iterator it = indices.begin(); it != indices.end(); ++it ) {
-			push_back( reorder_flat(it->indices) );
+			push_back(as_vector(it->indices));
 		}
 	}
 }

atmos-2.97.4.tar.gz/src/spline.h -> atmos-2.97.5.tar.gz/src/spline.h Changed

atmos-2.97.5.tar.gz/src/ublas_math.h Added

@@ -0,0 +1,200 @@
+/*
+    $Id: ublas_math.h 281 2012-02-23 16:14:32Z 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 _UBLAS_MATH_H
+#define _UBLAS_MATH_H
+
+#include <cmath>
+
+#include "apply_to_all.h"
+#include "lambert.h"
+
+namespace utils {
+namespace ublas {
+
+namespace detail {
+	template <class T> class inv {
+	public:
+		typedef T value_type;
+		typedef T result_type;
+		static result_type apply( const value_type& x) {
+			return value_type(1) / x;
+		}
+	};
+	template <class T> class exp {
+	public:
+		typedef T value_type;
+		typedef T result_type;
+		static result_type apply( const value_type& x) {
+			return std::exp( x );
+		}
+	};
+	template <class T> class log {
+	public:
+		typedef T value_type;
+		typedef T result_type;
+		static result_type apply( const value_type& x) {
+			return std::log( x );
+		}
+	};
+	template <class T> class lambert_W0 {
+	public:
+		typedef T value_type;
+		typedef T result_type;
+		static result_type apply( const value_type& x) {
+			return utils::math::lambert_W0(x);
+		}
+	};
+	template <class T> class sqrt {
+	public:
+		typedef T value_type;
+		typedef T result_type;
+		static result_type apply( const value_type& x) {
+			return std::sqrt(x);
+		}
+	};
+	template <class T> class xp1 {
+	public:
+		typedef T value_type;
+		typedef T result_type;
+		static result_type apply( const value_type& x) {
+			return x + value_type(1);
+		}
+	};
+	template <class T> class abs {
+	public:
+		typedef T value_type;
+		typedef T result_type;
+		static result_type apply( const value_type& x) {
+			return std::abs(x);
+		}
+	};
+	
+	template<class T, class U> struct scalar_pow: public scalar_binary_functor<T, U> {
+		typedef typename scalar_binary_functor<T, U>::argument1_type argument1_type;
+		typedef typename scalar_binary_functor<T, U>::argument2_type argument2_type;
+		typedef typename boost::remove_reference< argument1_type >::type result_type;
+
+		static BOOST_UBLAS_INLINE
+		result_type apply (argument1_type t, argument2_type p) {
+			using namespace std;
+			// we'll find either std::pow or else another version via ADL:
+			return pow (t,p);
+		}
+	};
+	
+}
+	
+using namespace boost::numeric::ublas;
+
+template<class E> BOOST_UBLAS_INLINE typename vector_unary_traits<E, detail::inv< typename E::value_type > >::result_type inv(const vector_expression<E> &e ) {
+	typedef typename E::value_type value_type;
+	return apply_to_all( e, detail::inv< value_type >() );
+}
+template<class E> BOOST_UBLAS_INLINE typename matrix_unary1_traits<E, detail::inv< typename E::value_type > >::result_type inv(const matrix_expression<E> &e ) {
+	typedef typename E::value_type value_type;
+	return apply_to_all( e, detail::inv< value_type >() );
+}
+
+template<class E> BOOST_UBLAS_INLINE typename vector_unary_traits<E, detail::exp< typename E::value_type > >::result_type exp(const vector_expression<E> &e ) {
+	typedef typename E::value_type value_type;
+	return apply_to_all( e, detail::exp< value_type >() );
+}
+template<class E> BOOST_UBLAS_INLINE typename matrix_unary1_traits<E, detail::exp< typename E::value_type > >::result_type exp(const matrix_expression<E> &e ) {
+	typedef typename E::value_type value_type;
+	return apply_to_all( e, detail::exp< value_type >() );
+}
+
+template<class E> BOOST_UBLAS_INLINE typename vector_unary_traits<E, detail::log< typename E::value_type > >::result_type log(const vector_expression<E> &e ) {
+	typedef typename E::value_type value_type;
+	return apply_to_all( e, detail::log< value_type >() );
+}
+template<class E> BOOST_UBLAS_INLINE typename matrix_unary1_traits<E, detail::log< typename E::value_type > >::result_type log(const matrix_expression<E> &e ) {
+	typedef typename E::value_type value_type;
+	return apply_to_all( e, detail::log< value_type >() );
+}
+
+template<class E> BOOST_UBLAS_INLINE typename vector_unary_traits<E, detail::sqrt< typename E::value_type > >::result_type sqrt(const vector_expression<E> &e ) {
+	typedef typename E::value_type value_type;
+	return apply_to_all( e, detail::sqrt< value_type >() );
+}
+template<class E> BOOST_UBLAS_INLINE typename matrix_unary1_traits<E, detail::sqrt< typename E::value_type > >::result_type sqrt(const matrix_expression<E> &e ) {
+	typedef typename E::value_type value_type;
+	return apply_to_all( e, detail::sqrt< value_type >() );
+}
+
+template<class E> BOOST_UBLAS_INLINE typename vector_unary_traits<E, detail::xp1< typename E::value_type > >::result_type xp1(const vector_expression<E> &e ) {
+	typedef typename E::value_type value_type;
+	return apply_to_all( e, detail::xp1< value_type >() );
+}
+template<class E> BOOST_UBLAS_INLINE typename matrix_unary1_traits<E, detail::xp1< typename E::value_type > >::result_type xp1(const matrix_expression<E> &e ) {
+	typedef typename E::value_type value_type;
+	return apply_to_all( e, detail::xp1< value_type >() );
+}
+
+template<class E> BOOST_UBLAS_INLINE typename vector_unary_traits<E, detail::lambert_W0< typename E::value_type > >::result_type lambert_W0(const vector_expression<E> &e ) {
+	typedef typename E::value_type value_type;
+	return apply_to_all( e, detail::lambert_W0< value_type >() );
+}
+template<class E> BOOST_UBLAS_INLINE typename matrix_unary1_traits<E, detail::lambert_W0< typename E::value_type > >::result_type lambert_W0(const matrix_expression<E> &e ) {
+	typedef typename E::value_type value_type;
+	return apply_to_all( e, detail::lambert_W0< value_type >() );
+}
+
+template<class E> BOOST_UBLAS_INLINE typename vector_unary_traits<E, detail::abs< typename E::value_type > >::result_type abs(const vector_expression<E> &e ) {
+	typedef typename E::value_type value_type;
+	return apply_to_all( e, detail::abs< value_type >() );
+}
+template<class E> BOOST_UBLAS_INLINE typename matrix_unary1_traits<E, detail::abs< typename E::value_type > >::result_type abs(const matrix_expression<E> &e ) {
+	typedef typename E::value_type value_type;
+	return apply_to_all( e, detail::abs< value_type >() );
+}
+
+// pow (v1, v2) i = pow( v1 i, v2 i )
+template<class E1, class E2> BOOST_UBLAS_INLINE
+typename vector_binary_traits<E1, E2, detail::scalar_pow<typename E1::value_type, typename E2::value_type> >::result_type
+element_pow (const vector_expression<E1> &e1, const vector_expression<E2> &e2) {
+	typedef typename vector_binary_traits<E1, E2, detail::scalar_pow<typename E1::value_type, typename E2::value_type> >::expression_type expression_type;
+	return expression_type (e1 (), e2 ());
+}
+// pow (m1, m2) i j = pow (m1 i j, m2 i j)
+template<class E1, class E2> BOOST_UBLAS_INLINE
+typename matrix_binary_traits<E1, E2, detail::scalar_pow<typename E1::value_type, typename E2::value_type> >::result_type
+element_pow (const matrix_expression<E1> &e1, const matrix_expression<E2> &e2) {
+	typedef typename matrix_binary_traits<E1, E2, detail::scalar_pow<typename E1::value_type, typename E2::value_type> >::expression_type expression_type;
+	return expression_type (e1 (), e2 ());
+}
+
+// pow (v, t) i = pow( v i, t )
+template<class E1, class T2> BOOST_UBLAS_INLINE
+typename vector_binary_scalar2_traits<E1, const T2, detail::scalar_pow<typename E1::value_type, T2> >::result_type
+pow (const vector_expression<E1> &e1, const T2 &e2) {
+	typedef typename vector_binary_scalar2_traits<E1, const T2, detail::scalar_pow<typename E1::value_type, T2> >::expression_type expression_type;
+	return expression_type (e1 (), e2);
+}
+// pow (m, p) i j = pow (m i j, p)
+template<class E1, class T2> BOOST_UBLAS_INLINE
+typename matrix_binary_scalar2_traits<E1, const T2, detail::scalar_pow<typename E1::value_type, T2> >::result_type
+pow (const matrix_expression<E1> &e1, const T2 &e2) {
+	typedef typename matrix_binary_scalar2_traits<E1, const T2, detail::scalar_pow<typename E1::value_type, T2> >::expression_type expression_type;
+	return expression_type (e1 (), e2);
+}
+
+}}
+

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

@@ -1,5 +1,5 @@
 /*
-    $Id: weif.cpp 232 2011-07-13 12:34:21Z matwey $
+    $Id: weif.cpp 279 2012-02-23 14:27:56Z matwey $
     Copyright (C) 2010  Sternberg Astronomical Institute, MSU
 
     This program is free software: you can redistribute it and/or modify
@@ -31,7 +31,6 @@
 namespace weight {
 
 const double POWIND = -2.66666666667;
-const double POWDIFF = -0.666666666667;
 const double MKM2CM = 1E-4;
 const double EPS = 1.0e-4 ;
 const double CALIBR  = 44.62621363;
@@ -62,7 +61,7 @@
 	double aperture;
 	double dimmbase;
 	double PIx2lambda0;
-	double phi;
+	double cos2phi;
 	sfun_type sfun;
 	double altitude;
 
@@ -71,33 +70,37 @@
 
 double mass_integrand(double x, void * params) {
 	using namespace std;
-	
-	mass_params p = *( mass_params *) params;
-	double p1 = 0;
-	double p3 = 0;
-	double f = p.altitude*x*x/2;
-	const std::complex<double>& sfun_f = p.sfun(f);
-	double sf = imag( sfun_f ) * cos( p.PIx2lambda0*f ) + real( sfun_f ) * sin( p.PIx2lambda0*f );
-	sf = sf*sf*pow( x, p.powind );
-	if( p.diameter1 != p.diameter2 ) {
-		p1 = ( p.diameter1*j1( p.diameter1*x ) - p.diameter2*j1( p.diameter2*x ) ) / ( p.diameter1*p.diameter1 - p.diameter2*p.diameter2 );
-	}
-	if( p.diameter3 != p.diameter4 ) {
-		p3 = ( p.diameter3*j1( p.diameter3*x ) - p.diameter4*j1( p.diameter4*x ) ) / ( p.diameter3*p.diameter3 - p.diameter4*p.diameter4 );
-	}
-	return sf * 4.0 * (p1 * p3) / (x*x);
+
+	const mass_params* p = (mass_params*)params;
+
+	if( p->diameter1 == p->diameter2 || p->diameter3 == p->diameter4 ) { return 0.0; }
+
+	const double f = p->altitude*x*x / 2.0;
+	const std::complex<double>& sfun_f = p->sfun(f);
+	double sf = imag( sfun_f ) * cos( p->PIx2lambda0*f ) + real( sfun_f ) * sin( p->PIx2lambda0*f );
+	sf = sf*sf*pow( x, p->powind );
+	double p1 = ( p->diameter1*j1( p->diameter1*x ) - p->diameter2*j1( p->diameter2*x ) ) / ( p->diameter1*p->diameter1 - p->diameter2*p->diameter2 );
+	double p3 = ( p->diameter3*j1( p->diameter3*x ) - p->diameter4*j1( p->diameter4*x ) ) / ( p->diameter3*p->diameter3 - p->diameter4*p->diameter4 );
+
+	return sf * 4.0 * p1 * p3 / (x*x);
 }
 
 double dimm_integrand(double x, void * params) {
-	dimm_params p = *( dimm_params *) params;
-	double f = p.altitude*x*x/2;
-	double a = p.aperture*x;
-	double b = p.dimmbase*x;
-	const std::complex<double>& sfun_f = p.sfun(f);
-	double cf = real( sfun_f ) * cos( p.PIx2lambda0*f ) - imag( sfun_f ) * sin( p.PIx2lambda0*f );
-	cf = cf*8*jn(2,a)/a/a;
-	cf = cf*cf*pow( x, POWDIFF );
-	return cf*( 1.0 - 2.0*cos(p.phi)*cos(p.phi)*j0(b) + 2.0*cos(2*p.phi)*j1(b)/b );
+	const double powdiff = -0.666666666667;
+
+	using namespace std;
+
+	const dimm_params* p = (dimm_params*)params;
+
+	const double f = p->altitude*x*x / 2.0;
+	const double a = p->aperture*x;
+	const double b = p->dimmbase*x;
+	const std::complex<double>& sfun_f = p->sfun(f);
+	double cf = real( sfun_f ) * cos( p->PIx2lambda0*f ) - imag( sfun_f ) * sin( p->PIx2lambda0*f );
+	cf = cf*( a != 0.0 ? 8.0*jn(2,a)/(a*a) : 1.0 );
+	cf = cf*cf*pow( x, powdiff );
+
+	return cf*( 1.0 - j0(b) + p->cos2phi*jn(2,b) );
 }
 
 size_t next_pow2( size_t x ) {
@@ -120,23 +123,23 @@
 
 std::pair< vector_type, vector< complex_type > > spectral_band_fourier( const vector<double>& lambda, const vector<double>& dist, unsigned int 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 );
-	
+
 	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 ) );
 }
 
@@ -161,7 +164,7 @@
 	if( std::isfinite( hi_limit ) )
 		gsl::integration_qags( &F, 0, hi_limit, 0, EPS, WORKSPACE, w, &result, &error);
 	else
-		gsl::integration_qagiu( &F, 0, 0, EPS, WORKSPACE, w, &result, &error);
+		result = 0.0;
 	return result*CALIBR*std::pow(M_PI*100,freq_power_);
 }
 
@@ -177,23 +180,20 @@
 }
 
 basic_weight::result_type basic_weight::operator() ( const arg_type& height ) const {
-	const size_type mass_nchan = atmos::channels;
-	vector_type ret( atmos::indices_size );
-	size_type cur_n = 0;
-
-	for( size_type i = 0; i < mass_nchan; ++i )
-		ret( cur_n++ ) = do_calculate( height, ap_out_(i), ap_inn_(i), ap_out_(i), ap_inn_(i) );
+	indices_type ret( atmos::channels, atmos::channels );
 
-	for( size_type i = 0; i < mass_nchan; ++i )
-		for( size_type j = i + 1; j < mass_nchan; j++ )
-			ret( cur_n++ ) = do_calculate( height, ap_out_(i), ap_inn_(i), ap_out_(j), ap_inn_(j) );
+	for( indices_type::size_type i = 0; i < BOOST_UBLAS_SAME(ret.size1(),ret.size2()); ++i ) {
+		for( indices_type::size_type j = i; j < BOOST_UBLAS_SAME(ret.size1(),ret.size2()); ++j ) {
+			ret(i,j) = do_calculate( height, ap_out_(i), ap_inn_(i), ap_out_(j), ap_inn_(j) );
+		}
+	}
 
-	return ret;
+	return as_vector(ret);
 }
 
 }
 
-massdimm_weight::value_type massdimm_weight::do_dimm_calculate( value_type height, value_type diam, value_type dbase, value_type phi ) const {
+massdimm_weight::value_type massdimm_weight::do_dimm_calculate( value_type height, value_type diam, value_type dbase, value_type cos2phi ) const {
 	gsl::integration_workspace w(WORKSPACE);
 	double error;
 	dimm_params params(dimm_sfourier_);
@@ -203,7 +203,7 @@
 	params.aperture = M_PI*diam;
 	params.dimmbase = 2*M_PI*dbase;
 	params.PIx2lambda0 = 2*M_PI*dimm_leff_*MKM2CM;
-	params.phi = phi;
+	params.cos2phi = cos2phi;
 	double result;
 	params.altitude = height*KM2CM;
 	double hi_limit = std::sqrt( 2 * dimm_freq_max_ / params.altitude );
@@ -225,15 +225,9 @@
 }
 
 massdimm_weight::result_type massdimm_weight::operator() ( const arg_type& height ) const {
-	vector_type ret( atmos::indices_size + atmos::dimm_indices_size );
-	size_type cur_n = atmos::indices_size;
-
-	subrange( ret, 0, atmos::indices_size ) = basic_weight::operator() ( height );
-	
-	ret( cur_n++ ) = do_dimm_calculate( height, dimmsize_, dimmbase_, 0.0 ) * 1e+11;
-	ret( cur_n++ ) = do_dimm_calculate( height, dimmsize_, dimmbase_, M_PI/2 ) * 1e+11;
-
-	return ret;
+	return repack_massdimm( basic_weight::operator()(height), 
+		do_dimm_calculate( height, dimmsize_, dimmbase_, 1.0 ),   // longitudinal, phi = 0.0
+		do_dimm_calculate( height, dimmsize_, dimmbase_,-1.0 ) ); // transversal,  phi = Pi/2
 }
 
 mass_shortexposure_weight::mass_shortexposure_weight( const vector_type& mass_lambda, const vector_type& mass_response, const vector_type& ap_inn, const vector_type& ap_out ):

atmos-2.97.4.tar.gz/src/weif.h -> atmos-2.97.5.tar.gz/src/weif.h Changed

@@ -1,5 +1,5 @@
 /*
-    $Id: weif.h 200 2011-02-03 14:45:13Z matwey $
+    $Id: weif.h 279 2012-02-23 14:27:56Z matwey $
     Copyright (C) 2010  Sternberg Astronomical Institute, MSU
 
     This program is free software: you can redistribute it and/or modify
@@ -21,8 +21,10 @@
 
 #include <complex>
 
+#include <boost/numeric/ublas/symmetric.hpp>
 #include <boost/numeric/ublas/vector.hpp>
 
+#include "atmos.h"
 #include "spline.h"
 
 namespace atmos {
@@ -31,10 +33,77 @@
 
 	typedef double value_type;
 	typedef std::complex< value_type > complex_type;
+	typedef symmetric_matrix< value_type > symmetric_matrix_type;
 	typedef vector< value_type >   vector_type;
 	typedef vector_type::size_type size_type;
+
+	typedef symmetric_matrix_type  indices_type;
 	typedef vector_type            weight_type;
-	
+
+#ifdef BOOST_UBLAS_SHALLOW_ARRAY_ADAPTOR
+#  define AS_VECTOR__ARRAY_TYPE shallow_array_adaptor<const T>
+#  define AS_VECTOR__ARRAY_CONSTRUCT(size,mtx) size, mtx.data().begin()
+#else
+#  warning "Please, consider using -DBOOST_UBLAS_SHALLOW_ARRAY_ADAPTOR option."
+#  define AS_VECTOR__ARRAY_TYPE typename vector<T>::array_type
+#  define AS_VECTOR__ARRAY_CONSTRUCT(size,mtx) mtx.data()
+#endif // BOOST_UBLAS_SHALLOW_ARRAY_ADAPTOR
+template<class T, class TRI, class L, class A> vector<T, AS_VECTOR__ARRAY_TYPE > as_vector( const symmetric_matrix<T,TRI,L,A>& mtx ) {
+	typedef typename symmetric_matrix<T,TRI,L,A>::size_type size_type;
+	typedef AS_VECTOR__ARRAY_TYPE array_type;
+
+	const size_type size = L::triangular_size(mtx.size1(), mtx.size2());
+
+	return vector<T, AS_VECTOR__ARRAY_TYPE >(size, array_type(AS_VECTOR__ARRAY_CONSTRUCT(size,mtx)));
+}
+template<class T, class A> symmetric_matrix< T, lower, row_major, AS_VECTOR__ARRAY_TYPE > as_symmetric( const vector<T,A>& vec ) {
+	typedef typename vector<T,A>::size_type size_type;
+	typedef AS_VECTOR__ARRAY_TYPE array_type;
+	typedef row_major layout_type;
+
+	const size_type n = 8*vec.size()+1;
+	size_type size = 4*vec.size()+1, size0;
+	do { size0 = size; size = (size+n/size)/2; } while( size != size0 );
+	size = (size-1)/2;
+
+	return symmetric_matrix< T, lower, row_major, AS_VECTOR__ARRAY_TYPE >(size, array_type(AS_VECTOR__ARRAY_CONSTRUCT(layout_type::triangular_size(size,size),vec)));
+}
+template<class T, class A> vector<T> repack_massdimm( const vector<T, A>& mass_indices, const T& dimm_long, const T& dimm_trans ) {
+	typedef T value_type;
+	typedef typename vector<T>::size_type size_type;
+
+	const value_type scale_factor = 1e+11;
+	const size_type  size = mass_indices.size() + 2;
+
+	vector<T> ret(size);
+	for( size_type i = 0; i < mass_indices.size(); ++i ) { ret(i) = mass_indices(i); }
+	ret(size-2) = dimm_long  * scale_factor;
+	ret(size-1) = dimm_trans * scale_factor;
+	return ret;
+}
+template<class T, class A> vector<T, AS_VECTOR__ARRAY_TYPE > unpack_mass( const vector<T, A>& indices ) {
+	typedef typename vector<T, A>::size_type size_type;
+	typedef AS_VECTOR__ARRAY_TYPE array_type;
+	typedef T value_type;
+
+	const size_type size = atmos::indices_size;
+
+	assert( indices.size() >= size );
+
+	return vector<T, AS_VECTOR__ARRAY_TYPE >(size, array_type(AS_VECTOR__ARRAY_CONSTRUCT(size,indices)));
+}
+template<class T, class A> std::pair<T,T> unpack_dimm( const vector<T, A>& indices ) {
+	typedef typename vector<T, A>::size_type size_type;
+
+	const size_type size = indices.size();
+
+	assert( size >= atmos::indices_size + 2 );
+
+	return std::make_pair(indices(size-2),indices(size-1));
+}
+#undef AS_VECTOR__ARRAY_TYPE
+#undef AS_VECTOR__ARRAY_CONSTRUCT
+
 namespace detail {
 	class basic_weight {
 	public:
@@ -65,7 +134,7 @@
 class massdimm_weight:
 	public detail::basic_weight {
 private:
-	value_type do_dimm_calculate( value_type height, value_type diam, value_type dbase, value_type phi ) const;
+	value_type do_dimm_calculate( value_type height, value_type diam, value_type dbase, value_type cos2phi ) const;
 public:
 	massdimm_weight( const vector_type& mass_lambda, const vector_type& mass_response, const vector_type& dimm_lambda, const vector_type& dimm_response, const vector_type& ap_inn, const vector_type& ap_out, const value_type& dimmsize, const value_type& dimmbase );

atmos-2.97.4.tar.gz/src/weight_factory.cpp -> atmos-2.97.5.tar.gz/src/weight_factory.cpp Changed

@@ -1,5 +1,5 @@
 /*
-    $Id: weight_factory.cpp 231 2011-07-13 10:04:03Z matwey $
+    $Id: weight_factory.cpp 284 2012-03-25 16:06:23Z matwey $
     Copyright (C) 2009  Sternberg Astronomical Institute, MSU
 
     This program is free software: you can redistribute it and/or modify
@@ -38,7 +38,7 @@
 
 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() );
+		throw std::out_of_range( (boost::format("Grid height %1% is out of range") % x ).str() );
 	}
 	return weight_(x);
 }
@@ -189,7 +189,7 @@
 }
 
 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 char* name = { "A", "AB", "B", "AC", "BC", "C", "AD", "BD", "CD", "D", "L", "T" };
 	static const unsigned int name_size = sizeof(name) / sizeof(name0);
 	const double wscale = 1e+11;

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

@@ -1,5 +1,5 @@
 /*
-    $Id: worksheet.cpp 226 2011-07-12 13:13:12Z matwey $
+    $Id: worksheet.cpp 279 2012-02-23 14:27:56Z matwey $
     Copyright (C) 2009  Sternberg Astronomical Institute, MSU
 
     This program is free software: you can redistribute it and/or modify
@@ -71,11 +71,13 @@
 	std::auto_ptr< atmos::background::model::abstract > m_model;
 	const atmos::parameters::vector_type m_deadtime;
 	atmos::background::filter::nonpoisson m_nonpoisson_filter;
+	const double m_exposition;	
 public:
 	background_accumulator( const time_type& time, context_reference_type ctx ):
 		measurement_accumulator( time, ctx ),
 		m_model( ctx.m_background_factory.create_new_model(time) ),
 		m_deadtime( ctx.parameters().nonlinearity() ),
+		m_exposition( ctx.parameters().exposition() ),
 		m_nonpoisson_filter(
 			ctx.m_va"background-threshold".as<double>(),
 			ctx.parameters().nonpoisson()(3),
@@ -90,7 +92,7 @@
 		
 		if( ! m_nonpoisson_filter( time, mean, vars ) ) {
 			if( m_model.get() ) {
-				m_model->accumulate( time, flux_nonlinearity_correction( mean, m_deadtime ) );
+				m_model->accumulate( time, flux_nonlinearity_correction( mean / m_exposition, m_deadtime ) );
 			}
 		}
 	}
@@ -259,8 +261,8 @@
 			std::pair<double,double> free_seeing = integrals::seeing(moment_0,moment_0_err);
 			std::pair<double,double> isoplanatic_angle = integrals::isoplanatic_angle(moments(integrals::moment_53),moments_err(integrals::moment_53)/moments(integrals::moment_53));
 			std::pair<double,double> altitude_eff = integrals::effective_altitude(moment_0,moment_0_err,moments(integrals::moment_1),moments_err(integrals::moment_1)/moments(integrals::moment_1));
-			std::pair<double,double> desi_time_constant = integrals::time_constant_desi(desi,desi_err/desi);
-			std::pair<double,double> time_constant = integrals::time_constant(wind_moments(integrals::moment_0),wind_moments_err(integrals::moment_0)/wind_moments(integrals::moment_0),moment_0,moment_0_err);
+			std::pair<double,double> desi_time_constant = integrals::time_constant_desi(desi,desi_err/desi,m_exposition);
+			std::pair<double,double> time_constant = integrals::time_constant(wind_moments(integrals::moment_0),wind_moments_err(integrals::moment_0)/wind_moments(integrals::moment_0),moment_0,moment_0_err,m_exposition);
 
 			context().m_file_output.atmosphere( meantime,
 				free_seeing.first, free_seeing.second,
@@ -307,10 +309,16 @@
 				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 ) );
+
+				vector< double > residual_avg = mean( profile.residual().begin(), profile.residual().end() );
+				residual_avg = element_div( rfun.indices_residual( residual_avg ), mixture_avg );
+
+				boost::optional< std::pair<double, double> > residual_dimm;
+				if( m_dimm.size() > 1 ) { residual_dimm = weight::unpack_dimm(residual_avg); }
+				context().m_file_output.residual( meantime, "X", weight::as_symmetric(weight::unpack_mass(residual_avg)), residual_dimm );
+
 			}
 		}

atmos-2.97.5.tar.gz/test Added

atmos-2.97.5.tar.gz/test/Makefile.am Added

atmos-2.97.5.tar.gz/test/Makefile.in Added

@@ -0,0 +1,554 @@
+# Makefile.in generated by automake 1.12.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
+# This Makefile.in 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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = test
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^$^/*$/.*$$,\1,'; \
+  sed_rest='s,^^/*/*,,'; \
+  sed_last='s,^.*/$^/*$$$,\1,'; \
+  sed_butlast='s,/*^/*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+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@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CXX = @ac_ct_CXX@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+subdirs = @subdirs@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = unit
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)

atmos-2.97.5.tar.gz/test/unit Added

atmos-2.97.5.tar.gz/test/unit/Makefile.am Added

atmos-2.97.5.tar.gz/test/unit/Makefile.in Added

@@ -0,0 +1,576 @@
+# Makefile.in generated by automake 1.12.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
+# This Makefile.in 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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+bin_PROGRAMS = profile_test$(EXEEXT)
+subdir = test/unit
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/depcomp
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+PROGRAMS = $(bin_PROGRAMS)
+am_profile_test_OBJECTS = profile_test.$(OBJEXT) profile.$(OBJEXT) \
+	integrals.$(OBJEXT) weight_factory.$(OBJEXT) weif.$(OBJEXT) \
+	utils.$(OBJEXT)
+profile_test_OBJECTS = $(am_profile_test_OBJECTS)
+profile_test_LDADD = $(LDADD)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
+SOURCES = $(profile_test_SOURCES)
+DIST_SOURCES = $(profile_test_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+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@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CXX = @ac_ct_CXX@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+subdirs = @subdirs@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+profile_test_SOURCES = profile_test.cpp \
+	@top_srcdir@/src/profile.cpp @top_srcdir@/src/integrals.cpp \
+	@top_srcdir@/src/weight_factory.cpp @top_srcdir@/src/weif.cpp @top_srcdir@/src/utils.cpp
+
+AM_CPPFLAGS = -I @abs_top_srcdir@/src -I @abs_top_srcdir@/third-party/lsp/include -I @abs_top_srcdir@/third-party/yalpa/include -DBOOST_UBLAS_SHALLOW_ARRAY_ADAPTOR
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/unit/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu test/unit/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \

atmos-2.97.5.tar.gz/test/unit/profile_test.cpp Added

@@ -0,0 +1,83 @@
+#include <boost/test/included/unit_test.hpp>
+#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/parameterized_test.hpp>
+#include <boost/bind.hpp>
+
+#include <boost/numeric/ublas/matrix.hpp>
+#include <boost/numeric/ublas/io.hpp>
+
+#include "atmos.h"
+#include "profile.h"
+#include "weight_factory.h"
+#include "weif.h"
+#include "utils.h"
+
+using namespace atmos;
+
+using namespace boost::unit_test;
+
+class massdimm_restoration_test {
+public:
+	typedef profile::functor::weight_type weight_type;
+	typedef weight::vector_type vector_type;
+
+	massdimm_restoration_test( const weight_type& weight ): weight_(weight) {
+	}
+
+	void operator() ( double altitude, double power ) const {
+		using namespace boost::numeric::ublas;
+
+		const vector_type indices = weight_( altitude ) * power;
+
+		vector_type grid(1);
+		grid(0) = altitude;
+
+		const profile::functor::mixture_covariance_type covariance = identity_matrix<double>(indices.size()); 
+
+		profile::functor rfun( grid, covariance, 1.0, weight_ );
+
+		const profile::functor::result_type& res = rfun( indices );
+		BOOST_CHECK_CLOSE( res.cn2(0), power, 1e-6 );
+	}
+
+	weight_type weight_;
+};
+
+weight::factory* weight_factory;
+massdimm_restoration_test* massdimm_restoration_test_obj;
+
+test_suite* init_unit_test_suite( int argc, char** argv ) {
+	test_suite* restoration = BOOST_TEST_SUITE( "restoration_suite" );
+
+	const std::string spectra_dir   = "./spectra";
+	const std::string mass_response = "./mass_maid.crv";
+	const std::string ccd_response  = "./ccd.crv";
+	const std::string spectral_cls  = "a05";
+
+	weight_factory = new weight::factory( spectra_dir, mass_response, ccd_response );
+
+	weight::vector_type inner_diam(atmos::channels);
+	weight::vector_type outer_diam(atmos::channels);
+	inner_diam(0)=0.0; outer_diam(0)=1.27;
+	inner_diam(1)=1.3; outer_diam(1)=2.15;
+	inner_diam(2)=2.2; outer_diam(2)=3.85;
+	inner_diam(3)=3.9; outer_diam(3)=5.50;
+	inner_diam = inner_diam * 14.5*0.1;
+	outer_diam = outer_diam * 14.5*0.1;
+	double dimm_aperture_base = 0.02;
+	double dimm_aperture_size = 0.01;
+
+	massdimm_restoration_test_obj = new massdimm_restoration_test(weight_factory->nullexposure_weight( spectral_cls, inner_diam, outer_diam, dimm_aperture_base, dimm_aperture_size ));
+
+	double powers = { 1e-16, 1e-14, 1e-13, 1e-11 };
+	double altitudes = { 0.0, 0.25, 0.5, 0.75, 1.0, 1.5, 2.0, 3.0, 4.0, 6.0, 8.0, 12.0, 16.0, 25.0 };
+	for( int i=0; i < sizeof(powers)/sizeof(powers0); ++i ) {
+		callback1<double> massdimm_resotration_test_i_cb = boost::bind( &massdimm_restoration_test::operator(), massdimm_restoration_test_obj, _1, powersi );
+		restoration->add( BOOST_PARAM_TEST_CASE( massdimm_resotration_test_i_cb, altitudes, altitudes+sizeof(altitudes)/sizeof(altitudes0) ) );
+	}
+
+	framework::master_test_suite().add( restoration );
+
+	return 0;
+}
+

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

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.12.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in 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.
@@ -15,6 +14,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,6 +66,11 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -207,11 +228,11 @@
 $(am__aclocal_m4_deps):
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (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):
 	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
@@ -275,6 +296,10 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
+cscopelist-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
+	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -338,6 +363,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -373,13 +412,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -407,10 +443,15 @@
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -478,21 +519,22 @@
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
+	cscopelist-recursive ctags-recursive install-am install-strip \
+	tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic ctags \
-	ctags-recursive distclean distclean-generic distclean-tags \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
-	tags-recursive uninstall uninstall-am
+	all all-am check check-am clean clean-generic cscopelist \
+	cscopelist-recursive ctags ctags-recursive distclean \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
 
 
 install:

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

@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -226,6 +226,11 @@
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
@@ -304,9 +309,10 @@
 overridden in the site shell script).
 
 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
 
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
@@ -362,4 +368,3 @@
 
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
-

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

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.12.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in 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.
@@ -15,6 +14,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -34,7 +50,7 @@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
-	ChangeLog INSTALL NEWS depcomp install-sh missing
+	ChangeLog INSTALL NEWS install-sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -54,21 +70,30 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir dist dist-all distcheck
+	cscope distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
+CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^$^/*$/.*$$,\1,'; \
@@ -96,7 +121,10 @@
   reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -188,7 +216,7 @@
 all: all-recursive
 
 .SUFFIXES:
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -224,11 +252,11 @@
 $(am__aclocal_m4_deps):
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (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):
 	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
@@ -292,6 +320,10 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
+cscopelist-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
+	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -355,8 +387,32 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+
+clean-cscope:
+	-rm -f cscope.files
+
+cscope.files: clean-cscope cscopelist-recursive cscopelist
+
+cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
@@ -392,13 +448,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -427,36 +480,36 @@
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
 
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__post_remove_distdir)

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

@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.1 -*- Autoconf -*-
+
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 # 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.
@@ -13,28 +13,30 @@
 
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
-m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.68,,
-m4_warning(this file was generated for autoconf 2.68.
+m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.69,,
+m4_warning(this file was generated for autoconf 2.69.
 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'.))
+To do so, use the procedure documented by the package, typically 'autoreconf'.))
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
 #
 # 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 8
+
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN(AM_AUTOMAKE_VERSION,
-am__api_version='1.11'
+am__api_version='1.12'
 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.1, ,
+m4_if($1, 1.12.1, ,
       AC_FATAL(Do not call $0, use AM_INIT_AUTOMAKE($1).))dnl
 )
 
@@ -50,22 +52,24 @@
 # 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.1)dnl
+AM_AUTOMAKE_VERSION(1.12.1)dnl
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
 _AM_AUTOCONF_VERSION(m4_defn(AC_AUTOCONF_VERSION)))
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
 #
 # 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 2
+
 # For projects using AC_CONFIG_AUX_DIR(foo), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory.  The problem is that $srcdir (and
@@ -84,7 +88,7 @@
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -110,22 +114,21 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
 #
 # 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 9
+# serial 10
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN(AM_CONDITIONAL,
-AC_PREREQ(2.52)dnl
- ifelse($1, TRUE,  AC_FATAL($0: invalid condition: $1),
-	$1, FALSE, AC_FATAL($0: invalid condition: $1))dnl
+AC_PREREQ(2.52)dnl
+ m4_if($1, TRUE,  AC_FATAL($0: invalid condition: $1),
+       $1, FALSE, AC_FATAL($0: invalid condition: $1))dnl
 AC_SUBST($1_TRUE)dnl
 AC_SUBST($1_FALSE)dnl
 _AM_SUBST_NOTMAKE($1_TRUE)dnl
@@ -144,16 +147,15 @@
 Usually this means the macro was only invoked conditionally.)
 fi))
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
 #
 # 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 10
+# serial 17
 
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery.  Also note that it means that autoscan, seeing
@@ -163,7 +165,7 @@
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -176,12 +178,13 @@
 AC_REQUIRE(AM_MAKE_INCLUDE)dnl
 AC_REQUIRE(AM_DEP_TRACK)dnl
 
-ifelse($1, CC,   depcc="$CC"   am_compiler_list=,
-       $1, CXX,  depcc="$CXX"  am_compiler_list=,
-       $1, OBJC, depcc="$OBJC" am_compiler_list='gcc3 gcc',
-       $1, UPC,  depcc="$UPC"  am_compiler_list=,
-       $1, GCJ,  depcc="$GCJ"  am_compiler_list='gcc3 gcc',
-                   depcc="$$1"   am_compiler_list=)
+m4_if($1, CC,   depcc="$CC"   am_compiler_list=,
+      $1, CXX,  depcc="$CXX"  am_compiler_list=,
+      $1, OBJC, depcc="$OBJC" am_compiler_list='gcc3 gcc',
+      $1, OBJCXX, depcc="$OBJCXX" am_compiler_list='gcc3 gcc',
+      $1, UPC,  depcc="$UPC"  am_compiler_list=,
+      $1, GCJ,  depcc="$GCJ"  am_compiler_list='gcc3 gcc',
+                    depcc="$$1"   am_compiler_list=)
 
 AC_CACHE_CHECK(dependency style of $depcc,
                am_cv_$1_dependencies_compiler_type,
@@ -189,8 +192,9 @@
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -229,16 +233,16 @@
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -247,16 +251,16 @@
       test "$am__universal" = false || continue

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

@@ -1,13 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for lsp 0.1.0.
+# Generated by GNU Autoconf 2.69 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, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -169,7 +192,8 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -214,21 +238,25 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -331,6 +359,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -452,6 +488,10 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $0, causing all sort of problems
   # (the dirname of $0 is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -486,16 +526,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -507,28 +547,8 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???sx*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g'"
@@ -612,6 +632,7 @@
 am__fastdepCXX_FALSE
 am__fastdepCXX_TRUE
 CXXDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -1156,8 +1177,6 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1317,8 +1336,10 @@
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE=ARG  include FEATURE ARG=yes
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors

atmos-2.97.4.tar.gz/third-party/lsp/depcomp -> atmos-2.97.5.tar.gz/third-party/lsp/depcomp Changed

@@ -1,10 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-03-27.16; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
 
 # 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
@@ -28,7 +27,7 @@
 
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
@@ -40,11 +39,11 @@
 
 Environment variables:
   depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
+  tmpdepfile  Temporary file to use when outputting dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
@@ -57,6 +56,12 @@
     ;;
 esac
 
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
@@ -90,10 +95,24 @@
    # This is just like msvisualcpp but w/o cygpath translation.
    # Just convert the backslash-escaped backslashes to single forward
    # slashes to satisfy depend.m4
-   cygpath_u="sed s,\\\\\\\\,/,g"
+   cygpath_u='sed s,\\\\,/,g'
    depmode=msvisualcpp
 fi
 
+if test "$depmode" = msvc7msys; then
+   # This is just like msvc7 but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u='sed s,\\\\,/,g'
+   depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
+   gccflag=-qmakedep=gcc,-MF
+   depmode=gcc
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -148,20 +167,21 @@
 ## The second -e expression handles DOS-style file names with drive letters.
   sed -e 's/^^:*: / /' \
       -e 's/^'$alpha':\/^:*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
+## This next piece of magic avoids the "deleted header file" problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
+  tr ' ' "$nl" < "$tmpdepfile" |
+## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+      | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -193,18 +213,15 @@
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
     # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
+    # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
     | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> "$depfile"
+    tr "$nl" ' ' >> "$depfile"
     echo >> "$depfile"
 
     # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
    >> "$depfile"
   else
@@ -216,10 +233,17 @@
   rm -f "$tmpdepfile"
   ;;
 
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies
   # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
   dir=`echo "$object" | sed -e 's|/^/*$|/|'`
@@ -249,12 +273,11 @@
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
+    # Each line is of the form 'foo.o: dependent.h'.
     # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
+    # '$object: dependent.h' and one to simply 'dependent.h:'.
     sed -e "s,^.*\.a-z*:,$object:," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the .
-    sed -e 's,^.*\.a-z*:	 *,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+    sed -e 's,^.*\.a-z*:'"$tab"' *,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -265,23 +288,26 @@
   ;;
 
 icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
+  # However on
+  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
   # ICC 7.0 will fill foo.d with something like
   #    foo.o: sub/foo.c
   #    foo.o: sub/foo.h
-  # which is wrong.  We want:
+  # which is wrong.  We want
   #    sub/foo.o: sub/foo.c
   #    sub/foo.o: sub/foo.h
   #    sub/foo.c:
   #    sub/foo.h:
   # ICC 7.1 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
+  # and will wrap long lines using '\':
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
-
+  # tcc 0.9.26 (FIXME still under development at the moment of writing)
+  # will emit a similar output, but also prepend the continuation lines
+  # with horizontal tabulation characters.
   "$@" -MD -MF "$tmpdepfile"
   stat=$?
   if test $stat -eq 0; then :
@@ -290,15 +316,21 @@
     exit $stat
   fi
   rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.

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

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.12.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in 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.
@@ -15,6 +14,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -43,6 +59,11 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -170,6 +191,8 @@
 ctags: CTAGS
 CTAGS:
 
+cscope cscopelist:
+
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
@@ -215,10 +238,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:

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

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.12.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in 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.
@@ -15,6 +14,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,6 +67,11 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -208,10 +229,8 @@
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
+	@if test ! -f $@; then rm -f stamp-h1; else :; fi
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -225,11 +244,11 @@
 	-rm -f config.h stamp-h1
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (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):
 	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
@@ -293,6 +312,10 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
+cscopelist-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
+	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -356,6 +379,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -391,13 +428,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -432,10 +466,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -514,20 +553,22 @@
 uninstall-am:
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
-	ctags-recursive install-am install-strip tags-recursive
+	cscopelist-recursive ctags-recursive install-am install-strip \
+	tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic ctags \
-	ctags-recursive distclean distclean-generic distclean-hdr \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
-	tags-recursive uninstall uninstall-am
+	all all-am check check-am clean clean-generic cscopelist \
+	cscopelist-recursive ctags ctags-recursive distclean \
+	distclean-generic distclean-hdr distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

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

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.12.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in 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.
@@ -16,6 +15,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -45,6 +61,11 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -66,6 +87,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(lsp_includedir)"
 HEADERS = $(lsp_include_HEADERS)
 ETAGS = etags
@@ -194,8 +221,11 @@
 $(am__aclocal_m4_deps):
 install-lsp_includeHEADERS: $(lsp_include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(lsp_includedir)" || $(MKDIR_P) "$(DESTDIR)$(lsp_includedir)"
 	@list='$(lsp_include_HEADERS)'; test -n "$(lsp_includedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(lsp_includedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(lsp_includedir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -209,9 +239,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(lsp_include_HEADERS)'; test -n "$(lsp_includedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(lsp_includedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(lsp_includedir)" && rm -f $$files
+	dir='$(DESTDIR)$(lsp_includedir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -262,6 +290,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -312,10 +354,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -396,16 +443,17 @@
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	ctags distclean distclean-generic distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-lsp_includeHEADERS \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
-	uninstall uninstall-am uninstall-lsp_includeHEADERS
+	cscopelist ctags distclean distclean-generic distclean-tags \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-lsp_includeHEADERS install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-lsp_includeHEADERS
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

atmos-2.97.4.tar.gz/third-party/lsp/install-sh -> atmos-2.97.5.tar.gz/third-party/lsp/install-sh Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-11-20.07; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
@@ -156,6 +156,10 @@
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+	# Protect names problematic for 'test' and other utilities.
+	case $dst_arg in
+	  -* | =!) dst_arg=./$dst_arg;;
+	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | =!) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -194,13 +202,17 @@
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call `install-sh -d' without argument.
+  # It's OK to call 'install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for 'test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | =!) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -347,7 +354,7 @@
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
+		   # other-writable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in
@@ -385,7 +392,7 @@
 
       case $dstdir in
 	/*) prefix='/';;
-	-*) prefix='./';;
+	-=!*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@
 
       for d
       do
-	test -z "$d" && continue
+	test X"$d" = X && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then

atmos-2.97.4.tar.gz/third-party/lsp/missing -> atmos-2.97.5.tar.gz/third-party/lsp/missing Changed

@@ -1,10 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.18; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -26,7 +25,7 @@
 # the same distribution terms that you use for the rest of that program.
 
 if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
+  echo 1>&2 "Try '$0 --help' for more information"
   exit 1
 fi
 
@@ -34,7 +33,7 @@
 sed_output='s/.* --output =$^ *$.*/\1/p'
 sed_minuso='s/.* -o $^ *$.*/\1/p'
 
-# In the cases where this matters, `missing' is being run in the
+# In the cases where this matters, 'missing' is being run in the
 # srcdir already.
 if test -f configure.ac; then
   configure_ac=configure.ac
@@ -65,7 +64,7 @@
     echo "\
 $0 OPTION... PROGRAM ARGUMENT...
 
-Handle \`PROGRAM ARGUMENT...' for when PROGRAM is missing, or return an
+Handle 'PROGRAM ARGUMENT...' for when PROGRAM is missing, or return an
 error status if there is no known handling for PROGRAM.
 
 Options:
@@ -74,21 +73,20 @@
   --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
+  aclocal      touch file 'aclocal.m4'
+  autoconf     touch file 'configure'
+  autoheader   touch file 'config.h.in'
   autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.ch', if possible, from existing .ch
-  flex         create \`lex.yy.c', if possible, from existing .c
+  automake     touch all 'Makefile.in' files
+  bison        create 'y.tab.ch', if possible, from existing .ch
+  flex         create 'lex.yy.c', if possible, from existing .c
   help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
+  lex          create 'lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.ch', if possible, from existing .ch
+  yacc         create 'y.tab.ch', if possible, from existing .ch
 
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
 
 Send bug reports to <bug-automake@gnu.org>."
     exit $?
@@ -100,8 +98,8 @@
     ;;
 
   -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
+    echo 1>&2 "$0: Unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
     exit 1
     ;;
 
@@ -122,22 +120,13 @@
     # Not GNU programs, they don't have --version.
     ;;
 
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
   *)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
        exit 1
     elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
        # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
+       # running '$TOOL --version' or '$TOOL --help' to check whether
        # $TOOL exists and not knowing $TOOL uses missing.
        exit 1
     fi
@@ -149,27 +138,27 @@
 case $program in
   aclocal*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
+WARNING: '$1' is $msg.  You should only need it if
+         you modified 'acinclude.m4' or '${configure_ac}'.  You might want
+         to install the Automake and Perl packages.  Grab them from
          any GNU archive site."
     touch aclocal.m4
     ;;
 
   autoconf*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+WARNING: '$1' is $msg.  You should only need it if
+         you modified '${configure_ac}'.  You might want to install the
+         Autoconf and GNU m4 packages.  Grab them from any GNU
          archive site."
     touch configure
     ;;
 
   autoheader*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+WARNING: '$1' is $msg.  You should only need it if
+         you modified 'acconfig.h' or '${configure_ac}'.  You might want
+         to install the Autoconf and GNU m4 packages.  Grab them
          from any GNU archive site."
     files=`sed -n 's/^ *ACM_CONFIG_HEADER($^)*$).*/\1/p' ${configure_ac}`
     test -z "$files" && files="config.h"
@@ -186,9 +175,9 @@
 
   automake*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
+WARNING: '$1' is $msg.  You should only need it if
+         you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'.
+         You might want to install the Automake and Perl packages.
          Grab them from any GNU archive site."
     find . -type f -name Makefile.am -print |
 	   sed 's/\.am$/.in/' |
@@ -197,10 +186,10 @@
 
   autom4te*)
     echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
+WARNING: '$1' is needed, but is $msg.
          You might have modified some files without having the
          proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
+         You can get '$1' as part of Autoconf from any GNU
          archive site."
 
     file=`echo "$*" | sed -n "$sed_output"`
@@ -220,13 +209,13 @@
 
   bison*|yacc*)
     echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
+WARNING: '$1' $msg.  You should only need it if
+         you modified a '.y' file.  You may need the Bison package
          in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
+         Bison from any GNU archive site."
     rm -f y.tab.c y.tab.h
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -250,13 +239,13 @@
 
   lex*|flex*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
+WARNING: '$1' is $msg.  You should only need it if
+         you modified a '.l' file.  You may need the Flex package
          in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
+         Flex from any GNU archive site."
     rm -f lex.yy.c

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

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.12.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in 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.
@@ -16,6 +15,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -37,7 +53,8 @@
 	least_squares$(EXEEXT) lsp$(EXEEXT) nnls$(EXEEXT) \
 	qr_decomposition$(EXEEXT) singular_decomposition$(EXEEXT)
 subdir = test
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -89,6 +106,11 @@
 	$(givens_rotation_SOURCES) $(householder_transform_SOURCES) \
 	$(least_squares_SOURCES) $(lsp_SOURCES) $(nnls_SOURCES) \
 	$(qr_decomposition_SOURCES) $(singular_decomposition_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -224,8 +246,11 @@
 $(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
 	while read p p1; do if test -f $$p; \
@@ -259,28 +284,28 @@
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-cholesky_decomposition$(EXEEXT): $(cholesky_decomposition_OBJECTS) $(cholesky_decomposition_DEPENDENCIES) 
+cholesky_decomposition$(EXEEXT): $(cholesky_decomposition_OBJECTS) $(cholesky_decomposition_DEPENDENCIES) $(EXTRA_cholesky_decomposition_DEPENDENCIES) 
 	@rm -f cholesky_decomposition$(EXEEXT)
 	$(CXXLINK) $(cholesky_decomposition_OBJECTS) $(cholesky_decomposition_LDADD) $(LIBS)
-givens_rotation$(EXEEXT): $(givens_rotation_OBJECTS) $(givens_rotation_DEPENDENCIES) 
+givens_rotation$(EXEEXT): $(givens_rotation_OBJECTS) $(givens_rotation_DEPENDENCIES) $(EXTRA_givens_rotation_DEPENDENCIES) 
 	@rm -f givens_rotation$(EXEEXT)
 	$(CXXLINK) $(givens_rotation_OBJECTS) $(givens_rotation_LDADD) $(LIBS)
-householder_transform$(EXEEXT): $(householder_transform_OBJECTS) $(householder_transform_DEPENDENCIES) 
+householder_transform$(EXEEXT): $(householder_transform_OBJECTS) $(householder_transform_DEPENDENCIES) $(EXTRA_householder_transform_DEPENDENCIES) 
 	@rm -f householder_transform$(EXEEXT)
 	$(CXXLINK) $(householder_transform_OBJECTS) $(householder_transform_LDADD) $(LIBS)
-least_squares$(EXEEXT): $(least_squares_OBJECTS) $(least_squares_DEPENDENCIES) 
+least_squares$(EXEEXT): $(least_squares_OBJECTS) $(least_squares_DEPENDENCIES) $(EXTRA_least_squares_DEPENDENCIES) 
 	@rm -f least_squares$(EXEEXT)
 	$(CXXLINK) $(least_squares_OBJECTS) $(least_squares_LDADD) $(LIBS)
-lsp$(EXEEXT): $(lsp_OBJECTS) $(lsp_DEPENDENCIES) 
+lsp$(EXEEXT): $(lsp_OBJECTS) $(lsp_DEPENDENCIES) $(EXTRA_lsp_DEPENDENCIES) 
 	@rm -f lsp$(EXEEXT)
 	$(CXXLINK) $(lsp_OBJECTS) $(lsp_LDADD) $(LIBS)
-nnls$(EXEEXT): $(nnls_OBJECTS) $(nnls_DEPENDENCIES) 
+nnls$(EXEEXT): $(nnls_OBJECTS) $(nnls_DEPENDENCIES) $(EXTRA_nnls_DEPENDENCIES) 
 	@rm -f nnls$(EXEEXT)
 	$(CXXLINK) $(nnls_OBJECTS) $(nnls_LDADD) $(LIBS)
-qr_decomposition$(EXEEXT): $(qr_decomposition_OBJECTS) $(qr_decomposition_DEPENDENCIES) 
+qr_decomposition$(EXEEXT): $(qr_decomposition_OBJECTS) $(qr_decomposition_DEPENDENCIES) $(EXTRA_qr_decomposition_DEPENDENCIES) 
 	@rm -f qr_decomposition$(EXEEXT)
 	$(CXXLINK) $(qr_decomposition_OBJECTS) $(qr_decomposition_LDADD) $(LIBS)
-singular_decomposition$(EXEEXT): $(singular_decomposition_OBJECTS) $(singular_decomposition_DEPENDENCIES) 
+singular_decomposition$(EXEEXT): $(singular_decomposition_OBJECTS) $(singular_decomposition_DEPENDENCIES) $(EXTRA_singular_decomposition_DEPENDENCIES) 
 	@rm -f singular_decomposition$(EXEEXT)
 	$(CXXLINK) $(singular_decomposition_OBJECTS) $(singular_decomposition_LDADD) $(LIBS)
 
@@ -362,6 +387,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -412,10 +451,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -499,7 +543,7 @@
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic ctags distclean distclean-compile \
+	clean-generic cscopelist ctags distclean distclean-compile \
 	distclean-generic distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-binPROGRAMS \
 	install-data install-data-am install-dvi install-dvi-am \

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

@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -226,6 +226,11 @@
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
@@ -304,9 +309,10 @@
 overridden in the site shell script).
 
 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
 
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
@@ -362,4 +368,3 @@
 
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
-

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

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.12.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in 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.
@@ -15,6 +14,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -37,7 +53,7 @@
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
 	COPYING.LESSER ChangeLog INSTALL NEWS config.guess config.sub \
-	depcomp install-sh ltmain.sh missing
+	install-sh ltmain.sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -60,21 +76,30 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir dist dist-all distcheck
+	cscope distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
+CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^$^/*$/.*$$,\1,'; \
@@ -102,7 +127,10 @@
   reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -227,7 +255,7 @@
 all: all-recursive
 
 .SUFFIXES:
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -272,11 +300,11 @@
 	-rm -f libtool config.lt
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (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):
 	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
@@ -340,6 +368,10 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
+cscopelist-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
+	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -403,8 +435,32 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+
+clean-cscope:
+	-rm -f cscope.files
+
+cscope.files: clean-cscope cscopelist-recursive cscopelist
+
+cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
@@ -440,13 +496,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -475,36 +528,36 @@
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
 
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__post_remove_distdir)

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

@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.1 -*- Autoconf -*-
+
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 # 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.
@@ -13,28 +13,30 @@
 
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
-m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.68,,
-m4_warning(this file was generated for autoconf 2.68.
+m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.69,,
+m4_warning(this file was generated for autoconf 2.69.
 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'.))
+To do so, use the procedure documented by the package, typically 'autoreconf'.))
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
 #
 # 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 8
+
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN(AM_AUTOMAKE_VERSION,
-am__api_version='1.11'
+am__api_version='1.12'
 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.1, ,
+m4_if($1, 1.12.1, ,
       AC_FATAL(Do not call $0, use AM_INIT_AUTOMAKE($1).))dnl
 )
 
@@ -50,22 +52,24 @@
 # 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.1)dnl
+AM_AUTOMAKE_VERSION(1.12.1)dnl
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
 _AM_AUTOCONF_VERSION(m4_defn(AC_AUTOCONF_VERSION)))
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
 #
 # 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 2
+
 # For projects using AC_CONFIG_AUX_DIR(foo), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory.  The problem is that $srcdir (and
@@ -84,7 +88,7 @@
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -110,22 +114,21 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
 #
 # 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 9
+# serial 10
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN(AM_CONDITIONAL,
-AC_PREREQ(2.52)dnl
- ifelse($1, TRUE,  AC_FATAL($0: invalid condition: $1),
-	$1, FALSE, AC_FATAL($0: invalid condition: $1))dnl
+AC_PREREQ(2.52)dnl
+ m4_if($1, TRUE,  AC_FATAL($0: invalid condition: $1),
+       $1, FALSE, AC_FATAL($0: invalid condition: $1))dnl
 AC_SUBST($1_TRUE)dnl
 AC_SUBST($1_FALSE)dnl
 _AM_SUBST_NOTMAKE($1_TRUE)dnl
@@ -144,16 +147,15 @@
 Usually this means the macro was only invoked conditionally.)
 fi))
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
 #
 # 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 10
+# serial 17
 
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery.  Also note that it means that autoscan, seeing
@@ -163,7 +165,7 @@
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -176,12 +178,13 @@
 AC_REQUIRE(AM_MAKE_INCLUDE)dnl
 AC_REQUIRE(AM_DEP_TRACK)dnl
 
-ifelse($1, CC,   depcc="$CC"   am_compiler_list=,
-       $1, CXX,  depcc="$CXX"  am_compiler_list=,
-       $1, OBJC, depcc="$OBJC" am_compiler_list='gcc3 gcc',
-       $1, UPC,  depcc="$UPC"  am_compiler_list=,
-       $1, GCJ,  depcc="$GCJ"  am_compiler_list='gcc3 gcc',
-                   depcc="$$1"   am_compiler_list=)
+m4_if($1, CC,   depcc="$CC"   am_compiler_list=,
+      $1, CXX,  depcc="$CXX"  am_compiler_list=,
+      $1, OBJC, depcc="$OBJC" am_compiler_list='gcc3 gcc',
+      $1, OBJCXX, depcc="$OBJCXX" am_compiler_list='gcc3 gcc',
+      $1, UPC,  depcc="$UPC"  am_compiler_list=,
+      $1, GCJ,  depcc="$GCJ"  am_compiler_list='gcc3 gcc',
+                    depcc="$$1"   am_compiler_list=)
 
 AC_CACHE_CHECK(dependency style of $depcc,
                am_cv_$1_dependencies_compiler_type,
@@ -189,8 +192,9 @@
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -229,16 +233,16 @@
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -247,16 +251,16 @@
       test "$am__universal" = false || continue

atmos-2.97.4.tar.gz/third-party/yalpa/config.guess -> atmos-2.97.5.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, 2009
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2012-02-10'
 
 # 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
@@ -17,9 +17,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -56,8 +54,9 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+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."
@@ -140,12 +139,12 @@
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
 case "${UNAME_MACHINE}" in
-    i?86)
-	test -z "$VENDOR" && VENDOR=pc
-	;;
-    *)
-	test -z "$VENDOR" && VENDOR=unknown
-	;;
+  i?86)
+     test -z "$VENDOR" && VENDOR=pc
+     ;;
+  *)
+     test -z "$VENDOR" && VENDOR=unknown
+     ;;
 esac
 test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
 
@@ -154,7 +153,7 @@
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -190,7 +189,7 @@
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -233,7 +232,7 @@
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -279,7 +278,10 @@
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^PVTX//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -305,7 +307,7 @@
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.012*:*|arm:riscix:1.012*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -404,23 +406,23 @@
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atariste:*MiNT:*:* | atariste:*mint:*:* | atariste:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atariste:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-${VENDOR}-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-${VENDOR}-mint${UNAME_RELEASE}
+	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -490,8 +492,8 @@
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if  $UNAME_PROCESSOR = mc88100  ||  $UNAME_PROCESSOR = mc88110 
 	then
 	    if  ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx  || \
@@ -504,7 +506,7 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -561,7 +563,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:456)
+    *:AIX:*:4567)
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -604,52 +606,52 @@
 	    9000/6780-90-9)
 		if  -x /usr/bin/getconf ; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
+			esac ;;
+		    esac
 		fi
 		if  "${HP_ARCH}" = "" ; then
 		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
+		    sed 's/^		//' << EOF >$dummy.c
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>

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

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

@@ -1,13 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for yalpa 0.1.
+# Generated by GNU Autoconf 2.69 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, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -169,7 +192,8 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -222,21 +246,25 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -339,6 +367,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -460,6 +496,10 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $0, causing all sort of problems
   # (the dirname of $0 is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -494,16 +534,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -515,28 +555,8 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???sx*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g'"
@@ -656,6 +676,7 @@
 am__fastdepCXX_FALSE
 am__fastdepCXX_TRUE
 CXXDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -1210,8 +1231,6 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1375,8 +1394,10 @@
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE=ARG  include FEATURE ARG=yes
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors

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

atmos-2.97.4.tar.gz/third-party/yalpa/depcomp -> atmos-2.97.5.tar.gz/third-party/yalpa/depcomp Changed

@@ -1,10 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-03-27.16; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
 
 # 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
@@ -28,7 +27,7 @@
 
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
@@ -40,11 +39,11 @@
 
 Environment variables:
   depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
+  tmpdepfile  Temporary file to use when outputting dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
@@ -57,6 +56,12 @@
     ;;
 esac
 
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
@@ -90,10 +95,24 @@
    # This is just like msvisualcpp but w/o cygpath translation.
    # Just convert the backslash-escaped backslashes to single forward
    # slashes to satisfy depend.m4
-   cygpath_u="sed s,\\\\\\\\,/,g"
+   cygpath_u='sed s,\\\\,/,g'
    depmode=msvisualcpp
 fi
 
+if test "$depmode" = msvc7msys; then
+   # This is just like msvc7 but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u='sed s,\\\\,/,g'
+   depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
+   gccflag=-qmakedep=gcc,-MF
+   depmode=gcc
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -148,20 +167,21 @@
 ## The second -e expression handles DOS-style file names with drive letters.
   sed -e 's/^^:*: / /' \
       -e 's/^'$alpha':\/^:*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
+## This next piece of magic avoids the "deleted header file" problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
+  tr ' ' "$nl" < "$tmpdepfile" |
+## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+      | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -193,18 +213,15 @@
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
     # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
+    # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
     | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> "$depfile"
+    tr "$nl" ' ' >> "$depfile"
     echo >> "$depfile"
 
     # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
    >> "$depfile"
   else
@@ -216,10 +233,17 @@
   rm -f "$tmpdepfile"
   ;;
 
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies
   # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
   dir=`echo "$object" | sed -e 's|/^/*$|/|'`
@@ -249,12 +273,11 @@
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
+    # Each line is of the form 'foo.o: dependent.h'.
     # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
+    # '$object: dependent.h' and one to simply 'dependent.h:'.
     sed -e "s,^.*\.a-z*:,$object:," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the .
-    sed -e 's,^.*\.a-z*:	 *,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+    sed -e 's,^.*\.a-z*:'"$tab"' *,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -265,23 +288,26 @@
   ;;
 
 icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
+  # However on
+  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
   # ICC 7.0 will fill foo.d with something like
   #    foo.o: sub/foo.c
   #    foo.o: sub/foo.h
-  # which is wrong.  We want:
+  # which is wrong.  We want
   #    sub/foo.o: sub/foo.c
   #    sub/foo.o: sub/foo.h
   #    sub/foo.c:
   #    sub/foo.h:
   # ICC 7.1 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
+  # and will wrap long lines using '\':
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
-
+  # tcc 0.9.26 (FIXME still under development at the moment of writing)
+  # will emit a similar output, but also prepend the continuation lines
+  # with horizontal tabulation characters.
   "$@" -MD -MF "$tmpdepfile"
   stat=$?
   if test $stat -eq 0; then :
@@ -290,15 +316,21 @@
     exit $stat
   fi
   rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.

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

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.12.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in 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.
@@ -15,6 +14,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -48,6 +64,11 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -212,6 +233,8 @@
 ctags: CTAGS
 CTAGS:
 
+cscope cscopelist:
+
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
@@ -257,10 +280,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:

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

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.12.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in 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.
@@ -15,6 +14,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -55,6 +71,11 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -249,11 +270,11 @@
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (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):
 	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
@@ -317,6 +338,10 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
+cscopelist-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
+	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -380,6 +405,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -415,13 +454,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -456,10 +492,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -537,22 +578,23 @@
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
+	cscopelist-recursive ctags-recursive install-am install-strip \
+	tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
+	cscopelist cscopelist-recursive ctags ctags-recursive \
+	distclean distclean-generic distclean-libtool distclean-tags \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-recursive uninstall uninstall-am
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

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

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.12.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in 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.
@@ -16,6 +15,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,6 +66,11 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -71,6 +92,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(yalpadir)"
 HEADERS = $(yalpa_HEADERS)
 ETAGS = etags
@@ -232,10 +259,8 @@
 $(am__aclocal_m4_deps):
 
 yalpa_config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
+	@if test ! -f $@; then rm -f stamp-h1; else :; fi
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
 
 stamp-h1: $(srcdir)/yalpa_config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -255,8 +280,11 @@
 	-rm -rf .libs _libs
 install-yalpaHEADERS: $(yalpa_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(yalpadir)" || $(MKDIR_P) "$(DESTDIR)$(yalpadir)"
 	@list='$(yalpa_HEADERS)'; test -n "$(yalpadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(yalpadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(yalpadir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -270,9 +298,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(yalpa_HEADERS)'; test -n "$(yalpadir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(yalpadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(yalpadir)" && rm -f $$files
+	dir='$(DESTDIR)$(yalpadir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -323,6 +349,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -373,10 +413,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -457,17 +502,17 @@
 .MAKE: all install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool ctags distclean distclean-generic distclean-hdr \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip install-yalpaHEADERS \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-yalpaHEADERS
+	clean-libtool cscopelist ctags distclean distclean-generic \
+	distclean-hdr distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	install-yalpaHEADERS installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-yalpaHEADERS
 
 
 # Tell versions 3.59,3.63) of GNU make to not export all variables.

atmos-2.97.4.tar.gz/third-party/yalpa/include/yalpa/io.h -> atmos-2.97.5.tar.gz/third-party/yalpa/include/yalpa/io.h Changed

@@ -1,5 +1,5 @@
 /*
-    $Id: io.h 10 2010-01-18 17:02:22Z matwey $
+    $Id: io.h 16 2011-10-25 07:38:38Z matwey $
     Copyright (C) 2010  Matwey V. Kornilov <matwey.kornilov@gmail.com>
 
     This library is free software; you can redistribute it and/or
@@ -23,6 +23,8 @@
 #include <iosfwd>
 #include <iostream>
 
+#include <boost/math/special_functions/sign.hpp>
+
 namespace yalpa {
 	
 	template<class T> struct angle {
@@ -81,14 +83,16 @@
 			if( is_degrees(stm) ){
 				T degree = val()/M_PI*180;
 				if( is_sexagesimal(stm) ) {
-					stm << int(degree) << stm.fill() << int(std::abs(60*std::fmod(degree,1.0))) << stm.fill() << std::abs((3600*std::fmod(degree,1.0/60.0)));
+					if( val() < 0 ) { stm << "-"; }
+					stm << int(std::abs(degree)) << stm.fill() << int(std::abs(60*std::fmod(degree,1.0))) << stm.fill() << std::abs((3600*std::fmod(degree,1.0/60.0)));
 				} else {
 					stm << degree;
 				}
 			}else if( is_hours(stm) ){
 				T hour = val()/M_PI*12;
 				if( is_sexagesimal(stm) ) {
-					stm << int(hour) << stm.fill() << int(std::abs(60*std::fmod(hour,1.0))) << stm.fill() << std::abs((3600*std::fmod(hour,1.0/60.0)));
+					if( val() < 0 ) { stm << "-"; }
+					stm << int(std::abs(hour)) << stm.fill() << int(std::abs(60*std::fmod(hour,1.0))) << stm.fill() << std::abs((3600*std::fmod(hour,1.0/60.0)));
 				} else {
 					stm << hour;
 				}
@@ -99,6 +103,8 @@
 		return stm;
 	}
 	template<class T> std::istream& operator>>( std::istream& stm, yalpa::angle<T> val ) {
+		using boost::math::copysign;
+		
 		std::istream::sentry se(stm);
 		if( se ){
 			if( is_degrees(stm) ){
@@ -106,7 +112,7 @@
 				if( is_sexagesimal(stm) ) {
 					T deg,min,sec;
 					stm >> deg >> min >> sec;
-					val() = ( deg < 0 ? -1 : 1 ) * ( std::abs(deg) + min/60.0 + sec/3600.0 ) / 180.0 * M_PI;
+					val() = copysign( ( std::abs(deg) + min/60.0 + sec/3600.0 ) / 180.0 * M_PI, deg );
 				} else {
 					stm >> degree;
 					val() = degree / 180.0 * M_PI;
@@ -116,7 +122,7 @@
 				if( is_sexagesimal(stm) ) {
 					T hour,min,sec;
 					stm >> hour >> min >> sec;
-					val() = ( hour < 0 ? -1 : 1 ) * ( std::abs(hour) + min/60.0 + sec/3600.0 ) / 12.0 * M_PI;
+					val() = copysign( ( std::abs(hour) + min/60.0 + sec/3600.0 ) / 12.0 * M_PI, hour );
 				} else {
 					stm >> hour;
 					val() = hour / 12.0 * M_PI;

atmos-2.97.4.tar.gz/third-party/yalpa/include/yalpa/point.h -> atmos-2.97.5.tar.gz/third-party/yalpa/include/yalpa/point.h Changed

atmos-2.97.4.tar.gz/third-party/yalpa/include/yalpa/sidtime.h -> atmos-2.97.5.tar.gz/third-party/yalpa/include/yalpa/sidtime.h Changed

atmos-2.97.4.tar.gz/third-party/yalpa/include/yalpa/spheric.h -> atmos-2.97.5.tar.gz/third-party/yalpa/include/yalpa/spheric.h Changed

@@ -1,5 +1,5 @@
 /*
-    $Id: spheric.h 8 2010-01-18 16:36:15Z matwey $
+    $Id: spheric.h 36 2014-03-12 15:50:43Z matwey $
     Copyright (C) 2010  Matwey V. Kornilov <matwey.kornilov@gmail.com>
 
     This library is free software; you can redistribute it and/or
@@ -70,6 +70,16 @@
 			point_type point_;
 	};
 
+	/**
+		@brief return angular distance between two points
+		@param x - first point
+		@param y - second point
+		@return angular distance between x and y
+	*/
+	template<class T> typename spheric<T>::value_type distance( const spheric<T>& x, const spheric<T>& y ) {
+		return std::acos(inner_prod(x.getpoint(),y.getpoint()));
+	}
+
 	template<class T> class geographic;
 	template<class T> class ecliptic;
 	template<class T> class equatorial;
@@ -129,7 +139,31 @@
 			inline void dec( const_reference_type dec ) {
 				this->angle2( 0.5 * M_PI - dec );
 			}
-
+			/**
+				@brief return hour angle of the point
+				@param sidtime - siderial time of the moment
+				@return hour angle in rad at sidtime
+			*/
+			inline value_type ha(const value_type& sidtime) const {
+				value_type ha = std::fmod(sidtime - ra(), 2*M_PI);
+				return ( ha < 0 ? ha + 2*M_PI : ha );
+			}
+			/**
+				@return hour angle in rad of the set at location (rise = 2 Pi - set)
+			*/
+			inline value_type ha(const geographic<value_type>& location) const {
+				const value_type& dec_ = dec();
+				const value_type& lat = location.latitude();
+				if( dec_ + lat > 0.5*M_PI ) { /* non-setting */
+					return std::numeric_limits<value_type>::infinity();
+				} else if( dec_ - lat < -0.5*M_PI ) { /* non-rising */
+					return -std::numeric_limits<value_type>::infinity();
+				}
+				value_type num  = std::sqrt(std::cos(lat - dec_));
+				value_type dnum = std::sqrt(std::cos(lat + dec_));
+				return std::atan2(num,dnum)*2 /* 0 to Pi - set */;
+			}
+			
 			equatorial( const ecliptic< value_type >& ecl );
 			self_type& operator= ( const ecliptic< value_type >& ecl );
 			equatorial( const horizon_helper< horizon< value_type >  >& hor );

atmos-2.97.4.tar.gz/third-party/yalpa/include/yalpa/sun.h -> atmos-2.97.5.tar.gz/third-party/yalpa/include/yalpa/sun.h Changed

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

atmos-2.97.4.tar.gz/third-party/yalpa/install-sh -> atmos-2.97.5.tar.gz/third-party/yalpa/install-sh Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-11-20.07; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
@@ -156,6 +156,10 @@
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+	# Protect names problematic for 'test' and other utilities.
+	case $dst_arg in
+	  -* | =!) dst_arg=./$dst_arg;;
+	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | =!) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -194,13 +202,17 @@
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call `install-sh -d' without argument.
+  # It's OK to call 'install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for 'test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | =!) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -347,7 +354,7 @@
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
+		   # other-writable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in
@@ -385,7 +392,7 @@
 
       case $dstdir in
 	/*) prefix='/';;
-	-*) prefix='./';;
+	-=!*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@
 
       for d
       do
-	test -z "$d" && continue
+	test X"$d" = X && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then

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

@@ -1,9 +1,9 @@
 
-# libtool (GNU libtool) 2.4
+# libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 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.
 
@@ -41,6 +41,7 @@
 #       --quiet, --silent    don't print informational messages
 #       --no-quiet, --no-silent
 #                            print informational messages (default)
+#       --no-warn            don't display warning messages
 #       --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
@@ -69,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4
+#         $progname:	(GNU libtool) 2.4.2
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -79,9 +80,9 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.4
+VERSION=2.4.2
 TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3337
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -136,15 +137,10 @@
 
 : ${CP="cp -f"}
 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="sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -387,7 +383,7 @@
      ;;
   *)
      save_IFS="$IFS"
-     IFS=:
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
        IFS="$save_IFS"
        test -x "$progdir/$progname" && break
@@ -771,8 +767,8 @@
 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
 	p
 	d
      }
@@ -1052,6 +1048,7 @@
 opt_help=false
 opt_help_all=false
 opt_silent=:
+opt_warning=:
 opt_verbose=:
 opt_silent=false
 opt_verbose=false
@@ -1120,6 +1117,10 @@
 			opt_silent=false
 func_append preserve_args " $opt"
 			;;
+      --no-warning|--no-warn)
+			opt_warning=false
+func_append preserve_args " $opt"
+			;;
       --no-verbose)
 			opt_verbose=false
 func_append preserve_args " $opt"
@@ -2059,7 +2060,7 @@
     *.cCFSifmso | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.fF09? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+    *.fF09? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -3201,11 +3202,13 @@
 
       # Set up the ranlib parameters.
       oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
       fi
 
       # Do each command in the postinstall commands.
@@ -3470,7 +3473,7 @@
 	  # linked before any other PIC object.  But we must not use
 	  # pic_flag when linking with -static.  The problem exists in
 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
@@ -3982,14 +3985,17 @@
 # launches target application with the remaining arguments.
 func_exec_program ()
 {
-  for lt_wr_arg
-  do
-    case \$lt_wr_arg in
-    --lt-*) ;;
-    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-    esac
-    shift
-  done
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
   func_exec_program_core \${1+\"\$@\"}
 }
 
@@ -5057,9 +5063,15 @@
 {
 EOF
 	    func_emit_wrapper yes |
-              $SED -e 's/$\\"$/\\\1/g' \
-	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
-
+	      $SED -n -e '
+s/^$.\{79\}$$..*$/\1\
+\2/
+h
+s/$\\"$/\\\1/g
+s/$/\\n/
+s/$^\n*$.*/  fputs ("\1", f);/p
+g
+D'
             cat <<"EOF"
 }
 EOF
@@ -5643,7 +5655,8 @@
 	continue
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
@@ -6147,7 +6160,8 @@
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -6831,7 +6845,7 @@
 	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+		add_dir="-L$absdir"

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

@@ -1,8 +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, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -11,8 +11,8 @@
 
 m4_define(_LT_COPYING, dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -146,6 +146,8 @@
 AC_REQUIRE(_LT_PREPARE_SED_QUOTE_VARS)dnl
 AC_REQUIRE(_LT_PROG_ECHO_BACKSLASH)dnl
 
+_LT_DECL(, PATH_SEPARATOR, 1, The PATH separator for the build system)dnl
+dnl
 _LT_DECL(, host_alias, 0, The host system)dnl
 _LT_DECL(, host, 0)dnl
 _LT_DECL(, host_os, 0)dnl
@@ -637,7 +639,7 @@
 m4_ifset(AC_PACKAGE_VERSION,  AC_PACKAGE_VERSION)
 configured by $0, generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -801,6 +803,7 @@
 m4_case($1,
   C,			_LT_LANG(C),
   C++,		_LT_LANG(CXX),
+  Go,			_LT_LANG(GO),
   Java,		_LT_LANG(GCJ),
   Fortran 77,		_LT_LANG(F77),
   Fortran,		_LT_LANG(FC),
@@ -822,6 +825,31 @@
 )# _LT_LANG
 
 
+m4_ifndef(AC_PROG_GO, 
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+m4_defun(AC_PROG_GO,
+AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR(GOC,     Go compiler command)dnl
+AC_ARG_VAR(GOFLAGS, Go compiler flags)dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, ${ac_tool_prefix}gccgo, ${ac_tool_prefix}gccgo)
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+)#m4_defun
+)#m4_ifndef
+
+
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun(_LT_LANG_DEFAULT_CONFIG,
@@ -852,6 +880,10 @@
        m4_ifdef(LT_PROG_GCJ,
 	m4_define(LT_PROG_GCJ, defn(LT_PROG_GCJ)LT_LANG(GCJ))))))
 
+AC_PROVIDE_IFELSE(AC_PROG_GO,
+  LT_LANG(GO),
+  m4_define(AC_PROG_GO, defn(AC_PROG_GO)LT_LANG(GO)))
+
 AC_PROVIDE_IFELSE(LT_PROG_RC,
   LT_LANG(RC),
   m4_define(LT_PROG_RC, defn(LT_PROG_RC)LT_LANG(RC)))
@@ -954,7 +986,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -962,6 +1000,7 @@
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi)
+
     AC_CACHE_CHECK(for -exported_symbols_list linker flag,
       lt_cv_ld_exported_symbols_list,
       lt_cv_ld_exported_symbols_list=no
@@ -973,6 +1012,7 @@
 	lt_cv_ld_exported_symbols_list=no)
 	LDFLAGS="$save_LDFLAGS"
     )
+
     AC_CACHE_CHECK(for -force_load linker flag,lt_cv_ld_force_load,
       lt_cv_ld_force_load=no
       cat > conftest.c << _LT_EOF
@@ -990,7 +1030,9 @@
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1035,8 +1077,8 @@
 )
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES(TAG)
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun(_LT_DARWIN_LINKER_FEATURES,
 
@@ -1047,6 +1089,8 @@
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case($1, F77, _LT_TAGVAR(compiler_needs_object, $1)=yes,
+                  FC,  _LT_TAGVAR(compiler_needs_object, $1)=yes)
   else
     _LT_TAGVAR(whole_archive_flag_spec, $1)=''
   fi
@@ -1330,14 +1374,27 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -1414,13 +1471,13 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in

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

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

atmos-2.97.4.tar.gz/third-party/yalpa/missing -> atmos-2.97.5.tar.gz/third-party/yalpa/missing Changed

@@ -1,10 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.18; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -26,7 +25,7 @@
 # the same distribution terms that you use for the rest of that program.
 
 if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
+  echo 1>&2 "Try '$0 --help' for more information"
   exit 1
 fi
 
@@ -34,7 +33,7 @@
 sed_output='s/.* --output =$^ *$.*/\1/p'
 sed_minuso='s/.* -o $^ *$.*/\1/p'
 
-# In the cases where this matters, `missing' is being run in the
+# In the cases where this matters, 'missing' is being run in the
 # srcdir already.
 if test -f configure.ac; then
   configure_ac=configure.ac
@@ -65,7 +64,7 @@
     echo "\
 $0 OPTION... PROGRAM ARGUMENT...
 
-Handle \`PROGRAM ARGUMENT...' for when PROGRAM is missing, or return an
+Handle 'PROGRAM ARGUMENT...' for when PROGRAM is missing, or return an
 error status if there is no known handling for PROGRAM.
 
 Options:
@@ -74,21 +73,20 @@
   --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
+  aclocal      touch file 'aclocal.m4'
+  autoconf     touch file 'configure'
+  autoheader   touch file 'config.h.in'
   autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.ch', if possible, from existing .ch
-  flex         create \`lex.yy.c', if possible, from existing .c
+  automake     touch all 'Makefile.in' files
+  bison        create 'y.tab.ch', if possible, from existing .ch
+  flex         create 'lex.yy.c', if possible, from existing .c
   help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
+  lex          create 'lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.ch', if possible, from existing .ch
+  yacc         create 'y.tab.ch', if possible, from existing .ch
 
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
 
 Send bug reports to <bug-automake@gnu.org>."
     exit $?
@@ -100,8 +98,8 @@
     ;;
 
   -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
+    echo 1>&2 "$0: Unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
     exit 1
     ;;
 
@@ -122,22 +120,13 @@
     # Not GNU programs, they don't have --version.
     ;;
 
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
   *)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
        exit 1
     elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
        # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
+       # running '$TOOL --version' or '$TOOL --help' to check whether
        # $TOOL exists and not knowing $TOOL uses missing.
        exit 1
     fi
@@ -149,27 +138,27 @@
 case $program in
   aclocal*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
+WARNING: '$1' is $msg.  You should only need it if
+         you modified 'acinclude.m4' or '${configure_ac}'.  You might want
+         to install the Automake and Perl packages.  Grab them from
          any GNU archive site."
     touch aclocal.m4
     ;;
 
   autoconf*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+WARNING: '$1' is $msg.  You should only need it if
+         you modified '${configure_ac}'.  You might want to install the
+         Autoconf and GNU m4 packages.  Grab them from any GNU
          archive site."
     touch configure
     ;;
 
   autoheader*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+WARNING: '$1' is $msg.  You should only need it if
+         you modified 'acconfig.h' or '${configure_ac}'.  You might want
+         to install the Autoconf and GNU m4 packages.  Grab them
          from any GNU archive site."
     files=`sed -n 's/^ *ACM_CONFIG_HEADER($^)*$).*/\1/p' ${configure_ac}`
     test -z "$files" && files="config.h"
@@ -186,9 +175,9 @@
 
   automake*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
+WARNING: '$1' is $msg.  You should only need it if
+         you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'.
+         You might want to install the Automake and Perl packages.
          Grab them from any GNU archive site."
     find . -type f -name Makefile.am -print |
 	   sed 's/\.am$/.in/' |
@@ -197,10 +186,10 @@
 
   autom4te*)
     echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
+WARNING: '$1' is needed, but is $msg.
          You might have modified some files without having the
          proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
+         You can get '$1' as part of Autoconf from any GNU
          archive site."
 
     file=`echo "$*" | sed -n "$sed_output"`
@@ -220,13 +209,13 @@
 
   bison*|yacc*)
     echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
+WARNING: '$1' $msg.  You should only need it if
+         you modified a '.y' file.  You may need the Bison package
          in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
+         Bison from any GNU archive site."
     rm -f y.tab.c y.tab.h
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -250,13 +239,13 @@
 
   lex*|flex*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
+WARNING: '$1' is $msg.  You should only need it if
+         you modified a '.l' file.  You may need the Flex package
          in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
+         Flex from any GNU archive site."
     rm -f lex.yy.c

atmos-2.97.4.tar.gz/third-party/yalpa/src/Makefile.am -> atmos-2.97.5.tar.gz/third-party/yalpa/src/Makefile.am Changed

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

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.12.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in 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.
@@ -16,6 +15,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,7 +51,8 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -68,11 +85,17 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(libdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libyalpa_la_LIBADD =
 am_libyalpa_la_OBJECTS = libyalpa_la-sidtime.lo libyalpa_la-sun.lo \
-	libyalpa_la-io.lo
+	libyalpa_la-io.lo libyalpa_la-moon.lo
 libyalpa_la_OBJECTS = $(am_libyalpa_la_OBJECTS)
 libyalpa_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
@@ -92,6 +115,11 @@
 	$(LDFLAGS) -o $@
 SOURCES = $(libyalpa_la_SOURCES)
 DIST_SOURCES = $(libyalpa_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -214,7 +242,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 lib_LTLIBRARIES = libyalpa.la
-libyalpa_la_SOURCES = sidtime.cpp sun.cpp io.cpp
+libyalpa_la_SOURCES = sidtime.cpp sun.cpp io.cpp moon.cpp
 libyalpa_la_CPPFLAGS = -I @abs_top_srcdir@/include
 libyalpa_la_LDFLAGS = -version-info 0:1:0
 all: all-am
@@ -253,7 +281,6 @@
 $(am__aclocal_m4_deps):
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -261,6 +288,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
@@ -276,13 +305,15 @@
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/^/*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libyalpa.la: $(libyalpa_la_OBJECTS) $(libyalpa_la_DEPENDENCIES) 
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^^/*$$|.|; s|/^/*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+libyalpa.la: $(libyalpa_la_OBJECTS) $(libyalpa_la_DEPENDENCIES) $(EXTRA_libyalpa_la_DEPENDENCIES) 
 	$(libyalpa_la_LINK) -rpath $(libdir) $(libyalpa_la_OBJECTS) $(libyalpa_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -292,6 +323,7 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libyalpa_la-io.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libyalpa_la-moon.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libyalpa_la-sidtime.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libyalpa_la-sun.Plo@am__quote@
 
@@ -337,6 +369,13 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libyalpa_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libyalpa_la-io.lo `test -f 'io.cpp' || echo '$(srcdir)/'`io.cpp
 
+libyalpa_la-moon.lo: moon.cpp
+@am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libyalpa_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libyalpa_la-moon.lo -MD -MP -MF $(DEPDIR)/libyalpa_la-moon.Tpo -c -o libyalpa_la-moon.lo `test -f 'moon.cpp' || echo '$(srcdir)/'`moon.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libyalpa_la-moon.Tpo $(DEPDIR)/libyalpa_la-moon.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='moon.cpp' object='libyalpa_la-moon.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libyalpa_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libyalpa_la-moon.lo `test -f 'moon.cpp' || echo '$(srcdir)/'`moon.cpp
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -392,6 +431,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -442,10 +495,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -531,7 +589,7 @@
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool ctags distclean \
+	clean-libLTLIBRARIES clean-libtool cscopelist ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \

atmos-2.97.5.tar.gz/third-party/yalpa/src/moon.cpp Added

@@ -0,0 +1,65 @@
+/*
+    $Id: moon.cpp 35 2014-03-12 08:49:12Z matwey $
+    Copyright (C) 2014  Matwey V. Kornilov <matwey.kornilov@gmail.com>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <yalpa/sidtime.h>
+#include <yalpa/moon.h>
+
+#include <yalpa/io.h>
+
+#include <cmath>
+
+yalpa::ecliptic<double> yalpa::moon_position( double julian ) {
+	/* from Jean Meeus */
+	double t = (julian - 2451545.0) / 36525.0; // Julian centures
+	double t2 = t*t;
+
+	double Lp = M_PI / 180.0 * (218.3164591 + 481267.88134236 * t - 0.0013268 * t2 + t2*t / 53841 - t2*t2 / 65194000);
+	double D = M_PI / 180.0 * (297.8502042 + 445267.1115168 * t - 0.0016300 * t2 + t2*t / 53841 - t2*t2 / 113065000);
+	double M = M_PI / 180.0 * (357.5291092 + 35999.0502909 * t - 0.0001536 * t2 + t2*t / 24490000);
+	double Mp = M_PI / 180.0 * (134.9634114 + 477198.8676313 * t + 0.0089970 *t2 + t2*t / 69699 - t2*t2 / 14712000);
+	double F = M_PI / 180.0 * (93.2720993 + 483202.0175273 * t - 0.0034029 * t2 - t2*t / 3526000 + t2*t2 / 863310000);
+
+	double dl = M_PI / 180.0 * 1e-6 * (6288774.000000*sin(+1*Mp)
+		+1274027.000000*sin(+2*D -1*Mp)
+		+658314.000000*sin(+2*D )
+		+213618.000000*sin(+2*Mp)
+		-185116.000000*sin(+1*M)
+		-114332.000000*sin(+2*F)
+		+58793.000000*sin(+2*D -2*Mp )
+		+57066.000000*sin(+2*D -1*M -1*Mp)
+		+53322.000000*sin(+2*D +1*Mp)
+		+45758.000000*sin(+2*D -1*M)
+		-40923.000000*sin(+1*M -1*Mp)
+		-34720.000000*sin(+1*D)
+		-30383.000000*sin(+1*M +1*Mp)
+		+15327.000000*sin(+2*D -2*F));
+	double db = M_PI / 180.0 * 1e-6 * (+5128122.000000*sin(+1*F)
+		+280602.000000*sin(+1*Mp +1*F)
+		+277693.000000*sin(+1*Mp -1*F)
+		+173237.000000*sin(+2*D-1*F)
+		+55413.000000*sin(+2*D -1*Mp +1*F)
+		+46271.000000*sin(+2*D -1*Mp -1*F)
+		+32573.000000*sin(+2*D +1*F)
+		+17198.000000*sin(+2*Mp +1*F));
+
+	return yalpa::ecliptic<double>(Lp + dl,db);	
+}
+yalpa::ecliptic<double> yalpa::moon_position( const std::time_t& epoch ) {
+	return moon_position(julian(epoch));
+}
+

atmos-2.97.4.tar.gz/third-party/yalpa/src/sidtime.cpp -> atmos-2.97.5.tar.gz/third-party/yalpa/src/sidtime.cpp Changed

@@ -1,5 +1,5 @@
 /*
-    $Id: sidtime.cpp 13 2010-01-28 15:27:59Z matwey $
+    $Id: sidtime.cpp 29 2013-02-24 10:21:34Z matwey $
     Copyright (C) 2010  Matwey V. Kornilov <matwey.kornilov@gmail.com>
 
     This library is free software; you can redistribute it and/or
@@ -19,10 +19,26 @@
 #include <yalpa/sidtime.h>
 
 #include <cmath>
+#include <boost/math/special_functions/round.hpp>
+
+namespace {
+
+template<class T> T inline mod(const T& x, const T& y) {
+	if(y == T(0)) return x;
+	return x - y * std::floor(x/y);
+}
+
+};
 
 double yalpa::julian( const std::time_t& epoch ) {
 	return 2440587.5 + ( epoch / 86400.0 );
 }
+/**
+	@brief convert julian date to seconds since Jan 1, 1970
+*/
+std::time_t yalpa::epoch( double julian ) {
+	return boost::math::round((julian - 2440587.5) * 86400);
+}
 double yalpa::sidereal_time( const std::time_t& epoch ) {
 	return sidereal_time( julian( epoch ) );
 }
@@ -32,6 +48,19 @@
 	double sid = (6*3600.0 + 41*60.0 + 50.54841) + 8640184.812866 * t + 0.093104 * t*t - 6.2e-6 * t*t*t + 1.002737909350795 * 86400.0 * (julian-jd0);
 	return std::fmod( sid, 86400.0 ) * ( 2 * M_PI / 86400.0 );
 }
+/**
+	@breif convert from sidereal time to julian date
+	@param sid - sidereal time (in rad)
+	@param julian0 - julian day
+	@return julian date at sid moment
+*/
+double yalpa::from_sidereal( double sid, double julian0 ) {
+	double jd0 = std::floor(julian0-0.5)+0.5;
+	double t = (jd0 - 2451545.0) / 36525.0;
+	double gmst0 = ((6*3600.0 + 41*60.0 + 50.54841) + 8640184.812866 * t + 0.093104 * t*t - 6.2e-6 * t*t*t)/86400;
+	double delta_gmst = mod(sid/(2*M_PI) - gmst0,1.0);
+	return jd0 + (delta_gmst - 0.002730433670915674 * delta_gmst);
+}
 double yalpa::julian( const boost::posix_time::ptime& time ) {
 	return 2440587.5 + (time -  boost::posix_time::ptime( boost::gregorian::date( 1970,1,1 ) )).total_seconds() / 86400.0;
 }

atmos-2.97.4.tar.gz/third-party/yalpa/src/sun.cpp -> atmos-2.97.5.tar.gz/third-party/yalpa/src/sun.cpp Changed

@@ -1,5 +1,5 @@
 /*
-    $Id: sun.cpp 13 2010-01-28 15:27:59Z matwey $
+    $Id: sun.cpp 32 2013-08-04 15:27:24Z matwey $
     Copyright (C) 2010  Matwey V. Kornilov <matwey.kornilov@gmail.com>
 
     This library is free software; you can redistribute it and/or
@@ -49,3 +49,46 @@
 yalpa::ecliptic<double> yalpa::sun_position( const boost::posix_time::ptime& time ) {
 	return sun_position(julian(time));
 }
+
+namespace detail {
+
+using namespace yalpa;
+
+/**
+	@brief return moment of the Sun set or ris
+	@param jday - julian day to calculate on
+	@param location - location of the observer
+	@return julian moment of the set or rise
+
+	eqt_sun.ha() returns hour angle = 2arctan(sqrt(...))
+	(which is between 0 and Pi, and corresponds to the set)
+	The second solution to the equation is the 2Pi - 2arctan(sqrt(...))
+	(which is between Pi and 2Pi, and corresponds to the rise)
+	The sign is just negated because 2Pi floored at from_sidereal()
+*/
+template<int sign> inline double sunset_time( double jday, const geographic<double>& location ) {
+	double j = jday, j0 = jday;
+	equatorial<double> eqt_sun(.0,.0);
+	do {
+		j0 = j;
+		eqt_sun = sun_position(j);
+		double st = sign*eqt_sun.ha(location) + eqt_sun.ra() - location.longitude();
+		j = yalpa::from_sidereal(st, j);
+	} while( std::abs(j0-j) > std::abs(j) * std::numeric_limits<double>::epsilon() );
+	return j;	
+}
+
+};
+
+double yalpa::sunset_time( double jday, const geographic<double>& location ) {
+	return detail::sunset_time<1>(jday, location);
+}
+double yalpa::sunrise_time( double jday, const geographic<double>& location ) {
+	return detail::sunset_time<-1>(jday, location);
+}
+std::time_t yalpa::sunset_time( const std::time_t& day, const geographic<double>& location ) {
+	return yalpa::epoch(yalpa::sunset_time(yalpa::julian(day),location));
+}
+std::time_t yalpa::sunrise_time( const std::time_t& day, const geographic<double>& location ) {
+	return yalpa::epoch(yalpa::sunrise_time(yalpa::julian(day),location));
+}

atmos-2.97.4.tar.gz/third-party/yalpa/test/Makefile.am -> atmos-2.97.5.tar.gz/third-party/yalpa/test/Makefile.am Changed

@@ -1,10 +1,33 @@
-bin_PROGRAMS = convert julian sun
+bin_PROGRAMS = convert julian sun io equatorial_test julian_test sidtime_test moon_test distance_test
 convert_SOURCES = convert.cpp
 convert_CPPFLAGS = -I @abs_top_srcdir@/include
 convert_LDADD = @abs_top_builddir@/src/libyalpa.la
 julian_SOURCES = julian.cpp
 julian_CPPFLAGS = -I @abs_top_srcdir@/include
 julian_LDADD = @abs_top_builddir@/src/libyalpa.la
+moon_test_SOURCES = moon_test.cpp
 sun_SOURCES = sun.cpp
 sun_CPPFLAGS = -I @abs_top_srcdir@/include
 sun_LDADD = @abs_top_builddir@/src/libyalpa.la
+io_SOURCES = io.cpp
+io_CPPFLAGS = -I @abs_top_srcdir@/include
+io_LDADD = @abs_top_builddir@/src/libyalpa.la
+equatorial_test_SOURCES = equatorial_test.cpp
+julian_test_SOURCES = julian_test.cpp
+sidtime_test_SOURCES = sidtime_test.cpp
+distance_test_SOURCES = distance_test.cpp
+AM_CPPFLAGS = -I @abs_top_srcdir@/include
+LDADD = @abs_top_builddir@/src/libyalpa.la
+
+install:
+install-exec:
+install-data:
+install-dvi:
+install-html:
+install-info:
+install-ps:
+install-pdf:
+installdirs:
+installcheck:
+uninstall:
+

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

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.12.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in 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.
@@ -16,6 +15,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -34,9 +50,13 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-bin_PROGRAMS = convert$(EXEEXT) julian$(EXEEXT) sun$(EXEEXT)
+bin_PROGRAMS = convert$(EXEEXT) julian$(EXEEXT) sun$(EXEEXT) \
+	io$(EXEEXT) equatorial_test$(EXEEXT) julian_test$(EXEEXT) \
+	sidtime_test$(EXEEXT) moon_test$(EXEEXT) \
+	distance_test$(EXEEXT)
 subdir = test
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -53,9 +73,32 @@
 am_convert_OBJECTS = convert-convert.$(OBJEXT)
 convert_OBJECTS = $(am_convert_OBJECTS)
 convert_DEPENDENCIES = @abs_top_builddir@/src/libyalpa.la
+am_distance_test_OBJECTS = distance_test.$(OBJEXT)
+distance_test_OBJECTS = $(am_distance_test_OBJECTS)
+distance_test_LDADD = $(LDADD)
+distance_test_DEPENDENCIES = @abs_top_builddir@/src/libyalpa.la
+am_equatorial_test_OBJECTS = equatorial_test.$(OBJEXT)
+equatorial_test_OBJECTS = $(am_equatorial_test_OBJECTS)
+equatorial_test_LDADD = $(LDADD)
+equatorial_test_DEPENDENCIES = @abs_top_builddir@/src/libyalpa.la
+am_io_OBJECTS = io-io.$(OBJEXT)
+io_OBJECTS = $(am_io_OBJECTS)
+io_DEPENDENCIES = @abs_top_builddir@/src/libyalpa.la
 am_julian_OBJECTS = julian-julian.$(OBJEXT)
 julian_OBJECTS = $(am_julian_OBJECTS)
 julian_DEPENDENCIES = @abs_top_builddir@/src/libyalpa.la
+am_julian_test_OBJECTS = julian_test.$(OBJEXT)
+julian_test_OBJECTS = $(am_julian_test_OBJECTS)
+julian_test_LDADD = $(LDADD)
+julian_test_DEPENDENCIES = @abs_top_builddir@/src/libyalpa.la
+am_moon_test_OBJECTS = moon_test.$(OBJEXT)
+moon_test_OBJECTS = $(am_moon_test_OBJECTS)
+moon_test_LDADD = $(LDADD)
+moon_test_DEPENDENCIES = @abs_top_builddir@/src/libyalpa.la
+am_sidtime_test_OBJECTS = sidtime_test.$(OBJEXT)
+sidtime_test_OBJECTS = $(am_sidtime_test_OBJECTS)
+sidtime_test_LDADD = $(LDADD)
+sidtime_test_DEPENDENCIES = @abs_top_builddir@/src/libyalpa.la
 am_sun_OBJECTS = sun-sun.$(OBJEXT)
 sun_OBJECTS = $(am_sun_OBJECTS)
 sun_DEPENDENCIES = @abs_top_builddir@/src/libyalpa.la
@@ -72,8 +115,19 @@
 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = $(convert_SOURCES) $(julian_SOURCES) $(sun_SOURCES)
-DIST_SOURCES = $(convert_SOURCES) $(julian_SOURCES) $(sun_SOURCES)
+SOURCES = $(convert_SOURCES) $(distance_test_SOURCES) \
+	$(equatorial_test_SOURCES) $(io_SOURCES) $(julian_SOURCES) \
+	$(julian_test_SOURCES) $(moon_test_SOURCES) \
+	$(sidtime_test_SOURCES) $(sun_SOURCES)
+DIST_SOURCES = $(convert_SOURCES) $(distance_test_SOURCES) \
+	$(equatorial_test_SOURCES) $(io_SOURCES) $(julian_SOURCES) \
+	$(julian_test_SOURCES) $(moon_test_SOURCES) \
+	$(sidtime_test_SOURCES) $(sun_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -201,9 +255,19 @@
 julian_SOURCES = julian.cpp
 julian_CPPFLAGS = -I @abs_top_srcdir@/include
 julian_LDADD = @abs_top_builddir@/src/libyalpa.la
+moon_test_SOURCES = moon_test.cpp
 sun_SOURCES = sun.cpp
 sun_CPPFLAGS = -I @abs_top_srcdir@/include
 sun_LDADD = @abs_top_builddir@/src/libyalpa.la
+io_SOURCES = io.cpp
+io_CPPFLAGS = -I @abs_top_srcdir@/include
+io_LDADD = @abs_top_builddir@/src/libyalpa.la
+equatorial_test_SOURCES = equatorial_test.cpp
+julian_test_SOURCES = julian_test.cpp
+sidtime_test_SOURCES = sidtime_test.cpp
+distance_test_SOURCES = distance_test.cpp
+AM_CPPFLAGS = -I @abs_top_srcdir@/include
+LDADD = @abs_top_builddir@/src/libyalpa.la
 all: all-am
 
 .SUFFIXES:
@@ -240,8 +304,11 @@
 $(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
 	while read p p1; do if test -f $$p || test -f $$p1; \
@@ -281,13 +348,31 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-convert$(EXEEXT): $(convert_OBJECTS) $(convert_DEPENDENCIES) 
+convert$(EXEEXT): $(convert_OBJECTS) $(convert_DEPENDENCIES) $(EXTRA_convert_DEPENDENCIES) 
 	@rm -f convert$(EXEEXT)
 	$(CXXLINK) $(convert_OBJECTS) $(convert_LDADD) $(LIBS)
-julian$(EXEEXT): $(julian_OBJECTS) $(julian_DEPENDENCIES) 
+distance_test$(EXEEXT): $(distance_test_OBJECTS) $(distance_test_DEPENDENCIES) $(EXTRA_distance_test_DEPENDENCIES) 
+	@rm -f distance_test$(EXEEXT)
+	$(CXXLINK) $(distance_test_OBJECTS) $(distance_test_LDADD) $(LIBS)
+equatorial_test$(EXEEXT): $(equatorial_test_OBJECTS) $(equatorial_test_DEPENDENCIES) $(EXTRA_equatorial_test_DEPENDENCIES) 
+	@rm -f equatorial_test$(EXEEXT)
+	$(CXXLINK) $(equatorial_test_OBJECTS) $(equatorial_test_LDADD) $(LIBS)
+io$(EXEEXT): $(io_OBJECTS) $(io_DEPENDENCIES) $(EXTRA_io_DEPENDENCIES) 
+	@rm -f io$(EXEEXT)
+	$(CXXLINK) $(io_OBJECTS) $(io_LDADD) $(LIBS)
+julian$(EXEEXT): $(julian_OBJECTS) $(julian_DEPENDENCIES) $(EXTRA_julian_DEPENDENCIES) 
 	@rm -f julian$(EXEEXT)
 	$(CXXLINK) $(julian_OBJECTS) $(julian_LDADD) $(LIBS)
-sun$(EXEEXT): $(sun_OBJECTS) $(sun_DEPENDENCIES) 
+julian_test$(EXEEXT): $(julian_test_OBJECTS) $(julian_test_DEPENDENCIES) $(EXTRA_julian_test_DEPENDENCIES) 
+	@rm -f julian_test$(EXEEXT)
+	$(CXXLINK) $(julian_test_OBJECTS) $(julian_test_LDADD) $(LIBS)
+moon_test$(EXEEXT): $(moon_test_OBJECTS) $(moon_test_DEPENDENCIES) $(EXTRA_moon_test_DEPENDENCIES) 
+	@rm -f moon_test$(EXEEXT)
+	$(CXXLINK) $(moon_test_OBJECTS) $(moon_test_LDADD) $(LIBS)
+sidtime_test$(EXEEXT): $(sidtime_test_OBJECTS) $(sidtime_test_DEPENDENCIES) $(EXTRA_sidtime_test_DEPENDENCIES) 
+	@rm -f sidtime_test$(EXEEXT)
+	$(CXXLINK) $(sidtime_test_OBJECTS) $(sidtime_test_LDADD) $(LIBS)
+sun$(EXEEXT): $(sun_OBJECTS) $(sun_DEPENDENCIES) $(EXTRA_sun_DEPENDENCIES) 
 	@rm -f sun$(EXEEXT)
 	$(CXXLINK) $(sun_OBJECTS) $(sun_LDADD) $(LIBS)
 
@@ -298,7 +383,13 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convert-convert.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/distance_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/equatorial_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/io-io.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/julian-julian.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/julian_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/moon_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sidtime_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sun-sun.Po@am__quote@
 
 .cpp.o:
@@ -336,6 +427,20 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(convert_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o convert-convert.obj `if test -f 'convert.cpp'; then $(CYGPATH_W) 'convert.cpp'; else $(CYGPATH_W) '$(srcdir)/convert.cpp'; fi`
 
+io-io.o: io.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(io_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT io-io.o -MD -MP -MF $(DEPDIR)/io-io.Tpo -c -o io-io.o `test -f 'io.cpp' || echo '$(srcdir)/'`io.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/io-io.Tpo $(DEPDIR)/io-io.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='io.cpp' object='io-io.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(io_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o io-io.o `test -f 'io.cpp' || echo '$(srcdir)/'`io.cpp

atmos-2.97.5.tar.gz/third-party/yalpa/test/distance_test.cpp Added

@@ -0,0 +1,54 @@
+#define BOOST_TEST_MODULE distance_test
+#include <boost/test/included/unit_test.hpp>
+
+#include <yalpa/spheric.h>
+
+using namespace yalpa;
+
+BOOST_AUTO_TEST_CASE(distance1) {
+	spheric<double> north(0,        M_PI/2);
+	spheric<double> east (M_PI/2,   M_PI/2);
+	spheric<double> south(M_PI,     M_PI/2);
+	spheric<double> west (3*M_PI/2, M_PI/2);
+	spheric<double> up  (0, 0);
+	spheric<double> down(0, M_PI);
+
+	BOOST_CHECK_SMALL(distance(north, north), 1e-6);
+	BOOST_CHECK_CLOSE(distance(north, east), M_PI/2, 1e-6);
+	BOOST_CHECK_CLOSE(distance(north, west), M_PI/2, 1e-6);
+	BOOST_CHECK_CLOSE(distance(north, south), M_PI, 1e-6);
+
+	BOOST_CHECK_SMALL(distance(up, up), 1e-6);
+	BOOST_CHECK_CLOSE(distance(up, north), M_PI/2, 1e-6);
+	BOOST_CHECK_CLOSE(distance(up, east), M_PI/2, 1e-6);
+	BOOST_CHECK_CLOSE(distance(up, west), M_PI/2, 1e-6);
+	BOOST_CHECK_CLOSE(distance(up, south), M_PI/2, 1e-6);
+	BOOST_CHECK_CLOSE(distance(up, down), M_PI, 1e-6);
+}
+
+BOOST_AUTO_TEST_CASE(distance2) {
+	spheric<double> p1(0,   M_PI/2);
+	spheric<double> p2(0.5, M_PI/2);
+	spheric<double> p3(1.0, M_PI/2);
+
+	BOOST_CHECK_CLOSE(distance(p1, p2), 0.5, 1e-6);
+	BOOST_CHECK_CLOSE(distance(p2, p3), 0.5, 1e-6);
+	BOOST_CHECK_CLOSE(distance(p1, p3), 1.0, 1e-6);
+}
+
+BOOST_AUTO_TEST_CASE(distance3) {
+	spheric<double> p1(0, 0);
+	spheric<double> p2(0, 0.5);
+	spheric<double> p3(0, 1.0);
+
+	BOOST_CHECK_CLOSE(distance(p1, p2), 0.5, 1e-6);
+	BOOST_CHECK_CLOSE(distance(p2, p3), 0.5, 1e-6);
+	BOOST_CHECK_CLOSE(distance(p1, p3), 1.0, 1e-6);
+}
+
+BOOST_AUTO_TEST_CASE(distance4) {
+	spheric<double> p1(M_PI/4, M_PI/4);
+	spheric<double> p2(2*M_PI/3, M_PI/4);
+
+	BOOST_CHECK_CLOSE(distance(p1, p2), 0.890003222378341, 1e-6);
+}

atmos-2.97.5.tar.gz/third-party/yalpa/test/equatorial_test.cpp Added

@@ -0,0 +1,34 @@
+#define BOOST_TEST_MODULE equatorial_test
+#include <boost/test/included/unit_test.hpp>
+
+#include <yalpa/spheric.h>
+
+using namespace yalpa;
+
+BOOST_AUTO_TEST_CASE(equatorial_ha) {
+	equatorial<double> eqt(0.5, 0.7);
+	BOOST_CHECK_CLOSE(eqt.ha(0),       2*M_PI-eqt.ra(), 1e-6);
+	BOOST_CHECK_CLOSE(eqt.ha(2*M_PI),  2*M_PI-eqt.ra(), 1e-6);
+	BOOST_CHECK_CLOSE(eqt.ha(-2*M_PI), 2*M_PI-eqt.ra(), 1e-6);
+	BOOST_CHECK_CLOSE(eqt.ha(4*M_PI),  2*M_PI-eqt.ra(), 1e-6);
+	BOOST_CHECK_SMALL(eqt.ha(0.5),        1e-6);
+	BOOST_CHECK_SMALL(eqt.ha(0.5+2*M_PI), 1e-6);
+	BOOST_CHECK_SMALL(eqt.ha(0.5-2*M_PI), 1e-6);
+}
+
+BOOST_AUTO_TEST_CASE(equatorial_ha2) {
+	geographic<double> loc(0.6565346927762977, 0.9730210579868387);
+	equatorial<double> eqt1(0.6544984694978736, 1.5533430342749532);
+	equatorial<double> eqt2(3.272492347489368, -1.0995574287564276);
+	equatorial<double> eqt3(1.0, 0.5*M_PI-0.9730210579868387);
+	geographic<double> loc2(1.0, 0.0);
+
+	BOOST_CHECK_EQUAL(eqt1.ha(loc), std::numeric_limits<double>::infinity());
+	BOOST_CHECK_EQUAL(eqt2.ha(loc), -std::numeric_limits<double>::infinity());
+	BOOST_CHECK_CLOSE(eqt3.ha(loc), M_PI, 1e-6);
+
+	BOOST_CHECK_CLOSE(eqt1.ha(loc2), 0.5*M_PI, 1e-6);
+	BOOST_CHECK_CLOSE(eqt2.ha(loc2), 0.5*M_PI, 1e-6);
+	BOOST_CHECK_CLOSE(eqt3.ha(loc2), 0.5*M_PI, 1e-6);
+}
+

atmos-2.97.5.tar.gz/third-party/yalpa/test/io.cpp Added

atmos-2.97.5.tar.gz/third-party/yalpa/test/julian_test.cpp Added

atmos-2.97.5.tar.gz/third-party/yalpa/test/moon_test.cpp Added

atmos-2.97.5.tar.gz/third-party/yalpa/test/sidtime_test.cpp Added

atmos-2.97.4.tar.gz/third-party/yalpa/test/sun.cpp -> atmos-2.97.5.tar.gz/third-party/yalpa/test/sun.cpp Changed

@@ -1,5 +1,5 @@
 /*
-    $Id: sun.cpp 5 2010-01-17 11:19:09Z matwey $
+    $Id: sun.cpp 32 2013-08-04 15:27:24Z matwey $
     Copyright (C) 2010  Matwey V. Kornilov <matwey.kornilov@gmail.com>
 
     This program is free software: you can redistribute it and/or modify
@@ -42,14 +42,23 @@
 	yalpa::equatorial<double> sun_eq( sun );
 
 	std::cout << "Sun ra,dec: " << std::degrees << std::sexagesimal << yalpa::make_angle( sun_eq.ra() ) << " " << std::degrees << yalpa::make_angle( sun_eq.dec() ) << std::endl;
-	std::cout << std::endl;
 
 	yalpa::geographic<double> moscow( 0.65798911677777783,0.9730210413888889 );
+	std::cout << "Sunset ha:  " << std::degrees << std::sexagesimal << yalpa::make_angle( sun_eq.ha(moscow) ) << std::endl;
+	std::cout << std::endl;
 
 	yalpa::horizon<double> sun_hz( make_horizon_helper( sun_eq, moscow, yalpa::sidereal_time(now) ) );
 
 	std::cout << "Sun horizon:" << std::degrees << std::sexagesimal << yalpa::make_angle( sun_hz.azimuth() ) << " " << std::degrees << yalpa::make_angle( sun_hz.coaltitude() ) << std::endl;
 	std::cout << std::endl;
+
+	std::time_t sset = yalpa::epoch(yalpa::sunset_time(yalpa::julian(now), moscow));
+	std::cout << "Today's Sun set (UTC):   " <<  std::asctime( std::gmtime( &sset ) ) << std::endl;
+	std::cout << "Today's Sun set (local): " <<  std::asctime( std::localtime( &sset ) ) << std::endl;
+	
+	std::time_t srise = yalpa::epoch(yalpa::sunrise_time(yalpa::julian(now), moscow));
+	std::cout << "Today's Sun rise (UTC):   " <<  std::asctime( std::gmtime( &srise ) ) << std::endl;
+	std::cout << "Today's Sun rise (local): " <<  std::asctime( std::localtime( &srise ) ) << std::endl;
 	
 	return 0;
 }

Changes of Revision 17